Mercurial > repos > greg > package_icqsol_1_0

changeset 3:245029376e25 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Sun, 15 Nov 2015 10:30:47 -0500
parents cd0e48578c91
children 789f4e7df861
files tool_dependencies.xml
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Sat Nov 14 17:58:17 2015 -0500
+++ b/tool_dependencies.xml	Sun Nov 15 10:30:47 2015 -0500
@@ -9,7 +9,7 @@
                 <actions architecture="x86_64" os="linux">
                     <!-- Install and compile Anaconda 2.3.0 which provides Python 2.7.10 -->
                     <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">
                             <package name="cmake" version="3.2.3" />
@@ -22,7 +22,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;
                             conda install -c https://conda.anaconda.org/anaconda vtk --yes
@@ -56,7 +55,7 @@
                             $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>
@@ -84,11 +83,13 @@
                 <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 -->
@@ -131,7 +132,7 @@
                             $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>