changeset 3:0e97d4936c23 draft

Uploaded tool_dependencies.xml modified to use the cheetah syntax contributed by B. Gruning.
author devteam
date Mon, 22 Jul 2013 14:20:37 -0400
parents 3569b0e8a8c1
children be713681f50f
files tool_dependencies.xml
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Jun 25 15:36:12 2013 -0400
+++ b/tool_dependencies.xml	Mon Jul 22 14:20:37 2013 -0400
@@ -1,37 +1,37 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="libx11" version="1.5.0">
-        <repository changeset_revision="90c1cbb8095a" name="package_x11_client_1_5_proto_7_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="11623237372f" name="package_x11_client_1_5_proto_7_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="emboss" version="5.0.0">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">ftp://emboss.open-bio.org/pub/EMBOSS/old/5.0.0/EMBOSS-5.0.0.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="90c1cbb8095a" name="package_x11_client_1_5_proto_7_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="11623237372f" name="package_x11_client_1_5_proto_7_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="libx11" version="1.5.0" />
                     </repository>
                 </action>
-                <action type="shell_command">
-                    if [ -z $X11_LIB_DIR ]  [ -z $X11_INCLUDE_DIR ]; then
-                        ./configure --prefix=$INSTALL_DIR
-                    else
-                        ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR
-                    fi
+                <action language="cheetah" type="template_command">
+                    #if env.get('X11_LIB_DIR', False) and env.get('X11_INCLUDE_DIR', False):
+                        ./configure --prefix=$env.INSTALL_DIR --x-includes=$env.X11_INCLUDE_DIR --x-libraries=$env.X11_LIB_DIR
+                    #else:
+                        ./configure --prefix=$env.INSTALL_DIR
+                    #end if
                 </action>
                 <action type="shell_command">make &amp;&amp; make install</action>
-                <action type="download_file" extract="true">ftp://emboss.open-bio.org/pub/EMBOSS/old/5.0.0/PHYLIP-3.6b.tar.gz</action>
+                <action extract="true" type="download_file">ftp://emboss.open-bio.org/pub/EMBOSS/old/5.0.0/PHYLIP-3.6b.tar.gz</action>
                 <action type="change_directory">PHYLIP-3.6b</action>
-                <action type="shell_command">
-                    if [ -z $X11_LIB_DIR ]  [ -z $X11_INCLUDE_DIR ]; then
-                        ./configure --prefix=$INSTALL_DIR
-                    else
-                        ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR CFLAGS='-I../include'
-                    fi
+                <action language="cheetah" type="template_command">
+                    #if env.get('X11_LIB_DIR', False) and env.get('X11_INCLUDE_DIR', False):
+                        ./configure --prefix=$env.INSTALL_DIR --x-includes=$env.X11_INCLUDE_DIR --x-libraries=$env.X11_LIB_DIR CFLAGS='-I$env.INSTALL_DIR/include'
+                    #else:
+                        ./configure --prefix=$env.INSTALL_DIR
+                    #end if
                 </action>
                 <action type="shell_command">make &amp;&amp; make install</action>
                 <action type="set_environment">
-                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                 </action>
             </actions>
         </install>