[cig-commits] r15412 - short/3D/PyLith/trunk/doc/install

[brad at geodynamics.org]

Author: brad
Date: 2009-07-01 08:30:09 -0700 (Wed, 01 Jul 2009)
New Revision: 15412

Modified:
   short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64.txt
   short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64_bash.sh
   short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard.txt
   short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard_bash.sh
Log:
Finished updating install instructions.

Modified: short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64.txt
===================================================================
--- short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64.txt	2009-07-01 05:03:31 UTC (rev 15411)
+++ short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64.txt	2009-07-01 15:30:09 UTC (rev 15412)
@@ -257,14 +257,18 @@
 
 12. Install SWIG (http://www.swig.org/)
 
- a. Untar and install.
+  a. Untar and install.
 
- b. Update environment variables.
+    tar -zxvf swig.1.3.39.tgz
+    configure --prefix=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
+    make
+    make install
 
-    PYREX_DIR=${TOOLS_DIR}/pyrex-0.9.5.1a/${TOOLS_FORMAT}
-    PATH=${PATH}:${PYREX_DIR}/bin
-    export PYTHONPATH=${PYTHONPATH}:${PYREX_DIR}/lib/python${PYTHON_VERSION}/site-packages
+  b. Update environment variables.
 
+    SWIG_DIR=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
+    PATH=${PATH}:${SWIG_DIR}/bin
+
 13. Install pythia.
 
   a. Download the source code from the SVN repository.

Modified: short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64_bash.sh
===================================================================
--- short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64_bash.sh	2009-07-01 05:03:31 UTC (rev 15411)
+++ short/3D/PyLith/trunk/doc/install/Cluster_Rocks-4.3-AMD64_bash.sh	2009-07-01 15:30:09 UTC (rev 15412)
@@ -71,10 +71,9 @@
 export PETSC_DIR=${TOOLS_DIR}/petsc-dev
 export PETSC_ARCH=linux_${TOOLS_FORMAT}_opt
 
-# SWIG (check this)
-SWIG_DIR=${TOOLS_DIR}/swig-1.3.38/${TOOLS_FORMAT}
+# SWIG
+SWIG_DIR=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
 PATH=${PATH}:${SWIG_DIR}/bin
-export PYTHONPATH=${PYTHONPATH}:${SWIG_DIR}/lib/python${PYTHON_VERSION}/site-packages
 
 # Pythia
 export PYTHIA_INCDIR=${CIG_INCDIR}/pythia-0.8

Modified: short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard.txt
===================================================================
--- short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard.txt	2009-07-01 05:03:31 UTC (rev 15411)
+++ short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard.txt	2009-07-01 15:30:09 UTC (rev 15412)
@@ -2,6 +2,12 @@
 INSTRUCTIONS FOR INSTALLING PYLITH ON AN INTEL MAC RUNNING OSX 10.4
 ======================================================================
 
+NOTE: These installation instructions use the Fink package manager to
+install some commonly used packages. MacPorts appears to be a better
+alternative because packages are updated more frequently and there is
+better coherence among packages. However, MacPorts builds all packages
+from source so installing packages can take a long time.
+
 I place applications that are rarely updated in /sw/tools (with Fink
 stuff in /sw). For CIG source code, I separate the source code, build
 directories, and installed code. The source code sits in
@@ -207,18 +213,19 @@
     make
     make test
 
-13. Install SWIG (http://www.swig.org)
+13. Install SWIG (http://www.swig.org/)
 
- a. Untar and install.
+  a. Untar and install.
 
-    python setup.py install --prefix=${TOOLS_DIR}/pyrex-0.9.5.1/${TOOLS_FORMAT}
+    tar -zxvf swig.1.3.39.tgz
+    configure --prefix=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
+    make
+    make install
 
-  b. Update environment variables
+  b. Update environment variables.
 
-    PYREX_DIR=${TOOLS_DIR}/pyrex-0.9.5.1/${TOOLS_FORMAT}
-    export PYTHONPATH=${PYTHONPATH}:${PYREX_DIR}/lib/python${PYTHON_VERSION}/site-packages
-    export PYTHONPATH=${PYTHONPATH}:${PYREX_DIR}/bin
-    export PATH=${PATH}:${PYREX_DIR}/bin
+    SWIG_DIR=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
+    PATH=${PATH}:${SWIG_DIR}/bin
 
 14. Install pythia.
 

Modified: short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard_bash.sh
===================================================================
--- short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard_bash.sh	2009-07-01 05:03:31 UTC (rev 15411)
+++ short/3D/PyLith/trunk/doc/install/MacBookPro_Aagaard_bash.sh	2009-07-01 15:30:09 UTC (rev 15412)
@@ -52,11 +52,9 @@
 export PETSC_DIR=${TOOLS_DIR}/petsc-dev
 export PETSC_ARCH=osx_${TOOLS_FORMAT}_debug
 
-# Pyrex
-PYREX_DIR=${TOOLS_DIR}/pyrex-0.9.5.1/${TOOLS_FORMAT}
-export PYTHONPATH=${PYTHONPATH}:${PYREX_DIR}/lib/python${PYTHON_VERSION}/site-packages
-export PYTHONPATH=${PYTHONPATH}:${PYREX_DIR}/bin
-export PATH=${PATH}:${PYREX_DIR}/bin
+# SWIG
+SWIG_DIR=${TOOLS_DIR}/swig-1.3.39/${TOOLS_FORMAT}
+PATH=${PATH}:${SWIG_DIR}/bin
 
 # Pythia
 export PYTHIA_INCDIR=${CIG_INCDIR}/pythia-0.8