Changeset 11413

Timestamp:

02/13/12 15:35:03 (14 years ago)

Author:

cborstad

Message:

merged changes 11330:11410 from trunk-jpl

Location:

issm/trunk-jpl-damage/externalpackages

Files:

• intel/.bashrc (copied) (copied from issm/trunk-jpl/externalpackages/intel/.bashrc )
• intel/.exrc (copied) (copied from issm/trunk-jpl/externalpackages/intel/.exrc )
• intel/.vimrc (copied) (copied from issm/trunk-jpl/externalpackages/intel/.vimrc )
• intel/intel-windows7.sh (copied) (copied from issm/trunk-jpl/externalpackages/intel/intel-windows7.sh )
• matlab/install.sh (modified) (1 diff)
• metis/configs/4.0/greenplanet (copied) (copied from issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet )
• metis/configs/4.0/greenplanet/Makefile.in.patch (copied) (copied from issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch )
• metis/configs/4.0/win7 (copied) (copied from issm/trunk-jpl/externalpackages/metis/configs/4.0/win7 )
• metis/configs/4.0/win7/Makefile.in.patch (copied) (copied from issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch )
• metis/configs/4.0/win7/Makefile.patch (copied) (copied from issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch )
• metis/install-4.0-greenplanet.sh (copied) (copied from issm/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh )
• metis/install-4.0-win7.sh (copied) (copied from issm/trunk-jpl/externalpackages/metis/install-4.0-win7.sh )
• petsc/install-2.3.2-win7.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh )
• petsc/install-3.1-win7.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh )
• petsc/install-3.2-greenplanet.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh )
• triangle/configs/win7 (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/win7 )
• triangle/configs/win7/configure.make (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/win7/configure.make )
• triangle/configs/win7/makefile (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/win7/makefile )
• triangle/install-win7.sh (copied) (copied from issm/trunk-jpl/externalpackages/triangle/install-win7.sh )
• win7 (copied) (copied from issm/trunk-jpl/externalpackages/win7 )
• win7/notes (copied) (copied from issm/trunk-jpl/externalpackages/win7/notes )
• win7/vs10.0.sh (copied) (copied from issm/trunk-jpl/externalpackages/win7/vs10.0.sh )
• win7/winsdk_web.exe (copied) (copied from issm/trunk-jpl/externalpackages/win7/winsdk_web.exe )

issm/trunk-jpl-damage/externalpackages/matlab/install.sh

@@ -5 +5 @@
 
 #Select or create a new simlink
-ln -s /usr/local/pkgs/matlab-7.6/ install
+#ln -s /usr/local/pkgs/matlab-7.6/ install
 #ln -s /usr/local/matlab704/ install
 #ln -s /usr/local/matlab711/ install
-#ln -s /usr/local/matlab712/ install
+ln -s /usr/local/matlab712/ install
 #ln -s /usr/local/pkgs/matlab-7.6/ install
 #ln -s /Applications/MATLAB_R2008a/ install