X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/cac90bb289ef0dec3fcd2da7eade51340ee5d727..3d61c53135e9d7e5b096e90ab8fcbc1a405618fb:/nmi/testscript

diff --git a/nmi/testscript b/nmi/testscript
index 0a1c726..20ec1b3 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -6,6 +6,35 @@ LOGNAME=$USER
 X509_CERT_DIR=$GLOBUS_LOCATION/share/certificates
 export GLOBUS_LOCATION LOGNAME X509_CERT_DIR
 (
+if test -n "${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+elif test -n "${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+elif test -n "${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+fi
+if test -n "${LD_LIBRARY_PATH}" -a -z "${LIBPATH}"; then
+    LIBPATH=$LD_LIBRARY_PATH
+    export LIBPATH
+fi
 echo ==================================================
 echo Environment variables:
 env
@@ -24,93 +53,59 @@ else
   make install
   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.
-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 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 globus_usage gsi-openssh install
+  . $GLOBUS_LOCATION/etc/globus-user-env.sh
   cd ..
   echo ==================================================
-  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 \
+  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...
+    rm -rf BUILD
+    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
   fi
-  cd ..
-fi
-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 gtTRUNK-all-source-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 ==================================================
-    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
+    cp -r openssh openssh.build
+    cd openssh.build
+    if test -f make_gpt_dist; then
+      echo Building GSI-OpenSSH GPT package from CVS...
+      rm -f gsi_openssh-*.tar.gz
+      ./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 openssh; then
-        echo ==================================================
-        echo Installing autotools...
-        cd autotools
-        ./install-autotools $GLOBUS_LOCATION
-        cd ..
-        echo ==================================================
-        cd openssh
-        if test -f make_gpt_dist; then
-            echo Building GSI-OpenSSH GPT package from CVS...
-            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
-        fi
-    fi
-fi
+    cd ..
+    rm -rf openssh.build
+    cd ..
+  fi
+  rm -rf gt*-installer $GLOBUS_LOCATION
+done
 ) 2>&1 # we want stdout & stderr mixed in the output file