Changeset 22788

Timestamp:

05/15/18 15:56:49 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying out ubuntu and cleaning up install of macOSX

Location:

issm/trunk

Files:

• jenkins/linux64_ross_static (modified) (2 diffs)
• jenkins/macosx_pine-island_static (modified) (1 diff)
• packagers/macosx/package.sh (modified) (3 diffs)
• packagers/ubuntu/package.sh (modified) (2 diffs)

issm/trunk/jenkins/linux64_ross_static

@@ -23 +23 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+        --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
         --with-numthreads=4'
@@ -41 +42 @@
                                                 petsc        install-3.7-linux64-static.sh
                                                 triangle     install-linux64.sh
+                                                math77        install.sh
+                                                gmsh          install-static.sh
                                                 shell2junit  install.sh"
 

issm/trunk/jenkins/macosx_pine-island_static

@@ -43 +43 @@
                                                 math77        install.sh
                                                 gmsh          install-static.sh
-                                                hdf5          install.sh
-                                                netcdf        install.sh
-                                                gdal          install-1.10-linux64-nopython.sh
-                                                gshhg         install.sh
-                                                gmt           install-static.sh
                                                 shell2junit  install.sh"
 

issm/trunk/packagers/macosx/package.sh

@@ -13 +13 @@
         echo "gmsh not found"
 fi
-echo "move gmt to bin" 
-if [ -f ../externalpackages/gmt/install/bin/gmt ]; then
-        cp ../externalpackages/gmt/install/bin/gmt .
-else
-        echo "gmt not found"
-fi
 
 #Check that test101 runs
@@ -32 +26 @@
 fi
 
-#Package using the Package Maker from OSX, driven by command line.
 tarball_name='issm-mac-static_build.tar.gz'
 
@@ -43 +36 @@
 rm -rf trunk
 mkdir trunk
-#Need script to download data
 cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk

issm/trunk/packagers/ubuntu/package.sh

@@ -7 +7 @@
 cp ../externalpackages/mpich/install/bin/mpiexec .
 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+        cp ../externalpackages/gmsh/install/gmsh .
+else
+        echo "gmsh not found"
+fi
 
 #Check that test101 runs
@@ -30 +36 @@
 rm -rf trunk
 mkdir trunk
-cp -rf bin lib test examples trunk/
+cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk
 ls -lah $tarball_name