|
Boost-Build : |
From: Alexey Pakhunov (alexeypa_at_[hidden])
Date: 2005-11-12 08:23:54
Reece Dunn wrote:
>>+actions compile.idl bind RSP
>
> ^^^^^^^^
> This is not needed anymore.
Agrhhh. Forgot to remove it.
> However, using an IDL file in a target causes that target to always be
> rebuilt (tested with the latest version). This problem seems to have
> reappeared :(.
I can't reproduce this problem. It works for me. Can you send me a small
repro project?
In my project I use it like this:
mstypelib lma-typelib
:
lma.idl
:
<midl-robust>yes
;
Best regards/Venlig hilsen,
Alexey Pakhunov.
# Copyright (c) 2005 Alexey Pakhunov.
#
# 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)
# Microsoft Interface Definition Language (MIDL) related routines
import common ;
import generators ;
import feature : feature get-values ;
import scanner ;
import toolset : flags ;
import type ;
rule init ( )
{
}
type.register IDL : idl ;
# A type library (.tlb) is generated by MIDL compiler and can be included
# to resources of an application (.rc). In order to be found by a resource
# compiler its target type should be derived from 'H' - otherwise
# the property '<implicit-dependency>' will be ignored.
type.register MSTYPELIB : tlb : H ;
# Register scanner for MIDL files
class midl-scanner : scanner
{
import path property-set regex scanner type virtual-target ;
rule __init__ ( includes * )
{
scanner.__init__ ;
self.includes = $(includes) ;
# List of quoted strings
self.re-strings = "[ \t]*\"([^\"]*)\"([ \t]*,[ \t]*\"([^\"]*)\")*[ \t]*" ;
# 'import' and 'importlib' directives
self.re-import = "import"$(self.re-strings)"[ \t]*;" ;
self.re-importlib = "importlib[ \t]*[(]"$(self.re-strings)"[)][ \t]*;" ;
# C preprocessor 'include' directive
self.re-include-angle = "#[ \t]*include[ \t]*<(.*)>" ;
self.re-include-quoted = "#[ \t]*include[ \t]*\"(.*)\"" ;
}
rule pattern ( )
{
# Match '#include', 'import' and 'importlib' directives
return "((#[ \t]*include|import(lib)?).+(<(.*)>|\"(.*)\").+)" ;
}
rule process ( target : matches * : binding )
{
local included-angle = [ regex.transform $(matches) : $(self.re-include-angle) : 1 ] ;
local included-quoted = [ regex.transform $(matches) : $(self.re-include-quoted) : 1 ] ;
local imported = [ regex.transform $(matches) : $(self.re-import) : 1 3 ] ;
local imported_tlbs = [ regex.transform $(matches) : $(self.re-importlib) : 1 3 ] ;
# CONSIDER: the new scoping rule seem to defeat "on target" variables.
local g = [ on $(target) return $(HDRGRIST) ] ;
local b = [ NORMALIZE_PATH $(binding:D) ] ;
# Attach binding of including file to included targets.
# When target is directly created from virtual target
# this extra information is unnecessary. But in other
# cases, it allows to distinguish between two headers of the
# same name included from different places.
local g2 = $(g)"#"$(b) ;
included-angle = $(included-angle:G=$(g)) ;
included-quoted = $(included-quoted:G=$(g2)) ;
imported = $(imported:G=$(g2)) ;
imported_tlbs = $(imported_tlbs:G=$(g2)) ;
local all = $(included-angle) $(included-quoted) $(imported) ;
INCLUDES $(target) : $(all) ;
DEPENDS $(target) : $(imported_tlbs) ;
NOCARE $(all) $(imported_tlbs) ;
SEARCH on $(included-angle) = $(self.includes:G=) ;
SEARCH on $(included-quoted) = $(b) $(self.includes:G=) ;
SEARCH on $(imported) = $(b) $(self.includes:G=) ;
SEARCH on $(imported_tlbs) = $(b) $(self.includes:G=) ;
scanner.propagate
[ type.get-scanner CPP : [ property-set.create $(self.includes) ] ] :
$(included-angle) $(included-quoted) : $(target) ;
scanner.propagate $(__name__) : $(imported) : $(target) ;
}
}
scanner.register midl-scanner : include ;
type.set-scanner IDL : midl-scanner ;
# Command line options
feature midl-stubless-proxy : yes no : propagated ;
feature midl-robust : yes no : propagated ;
flags midl.compile.idl MIDLFLAGS <midl-stubless-proxy>yes : /Oicf ;
flags midl.compile.idl MIDLFLAGS <midl-stubless-proxy>no : /Oic ;
flags midl.compile.idl MIDLFLAGS <midl-robust>yes : /robust ;
flags midl.compile.idl MIDLFLAGS <midl-robust>no : /no_robust ;
# Architecture-specific options
architecture-x86 = <architecture> <architecture>x86 ;
address-model-32 = <address-model> <address-model>32 ;
address-model-64 = <address-model> <address-model>64 ;
flags midl.compile.idl MIDLFLAGS $(architecture-x86)/$(address-model-32) : /win32 ;
flags midl.compile.idl MIDLFLAGS $(architecture-x86)/<address-model>64 : /x64 ;
flags midl.compile.idl MIDLFLAGS <architecture>ia64/$(address-model-64) : /ia64 ;
flags midl.compile.idl DEFINES <define> ;
flags midl.compile.idl UNDEFS <undef> ;
flags midl.compile.idl INCLUDES <include> ;
generators.register-c-compiler midl.compile.idl : IDL : MSTYPELIB H C(%_i) C(%_proxy) C(%_dlldata) ;
actions compile.idl
{
midl /nologo /U$(UNDEFS) /D$(DEFINES) $(MIDLFLAGS) "/I$(INCLUDES)" /tlb "$(<[1]:W)" /h "$(<[2]:W)" /iid "$(<[3]:W)" /proxy "$(<[4]:W)" /dlldata "$(<[5]:W)" "$(>:W)"
}
Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.63
diff -u -r1.63 msvc.jam
--- msvc.jam 9 Nov 2005 13:56:41 -0000 1.63
+++ msvc.jam 12 Nov 2005 13:20:14 -0000
@@ -18,6 +18,7 @@
import common ;
import "class" : new ;
import rc ;
+import midl ;
if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
{
@@ -36,6 +37,9 @@
# List of all registered configurations
.versions = [ new configurations ] ;
+# Inherit MIDL flags
+toolset.inherit-flags msvc : midl ;
+
RM = [ common.rm-command ] ;
nl = "
" ;
@@ -321,6 +325,9 @@
assembler = [ get-values <assembler> : $(options) ] ;
assembler ?= ml ;
+ idl-compiler = [ get-values <idl-compiler> : $(options) ] ;
+ idl-compiler ?= midl ;
+
for local i in 1 2 3
{
@@ -342,6 +349,7 @@
flags msvc.compile .ASM $(cond) : $(command[$(i)])$(assembler) ;
flags msvc.link .LD $(cond) : $(command[$(i)])$(linker) ;
flags msvc.archive .LD $(cond) : $(command[$(i)])$(linker) ;
+ flags msvc.compile .IDL $(cond) : $(command[$(i)])$(idl-compiler) ;
}
}
@@ -487,6 +495,9 @@
generators.override msvc.compile.rc : rc.resource-compile ;
generators.register-standard msvc.compile.asm : ASM : OBJ : <toolset>msvc ;
+generators.register-c-compiler msvc.compile.idl : IDL : MSTYPELIB H C(%_i) C(%_proxy) C(%_dlldata) : <toolset>msvc ;
+generators.override msvc.compile.idl : midl.compile.idl ;
+
#
# Declare flags and action for compilation
#
@@ -553,6 +564,11 @@
$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
}
+actions compile.idl
+{
+ $(.IDL) /nologo @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)" $(nl)-U$(UNDEFS) $(nl)$(MIDLFLAGS) $(nl)/tlb "$(<[1]:W)" $(nl)/h "$(<[2]:W)" $(nl)/iid "$(<[3]:W)" $(nl)/proxy "$(<[4]:W)" $(nl)/dlldata "$(<[5]:W)")"
+}
+
# Declare flags and action for the assembler
flags msvc.compile.asm USER_ASMFLAGS <asmflags> : ;
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk