updated to get closer to building using cygwin, which is difficult because

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index dd9adc273435461b82ae6f1c638ba0a7492db391..de83d76d6d320e07e14ff4b9153896241f9e902f 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -37,6 +37,22 @@ if [ -z "$NECHUNG" ]; then
   fi
   export IS_DARWIN=$(echo $OSTYPE | grep -i darwin)
   
+  ##############
+
+  # guess the current platform.
+  IS_UNIX=$(uname | grep -i linux)
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi
+  IS_DOS=$(uname | grep -i ming)
+  if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi
+
+  # now if we're stuck in DOS, try to determine the type of system.
+  if [ ! -z "$IS_DOS" ]; then
+    # IS_MSYS will be non-empty if this is the msys toolset.  otherwise
+    # we assume that it's cygwin.
+    IS_MSYS=$(uname | grep -i ming)
+  fi
+
   ##############
   
   # fallbacks to set crucial variables for feisty meow...
@@ -134,20 +150,12 @@ if [ -z "$NECHUNG" ]; then
     fi
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
-      # the binary directory contains handy programs we use a lot in yeti.  we set up the path to it
-      # here based on the operating system.
-      # note that yeti has recently become more dependent on hoople.  hoople was always the source of
-      # the binaries, but now we don't ship them with yeti any more as pre-built items.  this reduces
-      # the size of the code package a lot and shortens up our possible exposure to compromised
-      # binaries.  people can bootstrap up their own set from hoople now instead.
+      # the binary directory contains handy programs we use a lot.  we set
+      # up the path to it here based on the operating system.
       export BINDIR=$FEISTY_MEOW_DIR/production/binaries
-  
       # add binaries created within build to the path.
-#    export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH"
       export PATH="$BINDIR:$PATH"
-  
       # Shared libraries are located via this variable.
-#    export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)"
       export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BINDIR"
     fi
   }
@@ -169,14 +177,14 @@ if [ -z "$NECHUNG" ]; then
   
   # set the path for locating applications.  this is done after any
   # potential overrides from the user.
-  #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
+  #export PATH="$(dos_to_unix_path $BINDIR):$(dos_to_unix_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
   export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:."
 ###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:.
   
   ##############
 
   # set the SHUNIT_DIR so our shunit tests can find the codebase.
-  export SHUNIT_DIR="$FEIST_MEOW_SCRIPTS/shunit"
+  export SHUNIT_DIR="$FEISTY_MEOW_SCRIPTS/shunit"
   
   ##############