Mercurial > repos > mzeidler > virana

changeset 48:6541ad24fd63 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author mzeidler
date Tue, 24 Sep 2013 07:31:40 -0400
parents 0aab1e522e00
children f9a42a67e8a8
files tool_dependencies.xml
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Sep 24 07:03:18 2013 -0400
+++ b/tool_dependencies.xml	Tue Sep 24 07:31:40 2013 -0400
@@ -49,7 +49,7 @@
                 <!-- install matplotlib -->
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">echo "### PYTHONPATH = $PYTHONPATH, PYTHONPATH_NUMPY = $PYTHONPATH_NUMPY"</action>
-                <action type="shell_command">export PYTHONPATH=$INSTALL_DIR/lib/python:$PYTHONPATH_DISTRIBUTE:$PYTHONPATH_NUMPY:$PYTHONPATH &amp;&amp;
+                <action type="shell_command">export PYTHONPATH=$INSTALL_DIR/lib/python:$PYTHONPATH_NUMPY:$PYTHONPATH &amp;&amp;
                                              export CPLUS_INCLUDE_PATH=$FREETYPE_INCLUDE_DIR:$FREETYPE_INCLUDE_DIR/freetype2/:$CPLUS_INCLUDE_PATH &amp;&amp; 
                                              export LIBRARY_PATH=$FREETYPE_LIB_DIR:$LIBRARY_PATH &amp;&amp;  
                                              python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
@@ -173,6 +173,7 @@
     <package name="jalview" version="2.8" >
         <install version="1.0">
             <actions>
+                <action type="shell_command">pwd</action>
                 <action type="move_file">
                          <source>virana/jalview/jalview.jar</source>
                          <destination>$INSTALL_DIR</destination>
@@ -182,7 +183,7 @@
                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
                 </action>
                 <action type="set_environment">
-                    <environment_variable name="JALVIEW_DIR" action="prepend_to">$INSTALL_DIR</environment_variable>
+                    <environment_variable name="JALVIEW_DIR" action="set_to">$INSTALL_DIR</environment_variable>
                 </action>
             </actions>
         </install>