Changeset 3066

Timestamp:

02/22/10 09:43:45 (15 years ago)

Author:

Eric.Larour

Message:

added latex2rtf package.

Location:

issm/trunk

Files:

• etc/environment.csh (modified) (1 diff)
• etc/environment.sh (modified) (3 diffs)
• etc/environment_variables.csh (modified) (1 diff)
• etc/environment_variables.sh (modified) (2 diffs)
• externalpackages/latex2rtf (added)
• externalpackages/latex2rtf/install.sh (added)
• externalpackages/latex2rtf/latex2rtf-2.0.0.tar.gz (added)

issm/trunk/etc/environment.csh

@@ -2 +2 @@
 source $ISSM_DIR/etc/environment_variables.csh
 
+<<<<<<< .mine
+#MATLAB
+setenv MATLAB_DIR
+setenv PATH {$PATH}:{$MATLAB_DIR}/bin
+setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$MATLAB_DIR/lib
+=======
 #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
 #to environment.
+>>>>>>> .r3065
 
 #foreach i ($@)

issm/trunk/etc/environment.sh

@@ -18 +18 @@
 export MATLAB_DIR
 PATH="$PATH:$MATLAB_DIR/bin"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MATLAB_DIR/lib"
+export LD_RUN_PATH="$LD_RUN_PATH:$MATLAB_DIR/lib"
 
 #MPI
@@ -102 +104 @@
 export MANPATH="$MANPATH:$SOWING_DIR/man"
 
+#LATEX2RTF
+export RTFPATH="$ISSM_DIR/externalpackages/latex2rtf/cfg"
+
 #AUTOCONF
 export AUTOCONF_DIR
@@ -115 +120 @@
 
 #INTEL
-export INTEL_DIR
-PATH="$PATH:$INTEL_DIR"
-source $ISSM_DIR/externalpackages/intel/intel.sh
+#export INTEL_DIR
+#PATH="$PATH:$INTEL_DIR"
+#source $ISSM_DIR/externalpackages/intel/intel.sh
 
 #SDK

issm/trunk/etc/environment_variables.csh

@@ -6 +6 @@
 
 #MATLAB
-set MATLAB_DIR=/usr/local/pkgs/matlab-7.6/
+set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install
 
 #MPI

issm/trunk/etc/environment_variables.sh

@@ -6 +6 @@
 
 #MATLAB
-MATLAB_DIR=/usr/local/pkgs/matlab-7.8/
+MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
 
 #MPI
@@ -73 +73 @@
 
 #intel
-INTEL_DIR="C:/IntelInstall/Compiler/11.1/038/bin/ia32/"
+#INTEL_DIR="C:/IntelInstall/Compiler/11.1/038/bin/ia32/"
 
 #TEX2IM