Mercurial > repos > greg > package_icqsol_1_0

changeset 2:cd0e48578c91 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Sat, 14 Nov 2015 17:58:17 -0500
parents ee534b2a2094
children 245029376e25
files tool_dependencies.xml
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Sat Nov 14 17:03:10 2015 -0500
+++ b/tool_dependencies.xml	Sat Nov 14 17:58:17 2015 -0500
@@ -37,7 +37,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$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;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
@@ -52,7 +51,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$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;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
@@ -67,7 +65,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &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
                         
@@ -87,13 +84,17 @@
                 <actions architecture="x86_64" os="darwin">
                     <!-- Install and compile Anaconda 2.3.0 which provides Python 2.7.10 -->
                     <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">
+                            <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 -->
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
                             export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib:$DYLD_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
@@ -111,7 +112,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &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 &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
@@ -126,7 +126,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &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
@@ -141,7 +140,6 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &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