Mercurial > repos > iuc > package_qt_4_8

changeset 2:0084ea0bef26 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author iuc
date Sat, 01 Mar 2014 14:42:56 -0500
parents 64344b23c64c
children 86f0174a029a
files tool_dependencies.xml
diffstat 1 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Nov 01 09:04:20 2013 -0400
+++ b/tool_dependencies.xml	Sat Mar 01 14:42:56 2014 -0500
@@ -1,14 +1,24 @@
+<?xml version="1.0"?>
 <tool_dependency>
+    <package name="libx11" version="1.5.0">
+        <repository changeset_revision="6367d6fc9f82" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
     <package name="Qt" version="4.8">
         <install version="1.0">
             <actions>
-              <action type="download_by_url">http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz</action>
-              <action type="shell_command">./configure -prefix $INSTALL_DIR -opensource -confirm-license -no-xinerama</action>
-              <action type="make_install" />
-              <action type="set_environment">
-                <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                <action type="download_by_url">http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz</action>
+                <action type="set_environment_for_install">
+                    <repository changeset_revision="6367d6fc9f82" name="package_libx11_1_5_0" owner="devteam" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <package name="libx11" version="1.5.0" />
+                    </repository>
+                </action>
+                <action type="shell_command">./configure -prefix $INSTALL_DIR -opensource -confirm-license -no-xinerama</action>
+                <action type="shell_command">qmake</action>
+                <action type="shell_command">qmake install</action>
+                <action type="set_environment">
+                <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                 <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
-                <environment_variable name="QT_ROOT_DIR" action="set_to">$INSTALL_DIR</environment_variable>
+                <environment_variable action="set_to" name="QT_ROOT_DIR">$INSTALL_DIR</environment_variable>
               </action>
             </actions>
         </install>