changeset 3:06f3f6f667b0 draft

Updated tool dependency definition.
author devteam
date Wed, 27 Nov 2013 23:50:21 -0500
parents c15cbda00ea6
children fbb4a9610e30
files tool_dependencies.xml
diffstat 1 files changed, 30 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Nov 27 09:06:36 2013 -0500
+++ b/tool_dependencies.xml	Wed Nov 27 23:50:21 2013 -0500
@@ -1,39 +1,47 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="libxproto" version="7.0.23">
-        <repository changeset_revision="a0d3d0b8aff6" name="package_libxproto_7_0_23" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+  <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="libxtrans" version="1.2.7">
-        <repository changeset_revision="f92715abfb41" name="package_libxtrans_1_2_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="cf6b0be75bdd" name="package_libxtrans_1_2_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpthread-stubs" version="0.3">
-        <repository changeset_revision="1bbc37f1d895" name="package_libpthread_stubs_0_3" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="e9f7936e2d9d" name="package_libpthread_stubs_0_3" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libxext-proto" version="7.2.1">
-        <repository changeset_revision="d0a5e1db8144" name="package_libxext_proto_7_2_1" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="fc807cafcef7" name="package_libxext_proto_7_2_1" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="xorg_macros" version="1.17.1">
+      <repository changeset_revision="84a6fa565c7c" name="package_xorg_macros_1_17_1" 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="kbproto" version="1.0.6">
+      <repository changeset_revision="f9fefd89da26" name="package_kbproto_1_0_6" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="inputproto" version="2.2">
+      <repository changeset_revision="13e5b41f08c6" name="package_inputproto_2_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libx11" version="1.5.0">
-        <install version="1.0">
-            <actions>
-                <action type="download_by_url">ftp://ftp.x.org/pub/X11R7.7/src/lib/libX11-1.5.0.tar.bz2</action>
+      <install version="1.0">
+          <actions>
+              <action type="download_by_url">ftp://ftp.x.org/pub/X11R7.7/src/lib/libX11-1.5.0.tar.bz2</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="a0d3d0b8aff6" name="package_libxproto_7_0_23" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libxproto" version="7.0.23" />
-                    </repository>
-                    <repository changeset_revision="f92715abfb41" name="package_libxtrans_1_2_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libxtrans" version="1.2.7" />
-                    </repository>
-                    <repository changeset_revision="1bbc37f1d895" name="package_libpthread_stubs_0_3" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libpthread-stubs" version="0.3" />
-                    </repository>
-                    <repository changeset_revision="d0a5e1db8144" name="package_libxext_proto_7_2_1" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libxext-proto" version="7.2.1" />
-                    </repository>
+                  <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="cf6b0be75bdd" name="package_libxtrans_1_2_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="e9f7936e2d9d" name="package_libpthread_stubs_0_3" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="fc807cafcef7" name="package_libxext_proto_7_2_1" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="84a6fa565c7c" name="package_xorg_macros_1_17_1" 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" />
+                    <repository changeset_revision="f9fefd89da26" name="package_kbproto_1_0_6" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="13e5b41f08c6" name="package_inputproto_2_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
                 </action>
-                <action type="shell_command">./configure --prefix=$INSTALL_DIR</action>
+                <action type="shell_command">export CFLAGS="-I$XPROTO_INCLUDES -I$XTRANS_INCLUDES -I$KBPROTO_INCLUDES -I$INPUTPROTO_INCLUDES -I$XCB_INCLUDES" &amp;&amp; ./configure --prefix=$INSTALL_DIR</action>
                 <action type="shell_command">make &amp;&amp; make install</action>
                 <action type="set_environment">
-                    <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
+                  <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                     <environment_variable action="set_to" name="X11_LIB_DIR">$INSTALL_DIR/lib</environment_variable>
                     <environment_variable action="set_to" name="X11_INCLUDE_DIR">$INSTALL_DIR/include</environment_variable>
                 </action>