Changeset 19109

Timestamp:

02/13/15 17:53:55 (10 years ago)

Author:

glperez

Message:

CHG: Modified 'issm_options.m4' and Matlab's 'Makefile.am' to fix the broken Windows build.
CHG: Jenkins Windows script now installs Petsc 3.1 and uses the vendor option MSVC-Win64.
ADD: Added new config script for Win64 environment in externalpackages.
CHG: 'windows_environment.sh' now picks up the new Win64 environment script.
ADD: Added a new config script for Win64 vendor option.

Location:

issm/trunk-jpl

Files:

• configs/config-win64.sh (added)
• externalpackages/petsc/install-3.1-win7.sh (modified) (1 diff)
• externalpackages/windows/configs/sdk7.1-win64.sh (added)
• externalpackages/windows/windows_environment.sh (modified) (2 diffs)
• jenkins/windows (modified) (2 diffs)
• m4/issm_options.m4 (modified) (4 diffs)
• src/wrappers/matlab/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh

@@ -16 +16 @@
 export PETSC_DIR=`cygpath -u "$ISSM_DIR/externalpackages/petsc/src"`
 export PREFIX_DIR=`cygpath -u "$ISSM_DIR/externalpackages/petsc/install"`
+
+
+# Version 3.1 of Petsc is really old. As such, it is likely that newer machines
+# will not be recognized. As such, the build will fail during configuration.
+# This can be resolved by simply updated the scripts 'config.guess' and 
+# 'config.sub'.
+cp ./../autotools/install/share/libtool/config/config.guess ./src/config/configarch/
+cp ./../autotools/install/share/libtool/config/config.guess ./src/config/BuildSystem/config/packages/
+cp ./../autotools/install/share/libtool/config/config.sub ./src/config/configarch/
+cp ./../autotools/install/share/libtool/config/config.sub ./src/config/BuildSystem/config/packages/
 
 #configure

issm/trunk-jpl/externalpackages/windows/windows_environment.sh

@@ -11 +11 @@
 
 #Determine OS version using uname: 
-version=`uname -s | grep 64`
+version=`uname -m | grep x86_64`
 if [[ $version == "" ]];then
         compiler=1
@@ -27 +27 @@
         source $config_dir/sdk7.1.win7-32.sh
 elif [[ "$compiler" == "2" ]]; then 
-        source $config_dir/sdk7.1.win7-64.sh
+        source $config_dir/sdk7.1-win64.sh
 elif [[ "$compiler" == "3" ]]; then 
         source $config_dir/intel-win7.sh

issm/trunk-jpl/jenkins/windows

@@ -9 +9 @@
         --enable-standalone-libraries \
         --without-Gia \
-        --with-vendor=intel-win7-64  \
+        --with-vendor=MSVC-Win64  \
         --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
@@ -47 +47 @@
 EXTERNALPACKAGES="cccl        install-win7.sh
                                                 cmake       install.sh                
-                                                petsc       install-3.5-win7.sh
+                                                petsc       install-3.1-win7.sh
                                                 triangle    install-win7.sh        
                                                 matlab      install.sh

issm/trunk-jpl/m4/issm_options.m4

@@ -183 +183 @@
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif  test $VENDOR = intel-win7-64; then
+                        export CC=cl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR="ar-lib lib"
+                        export OS_LDFLAG="-Wl,"
+                        export RANLIB=true
+                        OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
+                elif  test $VENDOR = MSVC-Win64; then
                         export CC=cl
                         export CXX=cccl
@@ -262 +271 @@
                         *cygwin*) 
                                 if  test $VENDOR = intel-win7-32; then
-                                        MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win32/microsoft` -no-undefined -Wl,/export:mexFunction -Wl,/LD"
+                                        MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win32/microsoft` -Wl,/export:mexFunction -Wl,/LD"
                                         MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                         MEXEXT=".$MEXEXT"
-                                elif  test l-win7-64; then
-                                        MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win64/microsoft` -no-undefined -Wl,/export:mexFunction -Wl,/LD" 
+                                elif test $VENDOR = intel-win7-64; then
+                                        MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
+                                        MEXEXT=".mexw64"
+                                elif test $VENDOR = MSVC-Win64; then
+                                        MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
                                 fi
+                                IS_WINDOWS=yes
 
                         ;;
@@ -298 +312 @@
                         AC_MSG_ERROR([Couldn't find mex... check your installation of matlab])
            fi
+           if test "x$IS_WINDOWS" = "x" ; then
+                        AC_MSG_ERROR([I'M PRETTY SURE THIS IS SUPPOSED TO BE WINDOWS...])
+           fi
+                AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS="xyes"])
 
                 AC_SUBST([MATLABINCL])
@@ -844 +862 @@
                         MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
                         MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
+                elif test x$VENDOR = xMSVC-Win64; then
+                        MPI_LIBDIR=`cygpath -m $MPI_LIBDIR`
+                        MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
                 fi
 

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -79 +79 @@
 
 #Matlab part
-AM_LDFLAGS = -module $(MEXLINK) -shrext ${EXEEXT} --export-dynamic -rdynamic
+AM_LDFLAGS = -module $(MEXLINK) -shrext ${EXEEXT} --export-dynamic -rdynamic -no-undefined
 if VERSION
 AM_LDFLAGS +=
@@ -92 +92 @@
 AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -fPIC
 
+# This is a temporary fix to an issue with Libtool regarding linking against 
+# static libraries for Windows. Ideally, we would build all libraries as DLLs
+# and and avoid this workaround which removes the dependency of ISSM libraries
+# from the perspective of our build system.
+if WINDOWS
+AM_LDFLAGS += -Wl,./.libs/libISSMMatlab.lib -Wl,./../../c/.libs/libISSMModules.lib -Wl,./../../c/.libs/libISSMCore.lib -Wl,././.libs/libISSMApi.lib
+else
 deps += ./libISSMMatlab.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la
+endif
 
 if ADOLC