Changeset 1535

Timestamp:

08/04/09 08:55:43 (16 years ago)

Author:

Eric.Larour

Message:

Bypass environment variables

Location:

issm/trunk

Files:

• cron/configs/linux64_morlighem (modified) (1 diff)
• cron/configs/macosx32_seroussi (modified) (1 diff)
• cron/nightlyrun.sh (modified) (3 diffs)
• etc/environment.csh (modified) (1 diff)
• etc/environment.sh (modified) (1 diff)
• etc/environment_variables.sh (modified) (3 diffs)

issm/trunk/cron/configs/linux64_morlighem

@@ -16 +16 @@
 
 #external pakages to be installed
-EP_LIST="mpich2 petsc metis triangle"
+EXTERNALPACKAGES="mpich2 petsc metis triangle"
 
 #number of cpus

issm/trunk/cron/configs/macosx32_seroussi

@@ -15 +15 @@
 
 #external pakages to be installed
-EP_LIST="mpich2 petsc metis triangle"
+EXTERNALPACKAGES="mpich2 petsc metis triangle"
 
 #number of cpus

issm/trunk/cron/nightlyrun.sh

@@ -9 +9 @@
 else
         echo "no config file specified. Exiting..."
+        exit 1
 fi
 
@@ -29 +30 @@
 cd $ISSM_DIR/etc
 
-#modify MATLAB_PATH ( /usr/...   ->   \/usr\/...)
-echo $MATLAB_PATH | sed 's/\//\\\//g' > MATLAB_PATH2
-MATLAB_PATH2=`cat MATLAB_PATH2`
-rm MATLAB_PATH2
+#source environment variables with new matlab path
+source environment.sh MATLAB_DIR=$MATLAB_PATH
 
-#modify MATLAB_DIR in environment_variables.sh
-cat environment_variables.sh | sed -e "s/C:\/MATLAB\/R2009a\//$MATLAB_PATH2/g" > environment_variables.sh.bak
-mv environment_variables.sh.bak environment_variables.sh
-
-#Create cluster.rc
+#create simpler  cluster.rc file, with only the cluster we are interested in.
 cat << END > cluster.rc
 begin
@@ -46 +41 @@
 end
 END
-source $ISSM_DIR/etc/environment.sh
 
 #2: install some required external packages
 cd $ISSM_DIR/externalpackages
-for EP in $EP_LIST
+for ep in $EXTERNALPACKAGES
 do 
-        cd $EP
+        cd $ep
         cp configs/$OS/* .
         ./install.sh $NUMCPUS

issm/trunk/etc/environment.csh

@@ -2 +2 @@
 
 source $ISSM_DIR/etc/environment_variables.csh
+
+#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
+#to environment.
+foreach i ($@)
+eval $i
+end
 
 #MATLAB

issm/trunk/etc/environment.sh

@@ -1 +1 @@
 #ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
 source $ISSM_DIR/etc/environment_variables.sh
+
+#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
+#to environment.
+for i in $@
+do
+        eval $i
+done
 
 #MATLAB

issm/trunk/etc/environment_variables.sh

@@ -4 +4 @@
 #
 #
-
 
 #MATLAB
@@ -60 +59 @@
 YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
 
-#TEX2IM
-TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install"
-
-
-
-
-
 #Development packages
 #automake
@@ -82 +74 @@
 #sdk
 SDK_DIR="C:/MicrosoftVisualStudio 9.0/Microsoft Visual C++ 2008 Express Edition with SP1 - ENU"
-