Changeset 11128

Timestamp:

01/19/12 07:25:15 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed installation script (problem if input-meta undefined)

Location:

issm/trunk-jpl/externalpackages

Files:

• adic/install.sh (modified) (1 diff)
• adolc/install.sh (modified) (1 diff)
• angel/install.sh (modified) (1 diff)
• chaco/install.sh (modified) (1 diff)
• cmake/install.sh (modified) (1 diff)
• colpack/install.sh (modified) (1 diff)
• cppcheck/install.sh (modified) (1 diff)
• doxygen/install.sh (modified) (1 diff)
• gdal/install.sh (modified) (1 diff)
• graphviz/install.sh (modified) (1 diff)
• mercurial/install.sh (modified) (1 diff)
• metis/install-5.0.1-linux64.sh (modified) (1 diff)
• mpich2/install-1.0.2-altix64.sh (modified) (1 diff)
• mpich2/install-1.0.2-linux64.sh (modified) (1 diff)
• mpich2/install-1.0.2-macosx32.sh (modified) (1 diff)
• mpich2/install-1.0.2-win32.sh (modified) (1 diff)
• mpich2/install-1.4-linux64.sh (modified) (1 diff)
• mpich2/install-1.4-macosx32.sh (modified) (1 diff)
• mpich2/install-1.4-macosx64.sh (modified) (1 diff)
• netcdf/install.sh (modified) (1 diff)
• oofem/install.sh (modified) (1 diff)
• pcre/install.sh (modified) (1 diff)
• petsc/install-2.3.2-cosmos.sh (modified) (1 diff)
• petsc/install-2.3.2-linux64-astrid.sh (modified) (1 diff)
• petsc/install-2.3.2-macosx32-eric.sh (modified) (1 diff)
• petsc/install-2.3.2-macosx32-ogive.sh (modified) (1 diff)
• petsc/install-2.3.2-win32-eric.sh (modified) (1 diff)
• petsc/install-3.1-cosmos.sh (modified) (1 diff)
• petsc/install-3.1-linux64-astrid.sh (modified) (1 diff)
• petsc/install-3.1-macosx32-mathieu.sh (modified) (1 diff)
• petsc/install-3.1-macosx32-ogive.sh (modified) (1 diff)
• petsc/install-3.2-linux64.sh (modified) (1 diff)
• petsc/install-3.2-macosx64.sh (modified) (1 diff)
• python/install.sh (modified) (1 diff)
• qhull/install.sh (modified) (1 diff)
• rats/install.sh (modified) (1 diff)
• rose/install.sh (modified) (1 diff)
• scotch/install.sh (modified) (3 diffs)
• shapelib/install.sh (modified) (1 diff)
• slepc/install.sh (modified) (1 diff)
• vim/install.sh (modified) (1 diff)
• xaifbooster/install.sh (modified) (1 diff)
• xerces/install.sh (modified) (1 diff)

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

@@ -26 +26 @@
         --with-colpack=$ISSM_TIER/externalpackages/colpack/install\
         --prefix=$ISSM_TIER/externalpackages/adic/install 
-make -j $1
-make -j $1 install
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
+make install

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

@@ -21 +21 @@
         --enable-docexa \
         --enable-addexa          
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install

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

@@ -9 +9 @@
 #Compile
 cd angel 
-make -j $1
+make

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

@@ -20 +20 @@
 # Build chaco
 cd src/code
-make -j $1
-make -j $1 chacominusblas.a
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
+make chacominusblas.a
 
 # Clean up objects (but not library or executable)

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

@@ -15 +15 @@
 cd install 
 ./bootstrap --prefix=$ISSM_TIER/externalpackages/cmake/install
-make -j $1
+if [ -z $1 ]; then
+        make
+else 
+        make -j $1; 
+fi
 make install

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

@@ -12 +12 @@
 #compile
 cd src
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 cd ..
 

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

@@ -12 +12 @@
 #compile
 cd src
