Mercurial > repos > greg > package_icqsol_1_0

changeset 20:21dc096c019f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Wed, 13 Jul 2016 09:25:41 -0400
parents e1d0a5f57c75
children fbc28957cdc6
files tool_dependencies.xml
diffstat 1 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jul 13 08:56:29 2016 -0400
+++ b/tool_dependencies.xml	Wed Jul 13 09:25:41 2016 -0400
@@ -77,7 +77,7 @@
                             export CPLUS_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &&
                             export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &&
                             export LD_LIBRARY_PATH=$INSTALL_DIR/vtk/lib &&
-                            $INSTALL_DIR/anaconda/bin/python setup.py develop --prefix=$INSTALL_DIR/anaconda
+                            $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>
@@ -157,15 +157,9 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/anaconda/bin:$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
-                            export PYTHONPATH=$INSTALL_DIR/anaconda &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;
-                            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
+                            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>