[llvm-commits] [llvm-top] r40400 - in /llvm-top/trunk: library.sh options

[Reid Spencer]

Author: reid
Date: Sun Jul 22 15:35:31 2007
New Revision: 40400

URL: http://llvm.org/viewvc/llvm-project?rev=40400&view=rev
Log:
Regularize the option list and make it conform to the options provided
by the support module.

Modified:
    llvm-top/trunk/library.sh
    llvm-top/trunk/options

Modified: llvm-top/trunk/library.sh
URL: http://llvm.org/viewvc/llvm-project/llvm-top/trunk/library.sh?rev=40400&r1=40399&r2=40400&view=diff

==============================================================================
--- llvm-top/trunk/library.sh (original)
+++ llvm-top/trunk/library.sh Sun Jul 22 15:35:31 2007
@@ -28,18 +28,18 @@
 if test -r "$options" -a -f "$options" ; then
   . "$options"
 else
-  ARCHIVE_LIBS=1
-  ASSERTS=1
+  ASSERTIONS=1
+  CHECKING=0
   DEBUG=1
   DESTDIR=""
-  EXPENSIVE=0
-  OPTIMIZED=0
+  DOXYGEN=0
   OPT_FOR_SIZE=0
+  OPTIMIZED=0
   PREFIX="$LLVM_TOP/installed"
   PROFILING=0
-  SHARED_LIBS=0
-  STRIP=0
-  TOOL_VERBOSE=0
+  STRIPPED=0
+  TARGETS_TO_BUILD="all"
+  THREADS=0
   USE_OBJ_DIR=0
   VERBOSE=0
 fi

Modified: llvm-top/trunk/options
URL: http://llvm.org/viewvc/llvm-project/llvm-top/trunk/options?rev=40400&r1=40399&r2=40400&view=diff

==============================================================================
--- llvm-top/trunk/options (original)
+++ llvm-top/trunk/options Sun Jul 22 15:35:31 2007
@@ -31,22 +31,43 @@
 msg 3 "Processing new option arguments"
 for arg in "$@" ; do
   case "$arg" in
