X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fbuildor%2Fgffs_builders.sh;h=ed94db1a188baf2c5172c4dd193b5c897fb0174e;hb=2eab636d6e37cd612c1a77bb50d4e30458724f6a;hp=22ad74de45253901712aafbf42ae874651ab8941;hpb=bd6999db7b8e63614b767e15b32ee2f8884fe734;p=feisty_meow.git

diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 22ad74de..ed94db1a 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -20,13 +20,10 @@ export GFFS_CHECK_VARS='
 function build_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_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 "$GFFS_TOOLKIT_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
 }
 
@@ -114,7 +107,7 @@ function bu_bootstrap()
 function fast_install_build()
 {
   eval $GFFS_CHECK_VARS
-  bash "$GFFS_TOOLKIT_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