Changeset 22028

Timestamp:

08/30/17 22:25:38 (8 years ago)

Author:

dlcheng

Message:

ADD: ar-lib.patch for windows compilation/linking bug. CHG: Updating autotools/install-win.sh to install m4. Updating jenkins.sh to add windows compilers to path before externalpackages to allow for m4 compilation.

Location:

issm/trunk-jpl

Files:

• externalpackages/autotools/install-win.sh (modified) (2 diffs)
• externalpackages/autotools/patches/ar-lib.patch (added)
• jenkins/jenkins.sh (modified) (3 diffs)

issm/trunk-jpl/externalpackages/autotools/install-win.sh

@@ -8 +8 @@
 
 #install m4
-#echo " === INSTALLING M4 =="
-#rm -rf src
-#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m4-1.4.17.tar.gz' 'm4-1.4.17.tar.gz'
-#tar -zxvf m4-1.4.17.tar.gz
-#mv m4-1.4.17 src
-#cd src
-#./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-#make
-#make install
-#cd ..
+echo " === INSTALLING M4 =="
+rm -rf src
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m4-1.4.17.tar.gz' 'm4-1.4.17.tar.gz'
+tar -zxvf m4-1.4.17.tar.gz
+mv m4-1.4.17 src
+cd src
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
+make install
+cd ..
 
 #install autoconf
@@ -64 +64 @@
 # compiler.
 patch ./install/bin/automake < ./patches/automake.patch
+
+# This patch is for ar-lib, and removes carriage return characters that cause
+# commands to overwrite themselves and be misinterpreted during linking on 
+# Cygwin Windows.
+patch ./install/share/automake-1.14/ar-lib < ./patches/ar-lib.patch

issm/trunk-jpl/jenkins/jenkins.sh

@@ -127 +127 @@
 echo "<testsuite tests=\"$NUMPACKAGES\">" > $EXTERNAL_TEST_FILE
 
-# Need a source here for when builds start midway through installation of 
-# externalpackages.
+# Need a source here for when builds start midway through installation of externalpackages.
 source $ISSM_DIR/etc/environment.sh
+
+if [ "$OS" == "win" ]; then
+        echo " == WINDOWS ENVIRONMENT DETECTED =="
+        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
+fi
 
 EXTERNALPACKAGES_FAILED=0;
@@ -183 +187 @@
 fi
 
-
+# Source here to include any newly installed externalpackages on the path. 
 source $ISSM_DIR/etc/environment.sh
 
@@ -199 +203 @@
         source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
 fi
+
 #}}}
 #ISSM compilation yes/no                (ISSM_COMPILATION) {{{