build from latest GT stable source installer

[gssapi-openssh.git] / nmi / testscript

diff --git a/nmi/testscript b/nmi/testscript
index 0df792fdfed701c88465bf8737cb2d41f3ac98b0..0a1c726f10767abe3e80050fec57d91eda5608e8 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -1,13 +1,5 @@
 #!/bin/sh
 set -e # exit on any error
-if test "$NMI_PLATFORM" = "ia64_sles_9" -o \
-        "$NMI_PLATFORM" = "sun4u_sol_5.9"; then
-  GT_INSTALLER=gt4.0.4-all-source-installer.tar.gz
-  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.4/installers/src/$GT_INSTALLER
-else
-  GT_INSTALLER=gt4.0.4-$NMI_PLATFORM-installer.tar.gz
-  GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.4/installers/bin/$GT_INSTALLER
-fi
 GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus
 ZLIB_LOCATION=$_CONDOR_SCRATCH_DIR/zlib
 LOGNAME=$USER
@@ -21,25 +13,6 @@ echo ==================================================
 echo Directory contents:
 ls -Rl
 echo ==================================================
-echo PATHs:
-echo `which wget`
-echo `which curl`
-echo `which ncftpget`
-echo `which ftp`
-echo ==================================================
-echo Installing Globus Toolkit...
-if test -x `which wget`; then
-  wget $GT_INSTALLER_URL
-else
-  curl $GT_INSTALLER_URL > $GT_INSTALLER
-fi
-tar xfz $GT_INSTALLER
-cd gt*-installer
-./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose"
-make gsi-openssh install
-. $GLOBUS_LOCATION/etc/globus-user-env.sh
-cd ..
-echo ==================================================
 if test -d /prereq/zlib-1.2.3; then
   ZLIB_LOCATION=/prereq/zlib-1.2.3
   echo zlib found in $ZLIB_LOCATION
@@ -52,6 +25,15 @@ else
   cd ..
 fi
 echo ==================================================
+echo Installing Globus Toolkit...
+tar xfj gt*-all-source-installer.tar.bz2
+cd gt*-installer
+./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
+            --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
+make gsi-openssh install
+. $GLOBUS_LOCATION/etc/globus-user-env.sh
+cd ..
+echo ==================================================
 GLOBUS_FLAVOR_NAME=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
 export GLOBUS_FLAVOR_NAME
 echo GPT GLOBUS_FLAVOR_NAME is $GLOBUS_FLAVOR_NAME.  Installing globus_core.
@@ -84,6 +66,7 @@ if test -d openssh; then
       --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
     make install
   fi
+  cd ..
 fi
 if test -f nightly.tar.gz; then
     echo ==================================================
@@ -91,7 +74,8 @@ if test -f nightly.tar.gz; then
     GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus-trunk
     tar xfz nightly.tar.gz
     cd gtTRUNK-all-source-installer
-    ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose"
+    ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
+                --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
     make gsi-openssh install
     . $GLOBUS_LOCATION/etc/globus-user-env.sh
     cd ..
@@ -115,7 +99,6 @@ if test -f nightly.tar.gz; then
         cd openssh
         if test -f make_gpt_dist; then
             echo Building GSI-OpenSSH GPT package from CVS...
-            ./make_gpt_dist
             gpt-build -force -verbose gsi_openssh-*.tar.gz $GLOBUS_FLAVOR_NAME \
                 GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
         else
@@ -129,4 +112,5 @@ if test -f nightly.tar.gz; then
             make install
         fi
     fi
+fi
 ) 2>&1 # we want stdout & stderr mixed in the output file