Changeset 25855

Timestamp:

12/11/20 13:35:20 (4 years ago)

Author:

jdquinn

Message:

CHG: Applying path to Mac config; clean up

Location:

issm/trunk-jpl/externalpackages/chaco

Files:

• install-mac-sierra.sh (moved) (moved from issm/trunk-jpl/externalpackages/chaco/install-macosx64-sierra.sh ) (1 diff)
• install-macosx64.sh (deleted)
• install.sh (modified) (2 diffs)
• patches/Makefile.mac-sierra.patch (moved) (moved from issm/trunk-jpl/externalpackages/chaco/patches/Makefile.macosx64-sierra.patch )

issm/trunk-jpl/externalpackages/chaco/install-mac-sierra.sh

@@ -24 +24 @@
 
 # Patch src/code/Makefile
-patch ./src/code/Makefile ./patches/Makefile.macosx64-sierra.patch
+patch ./src/code/Makefile ./patches/Makefile.mac-sierra.patch
 
 

issm/trunk-jpl/externalpackages/chaco/install.sh

@@ -2 +2 @@
 set -eu
 
-# Some cleanup
-rm -rf Chaco-2.2
-rm -rf src 
-rm -rf install 
-mkdir src install 
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz'
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf'
+## Constants
+#
+VER=2.2
 
-# Untar 
-tar -xvzf Chaco-2.2.tar.gz
+PREFIX="${ISSM_DIR}/externalpackages/chaco/install" # Set to location where external package should be installed
 
-# Move chaco to src directory
-mv Chaco-2.2/* src
-rm -rf Chaco-2.2
+# Cleanup
+rm -rf ${PREFIX} src Chaco-${VER}
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/Chaco-${VER}.tar.gz" "Chaco-${VER}.tar.gz"
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/docs/chaco_guide.pdf" "chaco_guide.pdf"
+
+# Unpack source
+tar -xvzf Chaco-${VER}.tar.gz
+
+# Move source to 'src' directory
+mv Chaco-${VER}/* src
+rm -rf Chaco-${VER}
 
 # Apply patches (all at once)
-# (written by diff -rc src ~/Libs/Chaco-2.2 > chaco.patch)
+# (written by diff -rc src ~/Libs/Chaco-${VER} > chaco.patch)
 patch -R -p0 < chaco.patch
+patch src/code/Makefile patches/Makefile.patch
 
-# Build chaco
+# Compile
 cd src/code
 if [ $# -eq 0 ]; then
@@ -36 +42 @@
 cd ../..
 
-# Populate install directory
-cp -p src/exec/README install
-cp -p src/exec/User_Params install
-cp -p src/exec/*.coords install
-cp -p src/exec/*.graph install
-mkdir install/include
-cp -p src/code/main/defs.h install/include/defs.h
-cp -p src/code/main/params.h install/include/params.h
-cp -p chaco.h install/include/chaco.h
-mkdir install/lib
-mv src/code/chaco.a install/lib/libchaco.a
-mv src/code/chacominusblas.a install/lib/libchacominusblas.a
-mkdir install/exec
-mv src/exec/chaco install/exec
+# Install
+cp -p src/exec/README ${PREFIX}
+cp -p src/exec/User_Params ${PREFIX}
+cp -p src/exec/*.coords ${PREFIX}
+cp -p src/exec/*.graph ${PREFIX}
+mkdir ${PREFIX}/include
+cp -p src/code/main/defs.h ${PREFIX}/include/defs.h
+cp -p src/code/main/params.h ${PREFIX}/include/params.h
+cp -p chaco.h ${PREFIX}/include/chaco.h
+mkdir ${PREFIX}/lib
+mv src/code/chaco.a ${PREFIX}/lib/libchaco.a
+mv src/code/chacominusblas.a ${PREFIX}/lib/libchacominusblas.a
+mkdir ${PREFIX}/exec
+mv src/exec/chaco ${PREFIX}/exec