Changeset 1510

Timestamp:

Apr 9, 2008, 3:19:35 AM (17 years ago)

Author:

bird

Message:

Fixed hash bang line. Added an eval mode and shut up the debug info.

File:

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

trunk/kBuild/env.sh

@@ -1 @@
-#!/bin/sh should work fine too, just needs testing.
+#!/bin/sh
 # $Id$
 ## @file
@@ -28 +28 @@
 
 #
+# Check if we're in eval mode or not.
+#
+ERR_REDIR=1
+DBG_REDIR=1
+EVAL_OPT=
+DBG_OPT=
+QUIET_OPT=
+if test "$1" = "--debug"; then
+    DBG_OPT="true"
+    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
+
+
+#
 # Determin the kBuild path from the script location.
 #
@@ -35 +59 @@
 fi
 if test ! -f "$PATH_KBUILD/footer.kmk" -o ! -f "$PATH_KBUILD/header.kmk" -o ! -f "$PATH_KBUILD/rules.kmk"; then
-    echo "$0: error: PATH_KBUILD ($PATH_KBUILD) is not pointing to a popluated kBuild directory.";
+    echo "$0: error: PATH_KBUILD ($PATH_KBUILD) is not pointing to a popluated kBuild directory." 1>&${ERR_REDIR}
     sleep 1;
     exit 1;
 fi
 export PATH_KBUILD
-echo "dbg: PATH_KBUILD=$PATH_KBUILD"
+test -n "$DBG_OPT" && echo "dbg: PATH_KBUILD=$PATH_KBUILD" 1>&${DBG_REDIR}
 
 
@@ -50 +74 @@
 fi
 export BUILD_TYPE
-echo "dbg: BUILD_TYPE=$BUILD_TYPE"
+test -n "$DBG_OPT" && echo "dbg: BUILD_TYPE=$BUILD_TYPE" 1>&${DBG_REDIR}
 
 #
@@ -95 +119 @@
 
         *)
-            echo "$0: unknown os $BUILD_PLATFORM"
+            echo "$0: unknown os $BUILD_PLATFORM" 1>&${ERR_REDIR}
             sleep 1
             exit 1
@@ -102 +126 @@
 fi
 export BUILD_PLATFORM
-echo "dbg: BUILD_PLATFORM=$BUILD_PLATFORM"
+test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM=$BUILD_PLATFORM" 1>&${DBG_REDIR}
 
 if test -z "$BUILD_PLATFORM_ARCH"; then
@@ -173 +197 @@
             ;;
 
-        *)  echo "$0: unknown cpu/arch - $BUILD_PLATFORM_ARCH"
+        *)  echo "$0: unknown cpu/arch - $BUILD_PLATFORM_ARCH" 1>&${ERR_REDIR}
             sleep 1
             exit 1
@@ -181 +205 @@
 fi
 export BUILD_PLATFORM_ARCH
-echo "dbg: BUILD_PLATFORM_ARCH=$BUILD_PLATFORM_ARCH"
+test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM_ARCH=$BUILD_PLATFORM_ARCH" 1>&${DBG_REDIR}
 
 if test -z "$BUILD_PLATFORM_CPU"; then
@@ -187 +211 @@
 fi
 export BUILD_PLATFORM_CPU
-echo "dbg: BUILD_PLATFORM_CPU=$BUILD_PLATFORM_CPU"
+test -n "$DBG_OPT" && echo "dbg: BUILD_PLATFORM_CPU=$BUILD_PLATFORM_CPU" 1>&${DBG_REDIR}
 
 #
@@ -197 +221 @@
 fi
 export BUILD_TARGET
-echo "dbg: BUILD_TARGET=$BUILD_TARGET"
+test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET=$BUILD_TARGET" 1>&${DBG_REDIR}
 
 if test -z "$BUILD_TARGET_ARCH"; then
@@ -203 +227 @@
 fi
 export BUILD_TARGET_ARCH
-echo "dbg: BUILD_TARGET_ARCH=$BUILD_TARGET_ARCH"
+test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET_ARCH=$BUILD_TARGET_ARCH" 1>&${DBG_REDIR}
 
 if test -z "$BUILD_TARGET_CPU"; then
