X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fbuildor%2Fgffs_builders.sh;h=ed94db1a188baf2c5172c4dd193b5c897fb0174e;hb=a67ac95be82ed8491442d9e93f47184c0a4f73a0;hp=26ff6abdc6720b3eea400b73bf847e9d2f9744cd;hpb=17752eea9d5c3566cf0d9e7cfbc46e648c267f50;p=feisty_meow.git

diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 26ff6abd..ed94db1a 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -7,26 +7,23 @@ define_yeti_alias BAIL_ON_FAIL='if [ $? -ne 0 ]; then echo "A problem occurred.
 
 function zapem()
 {
-  bash $XSEDE_TEST_ROOT/library/zap_genesis_javas.sh 
+  bash $GFFS_TOOLKIT_ROOT/library/zap_genesis_javas.sh 
 }
 
 # a macro for testing the configuration.
 export GFFS_CHECK_VARS='
-  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
-    echo "GENII_INSTALL_DIR is not set.";
+  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
+    echo "GENII_INSTALL_DIR or GFFS_TOOLKIT_ROOT is not set.";
     return 1;
   fi '
 
 function build_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
-#    echo GENII_INSTALL_DIR is not set.
-#    return 1
-#  fi
   #zapem
   pushd "$GENII_INSTALL_DIR"
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -38,6 +35,7 @@ function build_gffs()
   # build the trunk.
   ant -Dbuild.targetArch=64 build
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -50,19 +48,14 @@ function build_gffs()
 function rebuild_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
-#    echo GENII_INSTALL_DIR is not set.
-#    return 1
-#  fi
   #zapem
   pushd "$GENII_INSTALL_DIR"
   ant clean
-
+  popd
   if [ $? -ne 0 ]; then
     error_sound
     return 1
   fi
-  popd
   build_gffs
 }
 
@@ -75,7 +68,7 @@ function rebu_bootstrap()
 
   quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
   if [ ! -f "$quickstarter" ]; then
-    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+    quickstarter="$GFFS_TOOLKIT_ROOT/library/bootstrap_quick_start.sh"
   fi
 
   bash "$quickstarter"
@@ -97,7 +90,7 @@ function bu_bootstrap()
 
   quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
   if [ ! -f "$quickstarter" ]; then
-    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+    quickstarter="$GFFS_TOOLKIT_ROOT/library/bootstrap_quick_start.sh"
   fi
 
   bash "$quickstarter"
@@ -114,7 +107,7 @@ function bu_bootstrap()
 function fast_install_build()
 {
   eval $GFFS_CHECK_VARS
-  bash "$XSEDE_TEST_ROOT/tools/installer/fast_installer_build.sh" $*
+  bash "$GFFS_TOOLKIT_ROOT/tools/installer/build_installer.sh" $* fast
   if [ $? -ne 0 ]; then
     echo "failed to create the installer."
     error_sound