Changeset 28195


Ignore:
Timestamp:
08/30/13 17:27:01 (7 years ago)
Author:
davidb
Message:

Increased robustness in running these setup files

Location:
gs2-extensions/subversion/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/subversion/trunk/src/CASCADE-MAKE.sh

    r23108 r28195  
    11#!/bin/bash
    22
    3 source devel.bash
     3source ./devel.bash
    44
    55for d in packages ; do
  • gs2-extensions/subversion/trunk/src/devel.bash

    r23098 r28195  
    11source cascade-make/lib/cascade-lib.bash GEXTSVN . $*
    22
     3source ./setup.bash
     4
     5
  • gs2-extensions/subversion/trunk/src/setup.bash

    r23098 r28195  
    77if [ "x$GSDLHOME" = "x" ] ; then
    88  if [ -e ../../setup.bash ] ; then
    9     export gsopt_noexts=1 && pushd ../.. && source setup.bash && popd
     9    export gsopt_noexts=1 && pushd ../.. && source ./setup.bash && popd
     10    export gsopt_noexts=
     11  elif [ -e ../../gs3-setup.sh ] ; then
     12    export gsopt_noexts=1 && pushd ../.. && source ./gs3-setup.sh && popd
    1013    export gsopt_noexts=
    1114  fi
    1215fi
     16
     17# Back up plan
     18if test -z $GSDLOS ; then
     19  GSDLOS=`uname -s | tr '[A-Z]' '[a-z]'`
     20  # check for running bash under Cygwin
     21  if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
     22  then
     23    GSDLOS=windows
     24  fi
     25  # check for running bash under MinGW/MSys
     26  if test "`echo $GSDLOS | sed 's/mingw//'`" != "$GSDLOS" ;
     27  then
     28    GSDLOS=windows
     29  fi
     30  echo "GSDLOS was not set.  Setting it to '$GSDLOS'"
     31  export GSDLOS
     32fi
     33
    1334
    1435if [ "x$GEXTSVN" = "x" ] ; then
Note: See TracChangeset for help on using the changeset viewer.