Changeset 12878 for issm/branches/trunk-jpl-damage/externalpackages/octave

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• externalpackages (modified) (1 prop)
• externalpackages/octave (modified) (1 prop)
• externalpackages/octave/install.sh (modified) (1 diff)

issm/branches/trunk-jpl-damage/externalpackages

@@ -1 +1 @@
 MITgcm
 OpenAD
+ivins

@@ -1 +1 @@
 MITgcm
 OpenAD
+ivins

issm/branches/trunk-jpl-damage/externalpackages/octave/install.sh

@@ -2 +2 @@
 
 #Some cleanup
-version=3.6.1
-rm -rf src install octave-$version octave-$version.tar.gz
+rm -rf src install octave-3.6.2 
 mkdir install src
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/octave-$version.tar.gz" "octave-$version.tar.gz"
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/octave-3.6.2.tar.gz" "octave-3.6.2.tar.gz"
 
 #Untar 
-tar -zxvf  octave-$version.tar.gz
+tar -zxvf  octave-3.6.2.tar.gz
 
 #Move octave into install directory
-mv octave-$version/* src
-rm -rf octave-$version
+mv octave-3.6.2/* src
+rm -rf octave-3.6.2
 
 #install
 cd src 
+./configure \
+ --prefix=$ISSM_DIR/externalpackages/octave/install \
+ --disable-readline
 
-exit
-make 
-
-#Compile 
-cd ../install
-mkdir lib
-cd lib
-cp ../../src/*.a .
-ln -s octave_LINUX.a octave.a
-ln -s octave_LINUX.a liboctave.a
+if [ -z $NUMCPUS ];
+then
+        make
+        make install
+else
+        make -j $NUMCPUS
+        make -j $NUMCPUS install
+fi

@@ -1 +1 @@
 MITgcm
 OpenAD
+ivins