# HG changeset patch
# User greg
# Date 1468332201 14400
# Node ID cee17b592b17cded7b3c4521a776e05753141cd6
# Parent  37a6491da3ed7ab1aef0698af82da9cf5d4eafa6
Uploaded

diff -r 37a6491da3ed -r cee17b592b17 tool_dependencies.xml
--- a/tool_dependencies.xml	Tue Jul 12 09:36:46 2016 -0400
+++ b/tool_dependencies.xml	Tue Jul 12 10:03:21 2016 -0400
@@ -16,7 +16,7 @@
                         </repository>
                     </action>
 
-                    <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR</action>
+                    <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR/anaconda</action>
 
                     <!-- Install VTK 6.3.0 into the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/vtk</action>
@@ -26,9 +26,9 @@
                     <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 PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/anaconda/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/anaconda:$PYTHONPATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/anaconda/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
                             -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \
@@ -55,10 +55,10 @@
                             -DModule_vtkIOLegacy:BOOL=ON \
                             -DModule_vtkWrappingPythonCore:BOOL=ON \
                             -DModule_vtkIOPLY:BOOL=ON \
-                            -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/lib/python2.7/site-packages \
-                            -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;
+                            -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/anaconda/lib/python2.7/site-packages \
+                            -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/anaconda/bin/python \
+                            -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/anaconda/lib/libpython2.7.so \
+                            -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/anaconda/include/python2.7 . &amp;&amp;
                             make -j 8 &amp;&amp;
                             make install
                         
@@ -71,11 +71,14 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/anaconda/bin:$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
                             export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export C_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export CPLUS_INCLUDE_PATH=$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
+                            export LD_LIBRARY_PATH=$INSTALL_DIR/vtk/lib &amp;&amp;
+                            $INSTALL_DIR/anaconda/bin/python setup.py develop --prefix=$INSTALL_DIR/anaconda
+                            $INSTALL_DIR/anaconda/bin/python setup.py install --prefix=$INSTALL_DIR/anaconda
                         
                     </action>
 
@@ -84,8 +87,8 @@
                         Only the PATH environment variable needs to be modified for an Anaconda environment so that it gets
                         the right Python from the environment bin directory.
                         -->
-                        <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                        <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
+                        <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/anaconda/bin</environment_variable>
+                        <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/vtk/lib</environment_variable>
                         <environment_variable action="set_to" name="ICQSOL_ROOT_DIR">$INSTALL_DIR</environment_variable>
                     </action>
                 </actions>
@@ -100,7 +103,7 @@
                         </repository>
                     </action>
 
-                    <action type="shell_command">bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR</action>
+                    <action type="shell_command">bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR/anaconda</action>
 
                     <!-- Install and compile VTK 6.3.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/vtk</action>
@@ -110,11 +113,11 @@
                     <action type="change_directory">VTK-6.3.0</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;
+                            export PATH=$INSTALL_DIR/anaconda/bin:$PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/anaconda/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
-                            -DCMAKE_INSTALL_PREFIX:PATH==$INSTALL_DIR/vtk \
+                            -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \
                             -DVTK_WRAP_PYTHON:BOOL=ON \
                             -DVTK_Group_StandAlone:BOOL=OFF \
                             -DVTK_Group_Rendering:BOOL=OFF \
@@ -138,10 +141,10 @@
                             -DModule_vtkIOLegacy:BOOL=ON \
                             -DModule_vtkWrappingPythonCore:BOOL=ON \
                             -DModule_vtkIOPLY:BOOL=ON \
-                            -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/lib/python2.7/site-packages \
-                            -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;
+                            -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/anaconda/lib/python2.7/site-packages \
+                            -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/anaconda/bin/python \
+                            -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/anaconda/lib/libpython2.7.dylib \
+                            -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/anaconda/include/python2.7 . &amp;&amp;
                             make -j 8 &amp;&amp;
                             make install
                         
@@ -154,11 +157,14 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/anaconda/bin:$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
                             export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export C_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export CPLUS_INCLUDE_PATH=$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 &amp;&amp;
-                            $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
+                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/vtk/lib &amp;&amp;
+                            $INSTALL_DIR/anaconda/bin/python setup.py develop --prefix=$INSTALL_DIR/anaconda
+                            $INSTALL_DIR/anaconda/bin/python setup.py install --prefix=$INSTALL_DIR/anaconda
                         
                     </action>
 
@@ -172,8 +178,8 @@
                         binary in the environment already searches the site-packages in the environment, and the lib of the
                         environment, and so on.
                         -->
-                        <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                        <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
+                        <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/anaconda/bin</environment_variable>
+                        <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/vtk/lib</environment_variable>
                         <environment_variable action="set_to" name="ICQSOL_ROOT_DIR">$INSTALL_DIR</environment_variable>
                     </action>
                 </actions>