Mercurial > repos > mzeidler > virana

changeset 44:57d27315b95c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author mzeidler
date Mon, 23 Sep 2013 19:40:11 -0400
parents 0bb74e00256e
children dd9bed0d4b20
files tool_dependencies.xml
diffstat 1 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Sep 23 12:21:02 2013 -0400
+++ b/tool_dependencies.xml	Mon Sep 23 19:40:11 2013 -0400
@@ -22,6 +22,20 @@
             </actions>
         </install>
     </package>
+    <package name="distribute" version="0.6.28">
+        <install version="1.0">
+            <actions>
+                <action type="download_by_url">http://pypi.python.org/packages/source/d/distribute/distribute-0.6.28.tar.gz</action>
+                <action type="make_directory">$INSTALL_DIR/lib/python</action>
+                <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                <action type="set_environment">
+                    <environment_variable name="PYTHONPATH" action="append_to">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable name="PYTHONPATH_DISTRIBUTE" action="set_to">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                </action>
+            </actions>
+        </install>
+    </package>
 
 <package name="matplotlib" version="1.3.0">
         <install version="1.0">
@@ -33,14 +47,12 @@
                 <!-- 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_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; 
+                <action type="shell_command">export PYTHONPATH=$INSTALL_DIR/lib/python:$PYTHONPATH_DISTRIBUTE:$PYTHONPATH_NUMPY:$PYTHONPATH &amp;&amp;  
                     python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
                 <action type="set_environment">
                     <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                     <environment_variable action="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
-                    <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
+                    <environment_variable action="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_DISTRIBUTE]</environment_variable>
                     <environment_variable action="set_to" name="PYTHONPATH_MATPLOTLIB">$INSTALL_DIR/lib/python</environment_variable>
                 </action>
             </actions>
@@ -159,11 +171,11 @@
         <install version="1.0">
             <actions>
                 <action type="move_file">
-                         <source>jalview/jalview.jar</source>
+                         <source>virana/jalview/jalview.jar</source>
                          <destination>$INSTALL_DIR</destination>
                 </action>
                 <action type="move_directory_files">
-                        <source_directory>jalview</source_directory>
+                        <source_directory>virana/jalview</source_directory>
                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
                 </action>
                 <action type="set_environment">