Mercurial > repos > iuc > package_matplotlib_1_2

changeset 2:85b7ddf90888 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author iuc
date Mon, 24 Feb 2014 05:19:57 -0500
parents 966f29c955b9
children de9c362fb3f2
files tool_dependencies.xml
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Sep 12 07:02:18 2013 -0400
+++ b/tool_dependencies.xml	Mon Feb 24 05:19:57 2014 -0500
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-       <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+       <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.4.11">
         <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
+    <package name="libpng" version="1.6.7">
+        <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
     <package name="matplotlib" version="1.2.1">
         <install version="1.0">
             <actions>
@@ -14,25 +17,28 @@
 
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="numpy" version="1.7.1" />
                     </repository>
                     <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="freetype" version="2.4.11" />
                     </repository>
+                    <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <package name="libpng" version="1.6.7" />
+                    </repository>
                 </action>
 
                 <!-- install matplotlib -->
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">
                     export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python:$PYTHONPATH_NUMPY &amp;&amp; 
-                    export CPLUS_INCLUDE_PATH=$FREETYPE_INCLUDE_DIR:$FREETYPE_INCLUDE_DIR/freetype2/ &amp;&amp; 
-                    export LIBRARY_PATH=$FREETYPE_LIB_DIR &amp;&amp; 
+                    export CPLUS_INCLUDE_PATH=$FREETYPE_INCLUDE_DIR:$FREETYPE_INCLUDE_DIR/freetype2/:${LIBPNG_ROOT}/include &amp;&amp; 
+                    export LIBRARY_PATH=$FREETYPE_LIB_DIR:${LIBPNG_ROOT}/lib &amp;&amp;
                     python setup.py install --install-lib $INSTALL_DIR/lib/python --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="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
                     <environment_variable action="set_to" name="PYTHONPATH_MATPLOTLIB">$INSTALL_DIR/lib/python</environment_variable>
                 </action>