build against both GT 4.0 and GT 4.2 releases and branches.

update NMI build platforms.

diff --git a/nmi/cmdfile b/nmi/cmdfile
index 6b584eddf36a3dbf460286a848bf74ccefec8a96..92798477237df8874d18163ae4acbff1b4dc491b 100644 (file)
--- a/nmi/cmdfile
+++ b/nmi/cmdfile
@@ -6,14 +6,12 @@ run_type = build
 #inputs = gsissh-src.ftp, gsissh-nmi.cvs, zlib-src.ftp
 description = GSI-OpenSSH
 component_version = CVS
-inputs = gsissh-src.cvs, gsissh-nmi.cvs, zlib-src.ftp, autotools.cvs, gt-nightly.ftp, gt-release.ftp
+inputs = gsissh-src.cvs, gsissh-nmi.cvs, zlib-src.ftp, autotools.cvs, gt-head-nightly.ftp, gt-4.0-branch-nightly.ftp, gt-4.2-branch-nightly.ftp, gt-40-release.ftp, gt-42-release.ftp
 remote_task = gssapi-openssh/nmi/testscript
 remote_task_timeout = 360
 max_match_wait = 86400
-platforms = ia64_sles_9, ppc_aix_5.2-pl5, ppc_macos_10.4, sun4u_sol_5.9, x86_64_rhas_3, x86_64_rhas_4, x86_deb_3.1, x86_rhas_3, x86_rhas_4
-#prereqs = zlib-1.2.3
-prereqs_ppc_macos_10.4 = curl-7.15.1, openssl-0.9.7-shared
-prereqs_sun4u_sol_5.9 = curl-7.15.1, tar-1.14, patch-2.5.4, m4-1.4.1, flex-2.5.4a, make-3.80, byacc-1.9, gzip-1.2.4, gcc-3.4.3, coreutils-5.2.1, perl-5.8.5, openssl-0.9.7-shared
+platforms = x86_64_macos_10.5, ppc_aix_5.2-pl5, sun4u_sol_5.10, x86_rhap_5, x86_64_rhap_5
+prereqs_sun4u_sol_5.10 = curl-7.15.1, tar-1.14, patch-2.5.4, m4-1.4.1, flex-2.5.4a, make-3.80, byacc-1.9, gzip-1.2.4, gcc-3.4.3, coreutils-5.2.1, perl-5.8.5, openssl-0.9.8k-shared
 prereqs_ppc_aix_5.2-pl5 = tar-1.14, make-3.80, flex-2.5.4a, perl-5.8.5, bison-1.25, vac-6, vacpp-6, openssl-0.9.8e-shared
-prereqs_x86_fc_4 = openssl-0.9.8e-shared
+prereqs_ppc_aix_5.3 = tar-1.14, make-3.80, flex-2.5.4a, bison-1.25, vac-6, vacpp-6, openssl-0.9.8k-shared
 notify = jbasney@ncsa.uiuc.edu

diff --git a/nmi/gt-4.0-branch-nightly.ftp b/nmi/gt-4.0-branch-nightly.ftp
new file mode 100644 (file)
index 0000000..367e143
--- /dev/null
+++ b/nmi/gt-4.0-branch-nightly.ftp
@@ -0,0 +1,5 @@
+method = ftp
+ftp_root = http://
+ftp_target = www.globus.org/globus_4_0_branch/nightly.tar.gz
+ftp_args = -O gt-4.0-branch-nightly.tar.gz
+untar = false

diff --git a/nmi/gt-4.2-branch-nightly.ftp b/nmi/gt-4.2-branch-nightly.ftp
new file mode 100644 (file)
index 0000000..4c638cd
--- /dev/null
+++ b/nmi/gt-4.2-branch-nightly.ftp
@@ -0,0 +1,5 @@
+method = ftp
+ftp_root = http://
+ftp_target = www.globus.org/globus_4_2_branch/nightly.tar.gz
+ftp_args = -O gt-4.2-branch-nightly.tar.gz
+untar = false

diff --git a/nmi/gt-40-release.ftp b/nmi/gt-40-release.ftp
new file mode 100644 (file)
index 0000000..731a731
--- /dev/null
+++ b/nmi/gt-40-release.ftp
@@ -0,0 +1,4 @@
+method = ftp
+ftp_root = http://
+ftp_target = www.globus.org/ftppub/gt4/4.0/4.0.8/installers/src/gt4.0.8-all-source-installer.tar.gz
+untar = false

diff --git a/nmi/gt-42-release.ftp b/nmi/gt-42-release.ftp
new file mode 100644 (file)
index 0000000..e538ae3
--- /dev/null
+++ b/nmi/gt-42-release.ftp
@@ -0,0 +1,4 @@
+method = ftp
+ftp_root = http://
+ftp_target = www.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.gz
+untar = false

