[Boost-commit] svn:boost r51313 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r51313 - trunk/tools/build/v2/tools
From: juergen.hunold_at_[hidden]
Date: 2009-02-18 14:11:49

Author: jhunold
Date: 2009-02-18 14:11:49 EST (Wed, 18 Feb 2009)
New Revision: 51313
URL: http://svn.boost.org/trac/boost/changeset/51313

Log:
Refactoring: Rename uic-h to uic to get uniform toolnames.

Text files modified: 
   trunk/tools/build/v2/tools/qt4.jam |    14 +++++++-------                          
   1 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/tools/qt4.jam
==============================================================================
--- trunk/tools/build/v2/tools/qt4.jam	(original)
+++ trunk/tools/build/v2/tools/qt4.jam	2009-02-18 14:11:49 EST (Wed, 18 Feb 2009)
@@ -210,7 +210,7 @@
 
         # The OBJ result type is a fake, 'H' will be really produced. See
         # comments on the generator class, defined below the 'init' function.
-        generators.register [ new uic-h-generator qt4.uic-h : UI : OBJ :
+        generators.register [ new uic-generator qt4.uic : UI : OBJ :
             <allow>qt4  ] ;
 
         # The OBJ result type is a fake here too.
@@ -277,9 +277,9 @@
     debug-message "  tool requirements:  " '$(tools-requirements)' ;
 
     # setup the paths for the tools
-    toolset.flags qt4.moc   .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
-    toolset.flags qt4.rcc   .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
-    toolset.flags qt4.uic-h .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
+    toolset.flags qt4.moc .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
+    toolset.flags qt4.rcc .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
+    toolset.flags qt4.uic .BINPREFIX $(tools-requirements) : $(bin_prefix) ;
 
     # TODO: 2009-02-12: Better support for directories
     # Most likely needed are separate getters for: include,libraries,binaries and sources.
@@ -467,7 +467,7 @@
 # linking generator tries to convert sources to OBJ, but it produces target of
 # type H. This is non-standard, but allowed. That header won't be mocced.
 #
-class uic-h-generator : generator
+class uic-generator : generator
 {
     rule __init__ ( * : * )
     {
@@ -482,7 +482,7 @@
             name = $(name:B) ;
         }
 
-        local a = [ new action $(sources[1]) : qt4.uic-h : $(property-set) ] ;
+        local a = [ new action $(sources[1]) : qt4.uic : $(property-set) ] ;
 
         # The 'ui_' prefix is to match qmake's default behavior.
         local target = [ new file-target ui_$(name) : H : $(project) : $(a) ] ;
@@ -687,7 +687,7 @@
 
 # Generates user-interface source from .ui files.
 #
-actions uic-h
+actions uic
 {
     $(.BINPREFIX[-1])/uic $(>) -o $(<)
 }