[Boost-commit] svn:boost r42095 - in branches/release: . tools/build/v2/tools

From: juergen.hunold_at_[hidden]
Date: 2007-12-16 05:13:26

Author: jhunold
Date: 2007-12-16 05:13:26 EST (Sun, 16 Dec 2007)
New Revision: 42095
URL: http://svn.boost.org/trac/boost/changeset/42095

Log:
Merged revisions 41907-41908 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r41907 | jhunold | 2007-12-08 21:02:33 +0100 (Sa, 08 Dez 2007) | 2 lines
  
  Add support for QtScript library.
........
  r41908 | jhunold | 2007-12-08 21:08:29 +0100 (Sa, 08 Dez 2007) | 2 lines
  
  Add dependency scanner for Qt Resource Files (.qrc).
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/tools/qt4.jam |    39 ++++++++++++++++++++++++++++++++++++++- 
   1 files changed, 38 insertions(+), 1 deletions(-)

Modified: branches/release/tools/build/v2/tools/qt4.jam
==============================================================================
--- branches/release/tools/build/v2/tools/qt4.jam	(original)
+++ branches/release/tools/build/v2/tools/qt4.jam	2007-12-16 05:13:26 EST (Sun, 16 Dec 2007)
@@ -46,6 +46,7 @@
 import toolset : flags ;
 import os ;
 import virtual-target ;
+import scanner ;
 
 # Qt3Support control feature
 #
@@ -116,11 +117,14 @@
         # Generates .cpp file from qrc file
         generators.register-standard qt4.rcc : QRC : CPP(qrc_%) ;
         
+        # dependency scanner for wrapped files
+        type.set-scanner QRC : qrc-scanner ;
+
         # Test for a buildable Qt.
         if [ glob $(.prefix)/Jamroot ]
         {
             # Import all Qt Modules
-            local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus ;
+            local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus QtScript ;
             for local l in $(all-libraries) 
             {
                 alias $(l) 
@@ -422,6 +426,23 @@
                 : # usage-requirements
                   <include>$(.incprefix)/QtDBus
                 ;
+
+            # Script-Engine (Qt 4.3)
+            lib QtScript : QtGui QtXml
+                : # requirements
+                  <name>QtScript$(suffix_version) 
+                : # default-build
+                : # usage-requirements
+                  <include>$(.incprefix)/QtScript 
+                ;
+            lib QtScript : QtGui QtXml
+                : # requirements
+                  <name>QtScript$(suffix_debug)$(suffix_version) 
+                  <variant>debug 
+                : # default-build
+                : # usage-requirements
+                  <include>$(.incprefix)/QtScript
+                ;
         }
     }
     
@@ -587,3 +608,19 @@
 {
     $(.binprefix)/uic $(>) -o $(<)
 }
+
+# Scanner for .qrc files.
+# Look for the CDATA section of the <file> tag.
+# Ignore the "alias" attribute.
+# See http://doc.trolltech.com/qt/resources.html
+# for detailed documentation of the Qt Resource System.
+class qrc-scanner : common-scanner 
+{
+    rule pattern ( )
+    {
+        return "<file.*>(.*)</file>" ;
+    }
+}
+
+# Wrapped files are "included".
+scanner.register qrc-scanner : include ;