Changeset 28195 for gs2-extensions/subversion

Timestamp:

2013-08-30T17:27:01+12:00 (11 years ago)

Author:

davidb

Message:

Increased robustness in running these setup files

Location:

gs2-extensions/subversion/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• devel.bash (modified) (1 diff)
• setup.bash (modified) (1 diff)

gs2-extensions/subversion/trunk/src/CASCADE-MAKE.sh

@@ -1 +1 @@
 #!/bin/bash
 
-source devel.bash
+source ./devel.bash
 
 for d in packages ; do

gs2-extensions/subversion/trunk/src/devel.bash

@@ -1 +1 @@
 source cascade-make/lib/cascade-lib.bash GEXTSVN . $*
 
+source ./setup.bash
+
+

gs2-extensions/subversion/trunk/src/setup.bash

@@ -7 +7 @@
 if [ "x$GSDLHOME" = "x" ] ; then
   if [ -e ../../setup.bash ] ; then
-    export gsopt_noexts=1 && pushd ../.. && source setup.bash && popd
+    export gsopt_noexts=1 && pushd ../.. && source ./setup.bash && popd
+    export gsopt_noexts=
+  elif [ -e ../../gs3-setup.sh ] ; then
+    export gsopt_noexts=1 && pushd ../.. && source ./gs3-setup.sh && popd
     export gsopt_noexts=
   fi
 fi
+
+# Back up plan
+if test -z $GSDLOS ; then
+  GSDLOS=`uname -s | tr '[A-Z]' '[a-z]'`
+  # check for running bash under Cygwin
+  if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
+  then
+    GSDLOS=windows
+  fi
+  # check for running bash under MinGW/MSys
+  if test "`echo $GSDLOS | sed 's/mingw//'`" != "$GSDLOS" ;
+  then
+    GSDLOS=windows
+  fi
+  echo "GSDLOS was not set.  Setting it to '$GSDLOS'"
+  export GSDLOS
+fi
+
 
 if [ "x$GEXTSVN" = "x" ] ; then