changeset 3:462464e73ad9

Uploaded
author bgruening
date Thu, 25 Apr 2013 11:14:52 -0400
parents 732b0fe57a38
children 0adc830e7d71
files tool_dependencies.xml
diffstat 1 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Apr 24 18:49:52 2013 -0400
+++ b/tool_dependencies.xml	Thu Apr 25 11:14:52 2013 -0400
@@ -1,26 +1,29 @@
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-	<repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" prior_installation_required="True" />
+        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" prior_installation_required="True" />
     </package>
     <package name="boost" version="1.53.0">
-	<repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_boost_1_53" owner="bgruening" changeset_revision="97a7d116834b" prior_installation_required="True" />
+        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_boost_1_53" owner="bgruening" changeset_revision="95ed6d984eab" prior_installation_required="True" />
     </package>
 
     <package name="rdkit" version="2012_12_1">
         <install version="1.0">
             <actions>
-                <action type="set_environmnet_for_install">
-                    <package name="numpy" version="1.7.1">
-                        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" />
-                    </package>
+                <!-- first action is always downloading -->
+                <action type="download_by_url">http://downloads.sourceforge.net/project/rdkit/rdkit/Q4_2012/RDKit_2012_12_1.tgz</action>
+
+                <!-- populate the environment variables from the dependend repos -->
+                <action type="set_environment_for_install">
+                    <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c">
+                        <package name="numpy" version="1.7.1" />
+                    </repository>
                 </action>
-                <action type="set_environmnet_for_install">
-                    <package name="boost" version="1.53.0">
-                        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_boost_1_53" owner="bgruening" changeset_revision="97a7d116834b" />
-                    </package>
+                <action type="set_environment_for_install">
+                    <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_boost_1_53" owner="bgruening" changeset_revision="95ed6d984eab">
+                        <package name="boost" version="1.53.0" />
+                    </repository>
                 </action>
 
-                <action type="download_by_url">http://downloads.sourceforge.net/project/rdkit/rdkit/Q4_2012/RDKit_2012_12_1.tgz</action>
                 <action type="shell_command">export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib/ &amp;&amp;
                     export PYTHONPATH=$PYTHONPATH:`pwd`/ &amp;&amp;
                     mkdir build &amp;&amp;
@@ -32,7 +35,6 @@
                 <action type="set_environment">
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/rdkit/bin</environment_variable>
                     <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/rdkit/lib/</environment_variable>
-                    <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$INSTALL_DIR/boost/lib/</environment_variable>
                 </action>
             </actions>
         </install>