Changeset 18392

Timestamp:

08/14/14 16:15:09 (11 years ago)

Author:

glperez

Message:

CHG: Updated OSX packager script.

Location:

issm/trunk-jpl

Files:

• externalpackages/dakota/install-5.3.1-macosx64.sh (modified) (1 diff)
• externalpackages/mpich/install-3.0-macosx64.sh (modified) (1 diff)
• externalpackages/petsc/install-3.5-macosx64.sh (modified) (1 diff)
• packagers/macosx/package.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/install-5.3.1-macosx64.sh ¶

@@ -25 +25 @@
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/5.3.1/BuildDakotaCustom.cmake.mac.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/5.3.1/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/5.3.1/CMakeLists.txt.patch
 
 #Apply patches

issm/trunk-jpl/externalpackages/mpich/install-3.0-macosx64.sh ¶

@@ -20 +20 @@
 ./configure \
         --prefix="$ISSM_DIR/externalpackages/mpich/install" \
-        --enable-shared
 
         #CC=llvm-gcc \

issm/trunk-jpl/externalpackages/petsc/install-3.5-macosx64.sh ¶

@@ -23 +23 @@
         --with-valgrind=0 \
         --with-x=0 \
-        --with-shared-libraries=1 \
+        --with-ssl=0 \
+        --with-shared-libraries=0 \
+   --download-fblaslapack=1 \
         --download-metis=1 \
         --download-parmetis=1 \

issm/trunk-jpl/packagers/macosx/package.sh ¶

@@ -2 +2 @@
 
 #Package using the Package Maker from OSX, driven by command line.
+tarball_name='issm-mac-static_build.tar.gz'
+
+cd $ISSM_DIR
+
 echo "Cleanup first" 
-sudo sh -c "rm -rf ISSM-MacOSX.pkg bin test"
+ 
+rm $tarball_name
 
-#We need to copy all the relevant files and set the permissions, as PackageMaker 
-#is not good at that. 
-echo "Copy bin" 
-cp -Rf $ISSM_TIER/bin ./
-echo "Copy test" 
-cp -Rf $ISSM_TIER/test ./
-cp matlabissm startup.m ./bin
-
-#Now change group and ownership: 
-echo "Change group and ownership" 
-sudo sh -c "chown -R root ./bin && chgrp -R admin ./bin"
-sudo sh -c "chown -R root ./test && chgrp -R admin ./test"
-
-echo "Launch packagemaker" 
-PackageMaker -d ISSM.pmdoc -o ISSM-MacOSX.pkg
-
-#cleanup
-echo "Final cleanup"
-sudo sh -c "rm -rf ./bin && rm -rf ./test"
+echo "Creating tarball: ${tarball_name}"
+tar -czf $tarball_name ./bin ./lib ./test ./examples