projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.131' into dev
[feisty_meow.git]
/
scripts
/
buildor
/
gffs_builders.sh
diff --git
a/scripts/buildor/gffs_builders.sh
b/scripts/buildor/gffs_builders.sh
index 26ff6abdc6720b3eea400b73bf847e9d2f9744cd..ed94db1a188baf2c5172c4dd193b5c897fb0174e 100644
(file)
--- 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()
{
function zapem()
{
- bash $
XSEDE_TES
T_ROOT/library/zap_genesis_javas.sh
+ bash $
GFFS_TOOLKI
T_ROOT/library/zap_genesis_javas.sh
}
# a macro for testing the configuration.
export GFFS_CHECK_VARS='
}
# a macro for testing the configuration.
export GFFS_CHECK_VARS='
- if [ -z "$GENII_INSTALL_DIR" -o -z "$
XSEDE_TES
T_ROOT" ]; then
- echo "GENII_INSTALL_DIR is not set.";
+ if [ -z "$GENII_INSTALL_DIR" -o -z "$
GFFS_TOOLKI
T_ROOT" ]; then
+ echo "GENII_INSTALL_DIR
or GFFS_TOOLKIT_ROOT
is not set.";
return 1;
fi '
function build_gffs()
{
eval $GFFS_CHECK_VARS
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
#zapem
pushd "$GENII_INSTALL_DIR"
if [ $? -ne 0 ]; then
+ popd
error_sound
return 1
fi
error_sound
return 1
fi
@@
-38,6
+35,7
@@
function build_gffs()
# build the trunk.
ant -Dbuild.targetArch=64 build
if [ $? -ne 0 ]; then
# build the trunk.
ant -Dbuild.targetArch=64 build
if [ $? -ne 0 ]; then
+ popd
error_sound
return 1
fi
error_sound
return 1
fi
@@
-50,19
+48,14
@@
function build_gffs()
function rebuild_gffs()
{
eval $GFFS_CHECK_VARS
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
#zapem
pushd "$GENII_INSTALL_DIR"
ant clean
-
+ popd
if [ $? -ne 0 ]; then
error_sound
return 1
fi
if [ $? -ne 0 ]; then
error_sound
return 1
fi
- popd
build_gffs
}
build_gffs
}
@@
-75,7
+68,7
@@
function rebu_bootstrap()
quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
if [ ! -f "$quickstarter" ]; then
quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
if [ ! -f "$quickstarter" ]; then
- quickstarter="$
XSEDE_TES
T_ROOT/library/bootstrap_quick_start.sh"
+ quickstarter="$
GFFS_TOOLKI
T_ROOT/library/bootstrap_quick_start.sh"
fi
bash "$quickstarter"
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="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
if [ ! -f "$quickstarter" ]; then
- quickstarter="$
XSEDE_TES
T_ROOT/library/bootstrap_quick_start.sh"
+ quickstarter="$
GFFS_TOOLKI
T_ROOT/library/bootstrap_quick_start.sh"
fi
bash "$quickstarter"
fi
bash "$quickstarter"
@@
-114,7
+107,7
@@
function bu_bootstrap()
function fast_install_build()
{
eval $GFFS_CHECK_VARS
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
if [ $? -ne 0 ]; then
echo "failed to create the installer."
error_sound