changeset 8:91729d9aa042

Uploaded
author bgruening
date Wed, 24 Apr 2013 15:52:04 -0400
parents 26cc4c64292b
children 60b730baeee2
files tool_dependencies.xml
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Apr 24 15:21:23 2013 -0400
+++ b/tool_dependencies.xml	Wed Apr 24 15:52:04 2013 -0400
@@ -8,16 +8,15 @@
                         <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" />
                     </package>
                 </action>
-                <action type="shell_command">wget http://downloads.sourceforge.net/project/freetype/freetype2/2.4.11/freetype-2.4.11.tar.bz2</action>
-                <action type="shell_command">tar xfvj freetype-2.4.11.tar.bz2 &amp;&amp; 
-                    cd freetype-2.4.11 &amp;&amp; 
-                    ./configure --prefix=$INSTALL_DIR/freetype/build &amp;&amp;
-                    make &amp;&amp; 
-                    make install</action>
+                <action type="set_environmnet_for_install">
+                    <package name="freetype" version="2.4.11">
+                        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_freetype_2_4" owner="bgruening" changeset_revision="ca18154f881c" />
+                    </package>
+                </action>
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                    export CPLUS_INCLUDE_PATH=$INSTALL_DIR/freetype/build/include:$INSTALL_DIR/freetype/build/include/freetype2/ &amp;&amp; 
-                    export LIBRARY_PATH=$INSTALL_DIR/freetype/build/lib/ &amp;&amp; 
+                    export CPLUS_INCLUDE_PATH=$FREETYPE_INSTALL_DIR/include:$FREETYPE_INSTALL_DIR/include/freetype2/ &amp;&amp; 
+                    export LIBRARY_PATH=$FREETYPE_INSTALL_DIR/lib/ &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>