1 | *** a/tools/build/v2/build/project.jam 2010-02-17 04:49:08.000000000 -0500
|
---|
2 | --- b/tools/build/v2/build/project.jam 2010-08-18 19:29:58.000000000 -0400
|
---|
3 | ***************
|
---|
4 | *** 294,311 ****
|
---|
5 | : "Filenames are: " $(jamfile-to-load:D=) ;
|
---|
6 | }
|
---|
7 |
|
---|
8 | - # Initialize the Jamfile module before loading.
|
---|
9 | - #
|
---|
10 | - initialize $(jamfile-module) : [ path.parent $(jamfile-to-load) ]
|
---|
11 | - : $(jamfile-to-load:BS) ;
|
---|
12 | -
|
---|
13 | - local saved-project = $(.current-project) ;
|
---|
14 | # Now load the Jamfile in it's own context. Initialization might have loaded
|
---|
15 | # parent Jamfiles, which might have loaded the current Jamfile with
|
---|
16 | # use-project. Do a final check to make sure it's not loaded already.
|
---|
17 | if ! $(jamfile-module) in $(.jamfile-modules)
|
---|
18 | {
|
---|
19 | .jamfile-modules += $(jamfile-module) ;
|
---|
20 | mark-as-user $(jamfile-module) ;
|
---|
21 | modules.load $(jamfile-module) : [ path.native $(jamfile-to-load) ] : . ;
|
---|
22 | if [ MATCH ($(JAMROOT)) : $(jamfile-to-load:BS) ]
|
---|
23 | --- 294,313 ----
|
---|
24 | : "Filenames are: " $(jamfile-to-load:D=) ;
|
---|
25 | }
|
---|
26 |
|
---|
27 | # Now load the Jamfile in it's own context. Initialization might have loaded
|
---|
28 | # parent Jamfiles, which might have loaded the current Jamfile with
|
---|
29 | # use-project. Do a final check to make sure it's not loaded already.
|
---|
30 | if ! $(jamfile-module) in $(.jamfile-modules)
|
---|
31 | {
|
---|
32 | .jamfile-modules += $(jamfile-module) ;
|
---|
33 | +
|
---|
34 | + # Initialize the Jamfile module before loading.
|
---|
35 | + #
|
---|
36 | + initialize $(jamfile-module) : [ path.parent $(jamfile-to-load) ]
|
---|
37 | + : $(jamfile-to-load:BS) ;
|
---|
38 | +
|
---|
39 | + local saved-project = $(.current-project) ;
|
---|
40 | +
|
---|
41 | mark-as-user $(jamfile-module) ;
|
---|
42 | modules.load $(jamfile-module) : [ path.native $(jamfile-to-load) ] : . ;
|
---|
43 | if [ MATCH ($(JAMROOT)) : $(jamfile-to-load:BS) ]
|
---|
44 | ***************
|
---|
45 | *** 316,322 ****
|
---|
46 | load-aux $(jamfile-module) : [ path.native $(jamfile) ] ;
|
---|
47 | }
|
---|
48 | }
|
---|
49 | ! }
|
---|
50 | # Now do some checks.
|
---|
51 | if $(.current-project) != $(saved-project)
|
---|
52 | {
|
---|
53 | --- 318,324 ----
|
---|
54 | load-aux $(jamfile-module) : [ path.native $(jamfile) ] ;
|
---|
55 | }
|
---|
56 | }
|
---|
57 | !
|
---|
58 | # Now do some checks.
|
---|
59 | if $(.current-project) != $(saved-project)
|
---|
60 | {
|
---|
61 | ***************
|
---|
62 | *** 346,351 ****
|
---|
63 | --- 348,354 ----
|
---|
64 | }
|
---|
65 | }
|
---|
66 | }
|
---|
67 | + }
|
---|
68 | }
|
---|
69 |
|
---|
70 |
|
---|