Mercurial > repos > devteam > package_emboss_5_0_0

changeset 5:69d798291360 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated tool dependency definition.
author devteam
date Wed, 27 Nov 2013 23:52:17 -0500
parents be713681f50f
children 64b58c8f2827
files tool_dependencies.xml
diffstat 1 files changed, 23 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Nov 27 09:28:46 2013 -0500
+++ b/tool_dependencies.xml	Wed Nov 27 23:52:17 2013 -0500
@@ -1,37 +1,39 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="libx11" version="1.5.0">
-        <repository changeset_revision="c15cbda00ea6" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+  <package name="libx11" version="1.5.0">
+      <repository changeset_revision="06f3f6f667b0" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="libxproto" version="7.0.23">
+      <repository changeset_revision="fd9ca3b78488" name="package_libxproto_7_0_23" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="libxcb" version="1.9.1">
+      <repository changeset_revision="e088e0d75718" name="package_libxcb_1_9_1" 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>
+      <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="c15cbda00ea6" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libx11" version="1.5.0" />
-                    </repository>
+                  <repository changeset_revision="06f3f6f667b0" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="fd9ca3b78488" name="package_libxproto_7_0_23" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="e088e0d75718" name="package_libxcb_1_9_1" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
                 </action>
-                <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 type="shell_command">
+                    export CFLAGS="-I$XPROTO_INCLUDES" &amp;&amp; \
+                    export LDFLAGS="-L$XCB_LIBS" &amp;&amp; \
+                    ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR
                 </action>
                 <action type="shell_command">make &amp;&amp; make install</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 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 type="shell_command">
+                    export CFLAGS="-I$XPROTO_INCLUDES" &amp;&amp; \
+                    export LDFLAGS="-L$XCB_LIBS" &amp;&amp; \
+                    ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR
                 </action>
                 <action type="shell_command">make &amp;&amp; make install</action>
                 <action type="set_environment">
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                  <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                 </action>
             </actions>
         </install>