diff --git a/nmi/gt-nightly.ftp b/nmi/gt-nightly.ftp
deleted file mode 100644 (file)
index c2190ac..0000000
--- a/nmi/gt-nightly.ftp
+++ /dev/null
@@ -1,4 +0,0 @@
-method = ftp
-ftp_root = http://
-ftp_target = www.globus.org/HEAD/nightly.tar.gz
-untar = false

diff --git a/nmi/gt-release.ftp b/nmi/gt-release.ftp
deleted file mode 100644 (file)
index d723cd9..0000000
--- a/nmi/gt-release.ftp
+++ /dev/null
@@ -1,4 +0,0 @@
-method = ftp
-ftp_root = http://
-ftp_target = www.globus.org/ftppub/gt4/4.0/4.0.7/installers/src/gt4.0.7-all-source-installer.tar.gz
-untar = false

diff --git a/nmi/testscript b/nmi/testscript
index d39ce0101cd1046142c616e3d3c3bbaea0792b2d..9f0ea2c00c48a07349f5ee80c38d7337353a734a 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -45,101 +45,53 @@ else
   make install
   cd ..
 fi
-echo ==================================================
-echo Installing Globus Toolkit...
-tar xfz gt*-all-source-installer.tar.gz
-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 ==================================================
-echo Environment variables:
-env
-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.
-gpt-build -nosrc $GLOBUS_FLAVOR_NAME
-if test -f gsi_openssh_bundle-*.tar.gz; then
-  echo ==================================================
-  echo Building GSI-OpenSSH GPT bundle...
-  gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
-    GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
-fi
-if test -d gssapi-openssh/openssh; then
+for installer in `ls gt*-all-source-installer.tar.gz *nightly.tar.gz`; do
   echo ==================================================
-  echo Installing autotools...
-  cd autotools
-  ./install-autotools $GLOBUS_LOCATION
+  echo Installing Globus Toolkit \($installer\)...
+  tar xfz $installer
+  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 ==================================================
-  cd gssapi-openssh/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 \
+  echo Environment variables:
+  env
+  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.
+  if test -f gsi_openssh_bundle-*.tar.gz; then
+    echo ==================================================
+    echo Building GSI-OpenSSH GPT bundle...
+    gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
       GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
-  else
-    echo Building GSI-OpenSSH from CVS trunk...
-    autoreconf
-    ./configure --prefix=$GLOBUS_LOCATION \
-      --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
-      --with-zlib=$ZLIB_LOCATION \
-      --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
-    make install-nokeys # nonroot
   fi
-  cd ../..
-fi
-rm -rf gt*-installer
-if test -f nightly.tar.gz; then
+  if test -d gssapi-openssh/openssh; then
     echo ==================================================
-    echo Installing GT CVS Trunk...
-    GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus-trunk
-    tar xfz nightly.tar.gz
-    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
+    echo Installing autotools...
+    cd autotools
+    ./install-autotools $GLOBUS_LOCATION
     cd ..
     echo ==================================================
-    echo Environment variables:
-    env
-    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.
-    if test -f gsi_openssh_bundle-*.tar.gz; then
-        echo ==================================================
-        echo Building GSI-OpenSSH GPT bundle...
-        gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
-            GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
+    cd gssapi-openssh/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
+      echo Building GSI-OpenSSH from CVS trunk...
+      autoreconf
+      ./configure --prefix=$GLOBUS_LOCATION \
+        --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
+        --with-zlib=$ZLIB_LOCATION \
+        --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
+      make install-nokeys # nonroot
     fi
-    if test -d gssapi-openssh/openssh; then
-        echo ==================================================
-        echo Installing autotools...
-        cd autotools
-        ./install-autotools $GLOBUS_LOCATION
-        cd ..
-        echo ==================================================
-        cd gssapi-openssh/openssh
-        if test -f make_gpt_dist; then
-            echo Building GSI-OpenSSH GPT package from CVS...
-            rm -rf BUILD
-            gpt-build -force -verbose gsi_openssh-*.tar.gz $GLOBUS_FLAVOR_NAME \
-                GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
-        else
-            echo Building GSI-OpenSSH from CVS trunk...
-            autoreconf
-            ./configure --prefix=$GLOBUS_LOCATION \
-                --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
-                --with-zlib=$ZLIB_LOCATION \
-                --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
-            make clean
-            make install-nokeys # nonroot
-        fi
-    fi
-fi
+    cd ../..
+  fi
+  rm -rf gt*-installer $GLOBUS_LOCATION
+done
 ) 2>&1 # we want stdout & stderr mixed in the output file