Boost-Build :

hunold_at_[hidden]

-- 
* Dipl.-Math. JÃ¼rgen Hunold ! Institut fÃ¼r Verkehrswesen, Eisenbahnbau
* voice: ++49 511 762-2529 ! und -betrieb, UniversitÃ¤t Hannover 
* fax : ++49 511 762-3001 ! Appelstrasse 9a, D-30167 Hannover
* hunold_at_[hidden] ! www.ive.uni-hannover.de
 --Boundary-00=_RW6cDxj6OktxR9V Content-Type: application/x-tbz;
name="qtjam.tar.bz2"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="qtjam.tar.bz2"
[Attachment content not displayed.] --Boundary-00=_RW6cDxj6OktxR9V Content-Type: text/x-diff;
charset="utf-8";
name="qt4.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="qt4.diff"
cvs diff: Diffing tools/build/v2/tools
Index: tools/build/v2/tools/qt4.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/qt4.jam,v
retrieving revision 1.7
diff -u -r1.7 qt4.jam

--- tools/build/v2/tools/qt4.jam	19 Sep 2005 07:48:36 -0000	1.7
+++ tools/build/v2/tools/qt4.jam	10 Nov 2005 19:41:21 -0000
@@ -1,3 +1,4 @@
+
# Copyright 2002 Vladimir Prus 
# Copyright 2005 Alo Sarv
# Distributed under the Boost Software License, Version 1.0. (See
@@ -86,7 +87,10 @@
# The OBJ result type is a fake here too.
generators.register [ new moc-h-generator 
- qt.moc.cpp : MOCCABLE_CPP : OBJ ] ;
+ qt4.moc.inc : MOCCABLE_CPP : OBJ ] ;
+
+ generators.register [ new moc-inc-generator 
+ qt4.moc.inc : MOCCABLE_H : OBJ ] ;
# Generates .cpp file from qrc file
generators.register-standard qt4.rcc : QRC : CPP(qrc_%) ;
@@ -233,7 +237,7 @@
name = [ $(sources[0]).name ] ;
name = $(name:B) ;
- local a = [ new action $(sources[1]) : qt4.moc.cpp :
+ local a = [ new action $(sources[1]) : qt4.moc.inc :
$(property-set) ] ;
local target = [ 
@@ -248,9 +252,39 @@
return [ virtual-target.register $(target) ] ;
} 
- } 
+ }
}
+class moc-inc-generator : generator
+{
+ rule __init__ ( * : * )
+ {
+ generator.__init__ $(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
+ }
+ rule run ( project name ? : property-set : sources * )
+ { 
+ if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE_H
+ { 
+ name = [ $(sources[0]).name ] ;
+ name = $(name:B) ;
+ 
+ local a = [ new action $(sources[1]) : qt4.moc.inc :
+ $(property-set) ] ;
+ 
+ local target = [ 
+ new file-target moc_$(name) : CPP : $(project) : $(a) ] ;
+ 
+ # Since this generator will return H target, the linking generator
+ # won't use it at all, and won't set any dependency on it.
+ # However, we need to target to be seen by bjam, so that dependency
+ # from sources to this generated header is detected -- if jam does
+ # not know about this target, it won't do anything.
+ DEPENDS all : [ $(target).actualize ] ;
+ 
+ return [ virtual-target.register $(target) ] ;
+ } 
+ } 
+}
# Query the installation directory
# This is needed in at least two scenarios
@@ -269,17 +303,16 @@
# Qt4-moc has its c++-parser, so pass INCLUDES and DEFINES.
actions moc
{
- $(.prefix)/bin/moc -I$(INCLUDES) -I$(DEFINES) -f $(>) -o $(<)
+ $(.prefix)/bin/moc -I$(INCLUDES) -D$(DEFINES) -f $(>) -o $(<)
}
-# When moccing .cpp files, we don't need -f, otherwise generated
+# When moccing files for include only, we don't need -f, otherwise generated
# code will include .cpp and we'll get duplicated symbols.
-actions moc.cpp
+actions moc.inc
{
- $(.prefix)/bin/moc -I$(INCLUDES) -I$(DEFINES) $(>) -o $(<)
+ $(.prefix)/bin/moc -I$(INCLUDES) -D$(DEFINES) $(>) -o $(<)
}
-
# Generates source files from resource files
actions rcc
{
cvs diff: Diffing tools/build/v2/tools/types
Index: tools/build/v2/tools/types/qt.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/types/qt.jam,v
retrieving revision 1.2
diff -u -r1.2 qt.jam
--- tools/build/v2/tools/types/qt.jam	14 Sep 2005 06:26:45 -0000	1.2
+++ tools/build/v2/tools/types/qt.jam	10 Nov 2005 19:41:21 -0000
@@ -5,5 +5,6 @@
type UI : ui ;
type QRC : qrc ;
type MOCCABLE_CPP ;
+type MOCCABLE_H ;
# Result of running moc.
type MOC : moc : H ;
 --Boundary-00=_RW6cDxj6OktxR9V Content-Type: application/x-tbz;
name="qt4.tar.bz2"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="qt4.tar.bz2"
[Attachment content not displayed.] --Boundary-00=_RW6cDxj6OktxR9V-- 
