Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22292
Modified Files:
Tag: RC_1_34_0
pch.jam
Log Message:
Merge changes from trunk
Index: pch.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/pch.jam,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- pch.jam 29 Jul 2006 20:18:43 -0000 1.1.2.1
+++ pch.jam 24 Sep 2006 10:12:34 -0000 1.1.2.2
@@ -1,8 +1,8 @@
# Copyright (c) 2005 Reece H. Dunn.
#
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# Use, modification and distribution is subject to the Boost Software
+# License Version 1.0. (See accompanying file LICENSE_1_0.txt or
+# http://www.boost.org/LICENSE_1_0.txt)
import type ;
import feature : feature ;
@@ -50,18 +50,29 @@
rule run ( project name ? : property-set : sources * )
{
+ # The two sources are cpp file and PCHEADER, but they
+ # can be passed in any order. Figure out which source
+ # is what.
+ local cpp = $(sources[2]) ;
+ local h = $(sources[1]) ;
+ if [ $(sources[2]).type ] = PCHEADER
+ {
+ cpp = $(sources[1]) ;
+ h = $(sources[2]) ;
+ }
+
local r =
[ generator.run $(project) $(name) :
[
property-set.create
- <pch-source>$(sources[2]) # mypch.cpp
+ <pch-source>$(cpp) # mypch.cpp
[ $(property-set).raw ]
] : $(sources)
] ;
return
[ property-set.create
- <pch-header>$(sources[1]) # mypch.h[pp]
+ <pch-header>$(h) # mypch.h[pp]
<pch-file>$(r[2]) # mypch.pch
] $(r) ;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