-    ARCHIVE_LIBS=*) ARCHIVE_LIBS=`echo "$arg" | sed -e 's/ARCHIVE_LIBS=//'` ;;
-    ASSERTS=*)      ASSERTS=`echo "$arg" | sed -e 's/ASSERTS=//'` ;;
-    DEBUG=*)        DEBUG=`echo "$arg" | sed -e 's/DEBUG=//'` ;;
-    DESTDIR=*)      DESTDIR=`echo "$arg" | sed -e 's/DESTDIR=//'` ;;
-    EXPENSIVE=*)    EXPENSIVE=`echo "$arg" | sed -e 's/EXPENSIVE=//'` ;;
-    LLVM_TOP=*)     LLVM_TOP=`echo "$arg" | sed -e 's/LLVM_TOP=//'` ;;
-    OPT_FOR_SIZE=*) OPT_FOR_SIZE=`echo "$arg" | sed -e 's/OPT_FOR_SIZE=//'` ;;
-    OPTIMIZED=*)    OPTIMIZED=`echo "$arg" | sed -e 's/OPTIMIZED=//'` ;;
-    PREFIX=*)       PREFIX=`echo "$arg" | sed -e 's/PREFIX=//'` ;;
-    PROFILING=*)    PROFILING=`echo "$arg" | sed -e 's/PROFILING=//'` ;;
-    SHARED_LIBS=*)  SHARED_LIBS=`echo "$arg" | sed -e 's/SHARED_LIBS=//'` ;;
-    STRIP=*)        STRIP=`echo "$arg" | sed -e 's/STRIP=//'` ;;
-    TOOL_VERBOSE=*) TOOL_VERBOSE=`echo "$arg" | sed -e 's/TOOL_VERBOSE=//'` ;;
-    USE_OBJ_DIR=*)  USE_OBJ_DIR=`echo "$arg" | sed -e 's/USE_OBJ_DIR=//'` ;;
-    VERBOSE=*)      VERBOSE=`echo "$arg" | sed -e 's/VERBOSE=//'` ;;
-    *)              die 1 "Unrecognized option: $arg" ;;
+  +ASSERTIONS)    ASSERTIONS=1 ;;
+  -ASSERTIONS)    ASSERTIONS=0 ;;
+  +CHECKING)      CHECKING=1 ;;
+  -CHECKING)      CHECKING=0 ;;
+  +DEBUG)         DEBUG=1 ;;
+  -DEBUG)         DEBUG=0 ;;
+  +DOXYGEN)       DOXYGEN=1 ;;
+  -DOXYGEN)       DOXYGEN=0 ;;
+  +OPT_FOR_SIZE)  OPT_FOR_SIZE=1 ;;
+  -OPT_FOR_SIZE)  OPT_FOR_SIZE=0 ;;
+  +OPTIMIZED)     OPTIMIZED=1 ;;
+  -OPTIMIZED)     OPTIMIZED=0 ;;
+  +PROFILING)     PROFILING=1 ;;
+  -PROFILING)     PROFILING=0 ;;
+  +STRIPPED)      STRIPPED=1 ;;
+  -STRIPPED)      STRIPPED=0 ;;
+  +THREADS)       THREADS=1 ;;
+  -THREADS)       THREADS=0 ;;
+  +VERBOSE)       VERBOSE=1 ;;
+  -VERBOSE)       VERBOSE=0 ;;
+  ASSERTIONS=*)   ASSERTIONS=`echo "$arg" | sed -e 's/ASSERTIONS=//'` ;;
+  CHECKING=*)     CHECKING=`echo "$arg" | sed -e 's/CHECKING=//'` ;;
+  DEBUG=*)        DEBUG=`echo "$arg" | sed -e 's/DEBUG=//'` ;;
+  DESTDIR=*)      DESTDIR=`echo "$arg" | sed -e 's/DESTDIR=//'` ;;
+  DOXYGEN=*)      DOXYGEN=`echo "$arg" | sed -e 's/DOXYGEN=//'` ;;
+  LLVM_TOP=*)     LLVM_TOP=`echo "$arg" | sed -e 's/LLVM_TOP=//'` ;;
+  OPT_FOR_SIZE=*) OPT_FOR_SIZE=`echo "$arg" | sed -e 's/OPT_FOR_SIZE=//'` ;;
+  OPTIMIZED=*)    OPTIMIZED=`echo "$arg" | sed -e 's/OPTIMIZED=//'` ;;
+  PREFIX=*)       PREFIX=`echo "$arg" | sed -e 's/PREFIX=//'` ;;
+  PROFILING=*)    PROFILING=`echo "$arg" | sed -e 's/PROFILING=//'` ;;
+  STRIPPED=*)     STRIPPED=`echo "$arg" | sed -e 's/STRIPPED=//'` ;;
+  TARGETS_TO_BUILD=*) 
+              TARGETS_TO_BUILD=`echo "$arg" | sed -e 's/TARGETS_TO_BUILD=//'` ;;
+  THREADS=*)      THREADS=`echo "$arg" | sed -e 's/THREADS=//'` ;;
+  USE_OBJ_DIR=*)  USE_OBJ_DIR=`echo "$arg" | sed -e 's/USE_OBJ_DIR=//'` ;;
+  VERBOSE=*)      VERBOSE=`echo "$arg" | sed -e 's/VERBOSE=//'` ;;
+  *)              die 1 "Unrecognized option: $arg" ;;
   esac
 done
 
@@ -55,19 +76,19 @@
 cat <<__EOF__ > "$options"
 # LLVM configuration options database.
 # This script is generated by "options" and included into library.sh
-ARCHIVE_LIBS="$ARCHIVE_LIBS"
-ASSERTS="$ASSERTS"
+ASSERTIONS="$ASSERTIONS"
+CHECKING="$CHECKING"
 DEBUG="$DEBUG"
 DESTDIR="$DESTDIR"
-EXPENSIVE="$EXPENSIVE"
+DOXYGEN="$DOXYGEN"
 LLVM_TOP="$LLVM_TOP"
 OPT_FOR_SIZE="$OPT_FOR_SIZE"
 OPTIMIZED="$OPTIMIZED"
 PREFIX="$PREFIX"
 PROFILING="$PROFILING"
-STRIP="$STRIP"
-SHARED_LIBS="$SHARED_LIBS"
-TOOL_VERBOSE="$TOOL_VERBOSE"
+STRIPPED="$STRIPPED"
+TARGETS_TO_BUILD="$TARGETS_TO_BUILD"
+THREADS="$THREADS"
 USE_OBJ_DIR="$USE_OBJ_DIR"
 VERBOSE="$VERBOSE"
 __EOF__