Changeset 18429

Timestamp:

08/16/14 21:21:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: test101 should test actual package

Location:

issm/trunk-jpl/packagers/macosx

Files:

• install.sh (modified) (1 diff)
• package.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/macosx/install.sh

@@ -120 +120 @@
 
 echo "Building..."
-make -j 4 
+#make -j 4 
 if [ $? -ne 0 ]; then echo "FAILED TO BUILD!" && exit 1; fi
 

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

@@ -1 +1 @@
 #!/bin/bash
+
+echo "modify generic" 
+cd $ISSM_DIR/bin
+cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
+echo "move mpiexec to bin" 
+cp ../externalpackages/mpich/install/bin/mpiexec .
+cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
 
 #Check that test101 runs
@@ -20 +27 @@
 rm $tarball_name
 
-echo "modify generic" 
-cd $ISSM_DIR/bin
-cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
+
 
 echo "Creating tarball: ${tarball_name}"
 cd $ISSM_DIR
-tar -czf $tarball_name ./bin ./lib ./test ./examples externalpackages/mpich/install/bin/mpiexec externalpackages/mpich/install/bin/hydra_pmi_proxy
+tar -czf $tarball_name ./bin ./lib ./test ./examples
 ls