Permalink
Browse files

Revert "Moved these more esoteric scripts to their own subdirectory"

This reverts commit 62dcf64.

We forgot to branch off 2.7 docs before adding 2.8 doc info. Fixing
this by branching 2.7 docs and reverting a few 2.8 specific commits.
  • Loading branch information...
1 parent a9d709a commit 1b24c963a645f313c71a771b3258fc144bef09c6 @labisso labisso committed Aug 2, 2011
View
2 cloud-client/README.txt
@@ -34,7 +34,7 @@ This will do the following:
6) Set up that directory as GLOBUS_LOCATION for the next step
- 7) Call the "../scripts/gt/clients-only-build-and-install.sh" script in the Nimbus source tree.
+ 7) Call the "../bin/clients-only-build-and-install.sh" script in the Nimbus source tree.
Since the embedded Globus directory is set up as GLOBUS_LOCATION, it will install the
client libraries there.
View
2 cloud-client/builder/environment.sh
@@ -35,7 +35,7 @@ export GLOBUS_LOCATION="$CLCLBUILDER_DIST_DIRECTORY/lib/globus"
# #########################################################
-export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/gt/clients-only-build-and-install.sh"
+export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/clients-only-build-and-install.sh"
# #########################################################
View
2 docs/src/admin/reference.html
@@ -1853,7 +1853,7 @@
<p>
If you want to install the broker separately from Nimbus, download the
Nimbus source tarball, extract it, and run
- <i>scripts/gt/broker-build-and-install.sh</i> with an appropriate
+ <i>scripts/broker-build-and-install.sh</i> with an appropriate
<b>$GLOBUS_LOCATION</b> set.
</p>
<p>
View
2 docs/src/dev/cumulus_integration.txt
@@ -213,6 +213,6 @@ The variables are:
NOTE: If you move $NIMBUS_HOME, you need to call nimbus-configure again.
-If Nimbus is installed via ./scripts/gt/all-build-and-install.sh these
+If Nimbus is installed via ./scripts/all-build-and-install.sh these
variables will have to be manually set.
View
4 docs/src/dev/reference.html
@@ -401,7 +401,7 @@
</p>
<p>
- First run _PATH(scripts/gt/all-clean.sh).
+ First run _PATH(bin/all-clean.sh).
</p>
<p>
Then edit the "compact" WSDL in the
@@ -433,7 +433,7 @@
<p>
That creates the new wsdl. Now you need to create the auto-generated "stub"
- code Java jars. Do this by running "scripts/gt/stubs-build.sh"
+ code Java jars. Do this by running "scripts/stubs-build.sh"
</p>
<p>
View
4 install
@@ -41,9 +41,9 @@ if [ -d $NIMBUS_HOME ] && [ "$(ls -A $NIMBUS_HOME)" ]; then
echo "The destination directory '$NIMBUS_HOME' exists and is not empty."
echo "It is not recommended to reinstall Nimbus into an existing install."
echo ""
- echo "If you are making changes to the service code, you can build and install those directly:"
+ echo "If you are making changes to the services, you can build and install those directly:"
echo " export GLOBUS_LOCATION=$NIMBUS_HOME/services"
- echo " scripts/jars-build-and-install.sh"
+ echo " scripts/all-build-and-install.sh"
echo ""
echo "If you know what you are doing and want to reinstall, edit this script:"
echo " $0"
View
2 libexec/create-nimbus-home
@@ -134,7 +134,7 @@ echo "-----------------------------------------------------------------"
GLOBUS_LOCATION=$CONTAINER_DIR
export GLOBUS_LOCATION
-$NIMBUS_SRC/scripts/gt/all-build-and-install.sh
+$NIMBUS_SRC/scripts/all-build-and-install.sh
if [ $? -ne 0 ]; then
echo "Build and install FAILED!"
exit 1
View
9 scripts/gt/README.txt → scripts/README.txt
@@ -1,8 +1,9 @@
-These scripts are for building and deploying into an existing Globus
-container. Most users will want to use the ./install script, these
-scripts are for developers and also used from certain higher level
-scripts.
+_________________________________________________________________________
+Ant build and deploy scripts:
+_________________________________________________________________________
+These scripts are for building and deploying into an existing Globus
+container. Most users will want to use the ./install script.
* all-build-and-install.sh - The main installation script
* clients-only-build-and-install.sh - Main client-only installation script
View
2 scripts/gt/all-build-and-install.sh → scripts/all-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install all"
NIMBUS_ANT_CMD="deploy-default-GT4.0-service -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/all-build.sh → scripts/all-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build all"
NIMBUS_ANT_CMD="build-default-GT4.0-service $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/all-clean.sh → scripts/all-clean.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="clean all"
NIMBUS_ANT_CMD="clean-all $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/all-install.sh → scripts/all-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install all"
NIMBUS_ANT_CMD="deploy-default-GT4.0-service $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/all-uninstall.sh → scripts/all-uninstall.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="uninstall all"
NIMBUS_ANT_CMD="undeploy-GT4.0-all $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/broker-build-and-install.sh → scripts/broker-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install Context Broker"
NIMBUS_ANT_CMD="deploy-broker -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/broker-build.sh → scripts/broker-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build Context Broker"
NIMBUS_ANT_CMD="build-broker $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/broker-install.sh → scripts/broker-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install Context Broker"
NIMBUS_ANT_CMD="deploy-broker $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/clients-only-build-and-install.sh → scripts/clients-only-build-and-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build and install clients only"
NIMBUS_ANT_CMD="deploy-default-GT4.0-clients-only -Dbuild.also=x $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/clients-only-build.sh → scripts/clients-only-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build clients only"
NIMBUS_ANT_CMD="build-default-GT4.0-clients-only $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/clients-only-install.sh → scripts/clients-only-install.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="install clients only"
NIMBUS_ANT_CMD="deploy-default-GT4.0-clients-only $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh
View
2 scripts/gt/stubs-build.sh → scripts/stubs-build.sh
@@ -3,7 +3,7 @@
NIMBUS_PRINTNAME="build all"
NIMBUS_ANT_CMD="build-stubs $*"
-BASEDIR_REL="`dirname $0`/../.."
+BASEDIR_REL="`dirname $0`/.."
BASEDIR=`cd $BASEDIR_REL; pwd`
RUN=$BASEDIR/scripts/lib/gt4.0/build/run.sh

0 comments on commit 1b24c96

Please sign in to comment.