@@ -213 +237 @@
 fi
 export BUILD_TARGET_CPU
-echo "dbg: BUILD_TARGET_CPU=$BUILD_TARGET_CPU"
+test -n "$DBG_OPT" && echo "dbg: BUILD_TARGET_CPU=$BUILD_TARGET_CPU" 1>&${DBG_REDIR}
 
 
@@ -233 +257 @@
     PATH_KBUILD_BIN="${PATH_KBUILD}/bin/${BUILD_PLATFORM}.${BUILD_PLATFORM_ARCH}"
 fi
-echo "dbg: PATH_KBUILD_BIN=${PATH_KBUILD_BIN} (not exported)"
+test -n "$DBG_OPT" && echo "dbg: PATH_KBUILD_BIN=${PATH_KBUILD_BIN} (not exported)" 1>&${DBG_REDIR}
 
 # Make shell. OS/2 and DOS only?
-export MAKESHELL="${PATH_KBUILD_BIN}/kmk_ash${_SUFF_EXE}";
+if test "$BUILD_PLATFORM" = "os2"; then
+    export MAKESHELL="${PATH_KBUILD_BIN}/kmk_ash${_SUFF_EXE}";
+fi
 
 #
@@ -242 +268 @@
 # NOTE! Once bootstrapped this is the only thing that is actually necessary.
 #
-PATH="${PATH_KBUILD_BIN}/${_PATH_SEP}$PATH"
+PATH="${PATH_KBUILD_BIN}${_PATH_SEP}$PATH"
 export PATH
-echo "dbg: PATH=$PATH"
+test -n "$DBG_OPT" && echo "dbg: PATH=$PATH" 1>&${DBG_REDIR}
 
 # Sanity and x bits.
 if test ! -d "${PATH_KBUILD_BIN}/"; then
-    echo "$0: warning: The bin directory for this platform doesn't exists. (${PATH_KBUILD_BIN}/)"
+    echo "$0: warning: The bin directory for this platform doesn't exists. (${PATH_KBUILD_BIN}/)" 1>&${ERR_REDIR}
 else
     for prog in kmk kDepPre kDepIDB kmk_append kmk_ash kmk_cat kmk_cp kmk_echo kmk_install kmk_ln kmk_mkdir kmk_mv kmk_rm kmk_rmdir kmk_sed;
@@ -254 +280 @@
         chmod a+x ${PATH_KBUILD_BIN}/${prog} > /dev/null 2>&1
         if test ! -f "${PATH_KBUILD_BIN}/${prog}${_SUFF_EXE}"; then
-            echo "$0: warning: The ${prog} program doesn't exist for this platform. (${PATH_KBUILD_BIN}/${prog}${_SUFF_EXE})"
+            echo "$0: warning: The ${prog} program doesn't exist for this platform. (${PATH_KBUILD_BIN}/${prog}${_SUFF_EXE})" 1>&${ERR_REDIR}
         fi
     done
@@ -262 +288 @@
 unset _PATH_SEP
 
-# Execute command or spawn shell.
-if test $# -eq 0; then
-    echo "$0: info: Spawning work shell..."
-    if test "$TERM" != 'dumb'  -a  -n "$BASH"; then
-        export PS1='\[\033[01;32m\]\u@\h \[\033[01;34m\]\W \$ \[\033[00m\]'
+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}"
+    test -n "$DBG_OPT" && echo "dbg: finished" 1>&${DBG_REDIR}
+else
+    # Execute command or spawn shell.
+    if test $# -eq 0; then
+        test -z "${QUIET_OPT}" && echo "$0: info: Spawning work shell..." 1>&${ERR_REDIR}
+        if test "$TERM" != 'dumb'  -a  -n "$BASH"; then
+            export PS1='\[\033[01;32m\]\u@\h \[\033[01;34m\]\W \$ \[\033[00m\]'
+        fi
+        $SHELL -i
+    else
+        echo "$0: info: Executing command: $*"
+        $*
     fi
-    $SHELL -i
-else
-    echo "$0: info: Executing command: $*"
-    $*
-fi
-
+fi
+