# HG changeset patch
# User greg
# Date 1452690194 18000
# Node ID 70c2d4e3a34b4ef5e8fbb88e7302478308fc30be
# Parent  789f4e7df8610366730ff7991fd0f016809e6b48
Uploaded

diff -r 789f4e7df861 -r 70c2d4e3a34b tool_dependencies.xml
--- a/tool_dependencies.xml	Thu Nov 19 21:25:50 2015 -0500
+++ b/tool_dependencies.xml	Wed Jan 13 08:03:14 2016 -0500
@@ -18,21 +18,20 @@
 
                     <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
-                    <!-- Install VTK 6.3.0 into the above Python -->
+                    <!-- Install VTK 6.2.0 into the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/vtk</action>
                     <action type="change_directory">$TMP_WORK_DIR/vtk</action>
-                    <action target_filename="VTK-6.2.0.tar.gz" type="download_file">http://www.vtk.org/files/release/6.2/VTK-6.2.0.tar.gz</action>
-                    <action type="shell_command">tar xfvz VTK-6.2.0.tar.gz</action>
-                    <action type="change_directory">VTK-6.2.0</action>
+                    <action target_filename="VTK-6.3.0.tar.gz" type="download_file">http://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz</action>
+                    <action type="shell_command">tar xfvz VTK-6.3.0.tar.gz</action>
+                    <action type="change_directory">VTK-6.3.0</action>
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
                             export PYTHONPATH=$INSTALL_DIR:$PYTHONPATH &amp;&amp;
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
-                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
+                            -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \
                             -DVTK_WRAP_PYTHON:BOOL=ON \
                             -DVTK_Group_StandAlone:BOOL=OFF \
                             -DVTK_Group_Rendering:BOOL=OFF \
@@ -60,7 +59,7 @@
                             -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/bin/python \
                             -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/lib/libpython2.7.so \
                             -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/include/python2.7 . &amp;&amp;
-                            make -j 8 &amp;&amp;
+                            make &amp;&amp;
                             make install
                         
                     </action>
@@ -77,20 +76,6 @@
                          <destination_directory>$INSTALL_DIR/lib</destination_directory>
                      </action>
 
-                    <!-- Install and compile pycsg version 0.3.0 as a package in the above Python -->
-                    <action type="make_directory">$TMP_WORK_DIR/pycsg</action>
-                    <action type="change_directory">$TMP_WORK_DIR/pycsg</action>
-                    <action type="shell_command">git clone https://github.com/pletzer/pycsg.git</action>
-                    <action type="change_directory">pycsg</action>
-                    <action type="shell_command">
-                        
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
-                            $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        
-                    </action>
-
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
                     <action type="change_directory">$TMP_WORK_DIR/icqsol</action>
@@ -98,8 +83,9 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp; 
+                            export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
                         
@@ -168,7 +154,7 @@
                             -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/bin/python \
                             -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/lib/libpython2.7.dylib \
                             -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/include/python2.7 . &amp;&amp;
-                            make -j 8 &amp;&amp;
+                            make &amp;&amp;
                             make install
                         
                     </action>
@@ -185,19 +171,6 @@
                          <destination_directory>$INSTALL_DIR/lib</destination_directory>
                      </action>
 
-                    <!-- Install and compile pycsg version 0.3.0 as a package in the above Python -->
-                    <action type="make_directory">$TMP_WORK_DIR/pycsg</action>
-                    <action type="change_directory">$TMP_WORK_DIR/pycsg</action>
-                    <action type="shell_command">git clone https://github.com/pletzer/pycsg.git</action>
-                    <action type="change_directory">pycsg</action>
-                    <action type="shell_command">
-                        
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
-                            $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        
-                    </action>
-
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
                     <action type="change_directory">$TMP_WORK_DIR/icqsol</action>