X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fbuildor%2Fgffs_builders.sh;h=ed94db1a188baf2c5172c4dd193b5c897fb0174e;hb=7d715f6667e8bb5d7a4f965adb5f36853eb47818;hp=21dbb59c739e5b33bf2a429d3df06495d38f76d5;hpb=7e7383cf9baf945f6e86af15f59165003eafc803;p=feisty_meow.git

diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 21dbb59c..ed94db1a 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -3,16 +3,27 @@
 source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 #hmmm: if this works well, we can use it in lots of places.
-alias BAIL_ON_FAIL='if [ $? -ne 0 ]; then echo "A problem occurred.  $msg"; return 1; fi'
+define_yeti_alias BAIL_ON_FAIL='if [ $? -ne 0 ]; then echo "A problem occurred.  $msg"; return 1; fi'
+
+function zapem()
+{
+  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 "$GFFS_TOOLKIT_ROOT" ]; then
+    echo "GENII_INSTALL_DIR or GFFS_TOOLKIT_ROOT is not set.";
+    return 1;
+  fi '
 
 function build_gffs()
 {
-  if [ -z "$GENII_INSTALL_DIR" ]; then
-    echo GENII_INSTALL_DIR is not set.
-    return 1
-  fi
+  eval $GFFS_CHECK_VARS
+  #zapem
   pushd "$GENII_INSTALL_DIR"
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -24,6 +35,7 @@ function build_gffs()
   # build the trunk.
   ant -Dbuild.targetArch=64 build
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -35,30 +47,28 @@ function build_gffs()
 
 function rebuild_gffs()
 {
-  if [ -z "$GENII_INSTALL_DIR" ]; then
-    echo GENII_INSTALL_DIR is not set.
-    return 1
-  fi
+  eval $GFFS_CHECK_VARS
+  #zapem
   pushd "$GENII_INSTALL_DIR"
   ant clean
-
+  popd
   if [ $? -ne 0 ]; then
     error_sound
     return 1
   fi
-  popd
   build_gffs
 }
 
 # a shortcut for doing a new build and creating a bootstrap container with it.
 function rebu_bootstrap()
 {
+  eval $GFFS_CHECK_VARS
   rebuild_gffs 
   if [ $? -ne 0 ]; then echo "failed to rebuild gffs code"; return 1; fi
 
-  quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  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"
@@ -74,12 +84,13 @@ function rebu_bootstrap()
 # a shortcut for building without a clean, and creating a bootstrap container with the code.
 function bu_bootstrap()
 {
+  eval $GFFS_CHECK_VARS
   build_gffs 
   if [ $? -ne 0 ]; then echo "failed to rebuild gffs code"; return 1; fi
 
-  quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  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"
@@ -95,7 +106,8 @@ function bu_bootstrap()
 # a shortcut for doing a quick build and then creating an installer.
 function fast_install_build()
 {
-  bash "$GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh" $*
+  eval $GFFS_CHECK_VARS
+  bash "$GFFS_TOOLKIT_ROOT/tools/installer/build_installer.sh" $* fast
   if [ $? -ne 0 ]; then
     echo "failed to create the installer."
     error_sound