Changeset 1512 for trunk/kBuild/env.sh

Timestamp:

Apr 9, 2008, 3:36:57 AM (17 years ago)

Author:

bird

Message:

Added a --full option and not exporting defaults.

File:

• trunk/kBuild/env.sh (modified) (12 diffs)

trunk/kBuild/env.sh

@@ -35 +35 @@
 DBG_OPT=
 QUIET_OPT=
-if test "$1" = "--debug"; then
-    DBG_OPT="true"
+FULL_OPT=
+while test $# -gt 0; 
+do
+    case "$1" in
+        "--debug")
+            DBG_OPT="true"
+            ;;
+        "--quiet")
+            QUIET_OPT="true"
+            ;;
+        "--full")
+            FULL_OPT="true"
+            ;;
+        "--eval")
+            EVAL_OPT="true"
+            ERR_REDIR=2
+            DBG_REDIR=2
+            ;;
+        "--help")
+            echo "syntax: $0 [--debug] [--quiet] [--full] [--eval] [command [args]]"
+            exit 1
+            ;;
+        *)
+            break
+            ;;
+    esac
     shift
-fi
-if test "$1" = "--quiet"; then
-    QUIET_OPT="true"
-    shift
-fi
-if test "$1" = "--eval"; then
-    EVAL_OPT="true"
-    ERR_REDIR=2
-    DBG_REDIR=2
-    shift
-fi
+done
 
 
@@ -63 +77 @@
     exit 1;
 fi
-export PATH_KBUILD
 test -n "$DBG_OPT" && echo "dbg: PATH_KBUILD=$PATH_KBUILD" 1>&${DBG_REDIR}
 
@@ -73 +86 @@
     BUILD_TYPE=release
 fi
-export BUILD_TYPE
 test -n "$DBG_OPT" && echo "dbg: BUILD_TYPE=$BUILD_TYPE" 1>&${DBG_REDIR}
 
@@ -125 +137 @@
     esac
 fi
-export BUILD_PLATFORM
 test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM=$BUILD_PLATFORM" 1>&${DBG_REDIR}
 
@@ -204 +215 @@
 
 fi
-export BUILD_PLATFORM_ARCH
 test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM_ARCH=$BUILD_PLATFORM_ARCH" 1>&${DBG_REDIR}
 
@@ -210 +220 @@
     BUILD_PLATFORM_CPU="blend"
 fi
-export BUILD_PLATFORM_CPU
 test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM_CPU=$BUILD_PLATFORM_CPU" 1>&${DBG_REDIR}
 
@@ -220 +229 @@
     BUILD_TARGET="$BUILD_PLATFORM"
 fi
-export BUILD_TARGET
 test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET=$BUILD_TARGET" 1>&${DBG_REDIR}
 
@@ -226 +234 @@
     BUILD_TARGET_ARCH="$BUILD_PLATFORM_ARCH"
 fi
-export BUILD_TARGET_ARCH
 test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET_ARCH=$BUILD_TARGET_ARCH" 1>&${DBG_REDIR}
 
@@ -236 +243 @@
     fi
 fi
-export BUILD_TARGET_CPU
 test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET_CPU=$BUILD_TARGET_CPU" 1>&${DBG_REDIR}
 
@@ -269 +275 @@
 #
 PATH="${PATH_KBUILD_BIN}${_PATH_SEP}$PATH"
-export PATH
 test -n "$DBG_OPT" && echo "dbg: PATH=$PATH" 1>&${DBG_REDIR}
 
@@ -290 +295 @@
 if test -n "$EVAL_OPT"; then
     test -n "$DBG_OPT" && echo "dbg: echoing exported variables" 1>&${DBG_REDIR}
-    echo "export BUILD_PLATFORM=${BUILD_PLATFORM}"
-    echo "export BUILD_PLATFORM_ARCH=${BUILD_PLATFORM_ARCH}"
-    echo "export BUILD_PLATFORM_CPU=${BUILD_PLATFORM_CPU}"
-    echo "export BUILD_TARGET=${BUILD_TARGET}"
-    echo "export BUILD_TARGET_ARCH=${BUILD_TARGET_ARCH}"
-    echo "export BUILD_TARGET_CPU=${BUILD_TARGET_CPU}"
-    echo "export BUILD_TYPE=${BUILD_TYPE}"
-    echo "export PATH_KBUILD=${PATH_KBUILD}"
     echo "export PATH=${PATH}"
+    if test -n "${FULL_OPT}"; then
+        echo "export BUILD_PLATFORM=${BUILD_PLATFORM}"
+        echo "export BUILD_PLATFORM_ARCH=${BUILD_PLATFORM_ARCH}"
+        echo "export BUILD_PLATFORM_CPU=${BUILD_PLATFORM_CPU}"
+        echo "export BUILD_TARGET=${BUILD_TARGET}"
+        echo "export BUILD_TARGET_ARCH=${BUILD_TARGET_ARCH}"
+        echo "export BUILD_TARGET_CPU=${BUILD_TARGET_CPU}"
+        echo "export BUILD_TYPE=${BUILD_TYPE}"
+        echo "export PATH_KBUILD=${PATH_KBUILD}"
+    fi
     test -n "$DBG_OPT" && echo "dbg: finished" 1>&${DBG_REDIR}
 else
+    export PATH
+    if test -n "${FULL_OPT}"; then
+        export PATH_KBUILD
+        export BUILD_TYPE
+        export BUILD_PLATFORM
+        export BUILD_PLATFORM_ARCH
+        export BUILD_PLATFORM_CPU
+        export BUILD_TARGET
+        export BUILD_TARGET_ARCH
+        export BUILD_TARGET_CPU
+    fi
+
     # Execute command or spawn shell.
     if test $# -eq 0; then
@@ -309 +328 @@
         $SHELL -i
     else
-        echo "$0: info: Executing command: $*"
+        test -z "${QUIET_OPT}" && echo "$0: info: Executing command: $*" 1>&${ERR_REDIR}
         $*
     fi