# HG changeset patch
# User greg
# Date 1447986350 18000
# Node ID 789f4e7df8610366730ff7991fd0f016809e6b48
# Parent  245029376e25f40b84407615a206dd22c1298823
Uploaded

diff -r 245029376e25 -r 789f4e7df861 tool_dependencies.xml
--- a/tool_dependencies.xml	Sun Nov 15 10:30:47 2015 -0500
+++ b/tool_dependencies.xml	Thu Nov 19 21:25:50 2015 -0500
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="cmake" version="3.2.3">
-        <repository changeset_revision="e932c7599efd" name="package_cmake_3_2_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="2da7b99cb1a1" name="package_cmake_3_2_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="icqsol" version="1.0">
         <install version="1.0">
@@ -11,7 +11,7 @@
                     <action target_filename="Anaconda-2.3.0-Linux-x86_64.sh" type="download_file">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-Linux-x86_64.sh</action>
 
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="e932c7599efd" name="package_cmake_3_2_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="2da7b99cb1a1" name="package_cmake_3_2_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                             <package name="cmake" version="3.2.3" />
                         </repository>
                     </action>
@@ -19,14 +19,63 @@
                     <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 -->
+                    <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 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;
-                            conda install -c https://conda.anaconda.org/anaconda vtk --yes
+                            cmake \
+                            -DCMAKE_BUILD_TYPE:STRING=Release \
+                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
+                            -DVTK_WRAP_PYTHON:BOOL=ON \
+                            -DVTK_Group_StandAlone:BOOL=OFF \
+                            -DVTK_Group_Rendering:BOOL=OFF \
+                            -DModule_vtkCommonColor:BOOL=ON \
+                            -DModule_vtkCommonComputationalGeometry:BOOL=ON \
+                            -DModule_vtkCommonDataModel:BOOL=ON \
+                            -DModule_vtkCommonExecutionModel:BOOL=ON \
+                            -DModule_vtkCommonMath:BOOL=ON \
+                            -DModule_vtkCommonMisc:BOOL=ON \
+                            -DModule_vtkCommonSystem:BOOL=ON \
+                            -DModule_vtkCommonTransforms:BOOL=ON \
+                            -DModule_vtkFiltersCore:BOOL=ON \
+                            -DModule_vtkFiltersExtraction:BOOL=ON \
+                            -DModule_vtkFiltersGeneral:BOOL=ON \
+                            -DModule_vtkFiltersGeneric:BOOL=ON \
+                            -DModule_vtkFiltersGeometry:BOOL=ON \
+                            -DModule_vtkFiltersPython:BOOL=ON \
+                            -DModule_vtkImagingHybrid:BOOL=ON \
+                            -DModule_vtkIOCore:BOOL=ON \
+                            -DModule_vtkIOGeometry:BOOL=ON \
+                            -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;
+                            make -j 8 &amp;&amp;
+                            make install
                         
                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/bin</source_directory>
+                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/include</source_directory>
+                         <destination_directory>$INSTALL_DIR/include</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/lib</source_directory>
+                         <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>
@@ -42,20 +91,6 @@
                         
                     </action>
 
-                    <!-- Install and compile pytriangle version 1.0 as a package in the above Python -->
-                    <action type="make_directory">$TMP_WORK_DIR/pytriangle</action>
-                    <action type="change_directory">$TMP_WORK_DIR/pytriangle</action>
-                    <action type="shell_command">git clone https://github.com/pletzer/pytriangle.git</action>
-                    <action type="change_directory">pytriangle</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>
@@ -65,7 +100,8 @@
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
                             export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
-                            cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+                            $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR
+                            $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
                         
                     </action>
 
@@ -75,7 +111,7 @@
                         the right Python from the environment bin directory.
                         -->
                         <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                        <environment_variable action="set_to" name="ANACONDAHOME">$INSTALL_DIR</environment_variable>
+                        <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
                         <environment_variable action="set_to" name="ICQSOL_ROOT_DIR">$INSTALL_DIR</environment_variable>
                     </action>
                 </actions>
@@ -85,25 +121,69 @@
                     <action target_filename="Anaconda-2.3.0-MacOSX-x86_64.sh" type="download_file">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-MacOSX-x86_64.sh</action>
 
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="e932c7599efd" name="package_cmake_3_2_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="2da7b99cb1a1" name="package_cmake_3_2_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                             <package name="cmake" version="3.2.3" />
                         </repository>
                     </action>
 
                     <action type="shell_command">bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
-                    <!-- Install VTK 6.3.0 into the above Python -->
+                    <!-- Install and compile VTK 6.2.0 as a package in 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 type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib:$DYLD_LIBRARY_PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/bin:$INSTALL_DIR/bin:$PATH &amp;&amp;
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
-                            conda install -c https://conda.anaconda.org/anaconda vtk --yes
+                            cmake \
+                            -DCMAKE_BUILD_TYPE:STRING=Release \
+                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
+                            -DVTK_WRAP_PYTHON:BOOL=ON \
+                            -DVTK_Group_StandAlone:BOOL=OFF \
+                            -DVTK_Group_Rendering:BOOL=OFF \
+                            -DModule_vtkCommonColor:BOOL=ON \
+                            -DModule_vtkCommonComputationalGeometry:BOOL=ON \
+                            -DModule_vtkCommonDataModel:BOOL=ON \
+                            -DModule_vtkCommonExecutionModel:BOOL=ON \
+                            -DModule_vtkCommonMath:BOOL=ON \
+                            -DModule_vtkCommonMisc:BOOL=ON \
+                            -DModule_vtkCommonSystem:BOOL=ON \
+                            -DModule_vtkCommonTransforms:BOOL=ON \
+                            -DModule_vtkFiltersCore:BOOL=ON \
+                            -DModule_vtkFiltersExtraction:BOOL=ON \
+                            -DModule_vtkFiltersGeneral:BOOL=ON \
+                            -DModule_vtkFiltersGeneric:BOOL=ON \
+                            -DModule_vtkFiltersGeometry:BOOL=ON \
+                            -DModule_vtkFiltersPython:BOOL=ON \
+                            -DModule_vtkImagingHybrid:BOOL=ON \
+                            -DModule_vtkIOCore:BOOL=ON \
+                            -DModule_vtkIOGeometry:BOOL=ON \
+                            -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;
+                            make -j 8 &amp;&amp;
+                            make install
                         
                     </action>
-                    <action type="shell_command">
-                        ln -s $INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin/vtkpython $INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin/python
-                    </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/bin</source_directory>
+                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/include</source_directory>
+                         <destination_directory>$INSTALL_DIR/include</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/lib</source_directory>
+                         <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>
@@ -112,27 +192,12 @@
                     <action type="change_directory">pycsg</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
+                            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 pytriangle version 1.0 as a package in the above Python -->
-                    <action type="make_directory">$TMP_WORK_DIR/pytriangle</action>
-                    <action type="change_directory">$TMP_WORK_DIR/pytriangle</action>
-                    <action type="shell_command">git clone https://github.com/pletzer/pytriangle.git</action>
-                    <action type="change_directory">pytriangle</action>
-                    <action type="shell_command">
-                        
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-                            $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>
@@ -140,9 +205,9 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
-                            cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR &amp;&amp;
+                            $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
                         
                     </action>
 
@@ -157,7 +222,7 @@
                         environment, and so on.
                         -->
                         <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                        <environment_variable action="set_to" name="ANACONDAHOME">$INSTALL_DIR</environment_variable>
+                        <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
                         <environment_variable action="set_to" name="ICQSOL_ROOT_DIR">$INSTALL_DIR</environment_variable>
                     </action>
                 </actions>