-make -j $1  
-make -j $1  install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install
+if [ -z $1 ]; then
+        make 
+else 
+        make -j $1
+fi  
+make install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install
 cd ..

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

@@ -20 +20 @@
 #Configure doxygen
 cd src && ./configure --prefix "$ISSM_TIER/externalpackages/doxygen/install"
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 
 #Install doxygen

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

@@ -29 +29 @@
 
 #Compile and install gdal
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install

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

@@ -19 +19 @@
 #Compile and install
 cd src
-make -j $1
-make -j $1 install
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
+make install
 cd ..

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

@@ -18 +18 @@
 
 #Compile mercurial
-make -j $1
+make

issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh

@@ -18 +18 @@
 #Compile metis
 make config prefix="$ISSM_TIER/externalpackages/metis/install"
-make -j $1 install
+make install

issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh

@@ -28 +28 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh

@@ -28 +28 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 

issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh

@@ -27 +27 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh

@@ -25 +25 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh

@@ -23 +23 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh

@@ -26 +26 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh

@@ -26 +26 @@
 
 #Compile mpich2
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install 
 

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

@@ -16 +16 @@
 cd install
 ./configure  --prefix="$ISSM_TIER/externalpackages/netcdf/install" 
-make  -j $NUMCPUS
-make  -j $NUMCPUS install
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
+make install

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

@@ -20 +20 @@
 #Compile oofem 
 cd targets/oofem-2.0
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 
 # build verification tools

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

@@ -14 +14 @@
 cd install 
 ./configure --prefix "$ISSM_TIER/externalpackages/python/install"
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-cosmos.sh

@@ -29 +29 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh

@@ -32 +32 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh

@@ -64 +64 @@
 
         #Compile petsc and install it
-        make -j $1
+        make
         make install
 fi

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh

@@ -28 +28 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win32-eric.sh

@@ -22 +22 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.1-cosmos.sh

@@ -29 +29 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh

@@ -33 +33 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh

@@ -32 +32 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh

@@ -33 +33 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh

@@ -34 +34 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh

@@ -28 +28 @@
 
 #Compile petsc and install it
-make -j $1
+make
 make install

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

@@ -15 +15 @@
 cd install 
 ./configure --prefix "$ISSM_TIER/externalpackages/python/install"
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install

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

@@ -16 +16 @@
 cd src
 ./configure --prefix="$ISSM_TIER/externalpackages/qhull/install"
-make -j $1
-make -j $1 install
+make
+make install

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

@@ -13 +13 @@
 cd src
 ./configure --prefix=$ISSM_TIER/externalpackages/rats/install
-make -j $1
+make
 make install
 cd ..

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

@@ -19 +19 @@
         --srcdir=$ISSM_TIER/externalpackages/rose/source
 
-make -j $NUMCPUS
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make install

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

@@ -1 +1 @@
 #!/bin/bash
-
-#get number of CPUS
-NUMCPUS=$1;
 
 # Some cleanup
@@ -29 +26 @@
 cd src/src
 # For stand-alone scotch modules:
-make -j $NUMCPUS scotch
+make scotch
 make clean
 # For no-file-io scotch modules:
-make -j $NUMCPUS nfioscotch
+make nfioscotch
 # Clean up
 make clean
@@ -53 +50 @@
 #cp -p gmap.m install/bin
 #cp -p gpart.m install/bin
-

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

@@ -21 +21 @@
 # Build shapelib and run self-tests
 cd src
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi
 make test
 

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

@@ -15 +15 @@
 cd install
 ./config/configure.py
-make -j $1
+if [ -z $1 ]; then
+        make
+else
+        make -j $1
+fi

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

@@ -23 +23 @@
 
 #Compile vim
-make -j $1
+make
 make  install

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

@@ -9 +9 @@
 #Compile xaifBooster
 cd xaifBooster
-make -j $1
+make

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

@@ -19 +19 @@
 
 #Compile xerces-c-tools
-make -j $1
+make