Changeset 12895

Timestamp:

08/03/12 11:58:15 (13 years ago)

Author:

Eric.Larour

Message:

CHG: tk: ignore some svn files.
tcl: do sudo install.
matplotlib: link against tcl and tk from the OS.

Location:

issm/trunk-jpl/externalpackages

Files:

• matplotlib/install-osx.sh (modified) (2 diffs)
• matplotlib/install.sh (modified) (1 diff)
• tcl/install.sh (modified) (2 diffs)
• tk (modified) (1 prop)

issm/trunk-jpl/externalpackages/matplotlib/install-osx.sh

@@ -2 +2 @@
 pythonversion=2.7
 PYTHON=python${pythonversion}
+
+export GIT_SSL_NO_VERIFY=true 
+export CC="gcc -fPIC"
+export CXX="g++ -fPIC"
+export F77="gfortran -fPIC"
+export FC="gfortran -fPIC"
+export FFLAGS=-ff2c
+
 
 git clone https://github.com/matplotlib/matplotlib
@@ -7 +15 @@
 mkdir deps
 cd src
+exit
 make -f make.osx PREFIX=$ISSM_DIR/externalpackages/matplotlib/deps PYVERSION=$pythonversion fetch deps mpl_install_std
 ${PYTHON} -c "import matplotlib; print 'Installed matplotlib', matplotlib.__version__, matplotlib.__file__"

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

@@ -1 +1 @@
 #/bin/bash
+pythonversion=2.7
+PYTHON=python${pythonversion}
+
+export GIT_SSL_NO_VERIFY=true 
+export CC="gcc -fPIC "
+export CXX="g++ -fPIC -L$ISSM_DIR/externalpackages/tcl/install/lib"
+export F77="gfortran -fPIC"
+export FC="gfortran -fPIC"
+export FFLAGS=-ff2c
+
 
 git clone https://github.com/matplotlib/matplotlib
 mv matplotlib src
 cd src
-python setup.py build
-python setup.py install
+python setup.py build 
+python setup.py install 

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

@@ -1 +1 @@
 #!/bin/bash
+
+sudochoice=0;
 
 #Some cleanup
@@ -20 +22 @@
 ver="8.4.12"
 
-cd src
-make -C ./macosx install INSTALL_ROOT="$ISSM_DIR/externalpackages/tcl/install"
+cd src/unix
+
+#User mode: 
+if [[ $sudochoice == "0" ]]; 
+then 
+        ./configure --prefix=$ISSM_DIR/externalpackages/tcl/install
+        if [ -z $1 ]; then
+                make
+        else
+                make -j $1
+        fi
+        make install 
+fi
+
+#sudo mode: 
+if [[ $sudochoice == "1" ]]; 
+then
+        sudo ./configure 
+        if [ -z $1 ]; then
+                sudo make
+        else
+                sudo make -j $1
+        fi
+        sudo make install 
+fi