changeset 3:de9c362fb3f2 draft

Uploaded
author bgruening
date Wed, 23 Jul 2014 05:11:21 -0400
parents 85b7ddf90888
children b08a9f0f28ec
files tool_dependencies.xml
diffstat 1 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Feb 24 05:19:57 2014 -0500
+++ b/tool_dependencies.xml	Wed Jul 23 05:11:21 2014 -0400
@@ -1,13 +1,16 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-       <repository changeset_revision="84125ffacb90" 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="https://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" />
+        <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" prior_installation_required="True" toolshed="https://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" />
+        <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+        <package name="zlib" version="1.2.8">
+        <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="matplotlib" version="1.2.1">
         <install version="1.0">
@@ -17,13 +20,16 @@
 
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                   <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <package name="zlib" version="1.2.8" />
+                    </repository>
+                    <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" toolshed="https://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">
+                    <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" toolshed="https://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">
+                    <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
                 </action>
@@ -33,7 +39,8 @@
                 <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/:${LIBPNG_ROOT}/include &amp;&amp; 
-                    export LIBRARY_PATH=$FREETYPE_LIB_DIR:${LIBPNG_ROOT}/lib &amp;&amp;
+                    export LIBRARY_PATH=$FREETYPE_LIB_DIR:${LIBPNG_ROOT}/lib:$LIBRARY_PATH &amp;&amp;
+                   
                     python setup.py install --install-lib $INSTALL_DIR/lib/python --install-scripts $INSTALL_DIR/bin
                 </action>
                 <action type="set_environment">