equal
deleted
inserted
replaced
45 </antcall> |
45 </antcall> |
46 |
46 |
47 <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them --> |
47 <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them --> |
48 <or> |
48 <or> |
49 <isfalse value="${sf.unpack.tools}"/> |
49 <isfalse value="${sf.unpack.tools}"/> |
50 <isfalse value="${sf.spec.baseline.enable}"/> |
50 <isfalse value="${sf.spec.toolsbaseline.enable}"/> |
51 <isfalse value="${sf.os.compile.fast}"/> |
51 <isfalse value="${sf.os.compile.fast}"/> |
52 </or> |
52 </or> |
53 <then> |
53 <then> |
54 <echo message="INFO Building tools, unpack is not specified"/> |
54 <echo message="INFO Building tools, unpack is not specified"/> |
55 |
55 |
57 <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true"> |
57 <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true"> |
58 <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.tools.config}" /> |
58 <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.tools.config}" /> |
59 </antcall> |
59 </antcall> |
60 </then> |
60 </then> |
61 <else> |
61 <else> |
62 <echo message="INFO Skipping tools build, tools were unpacked from ${sf.spec.baseline.location}"/> |
62 <echo message="INFO Skipping tools build, tools were unpacked from ${sf.spec.toolsbaseline.location}"/> |
63 </else> |
63 </else> |
64 </if> |
64 </if> |
65 |
65 |
66 <!-- sf.spec.sbs.config param used. do-target-build will decide to build sequentially/together --> |
66 <!-- sf.spec.sbs.config param used. do-target-build will decide to build sequentially/together --> |
67 <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true"> |
67 <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true"> |
76 <!-- perform export only first to assist when parallel makefile parsing --> |
76 <!-- perform export only first to assist when parallel makefile parsing --> |
77 <target name="sf-do-full-export"> |
77 <target name="sf-do-full-export"> |
78 |
78 |
79 <!-- turn comma separated list into sbs friendly -c list, and _ separated list for friendly log names --> |
79 <!-- turn comma separated list into sbs friendly -c list, and _ separated list for friendly log names --> |
80 <propertyregex property="i.sf.spec.sbs.config.expanded" override="true" input="${sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${sf.spec.sbs.config}" global="true" casesensitive="false"/> |
80 <propertyregex property="i.sf.spec.sbs.config.expanded" override="true" input="${sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${sf.spec.sbs.config}" global="true" casesensitive="false"/> |
81 <propertyregex property="i.sf.spec.sbs.tools.config.expanded" override="true" input="${sf.spec.sbs.tools.config}" regexp="(,)" replace=" -c " defaultValue="${sf.spec.sbs.config}" global="true" casesensitive="false"/> |
81 <propertyregex property="i.sf.spec.sbs.tools.config.expanded" override="true" input="${sf.spec.sbs.tools.config}" regexp="(,)" replace=" -c " defaultValue="${sf.spec.sbs.tools.config}" global="true" casesensitive="false"/> |
82 |
82 |
83 <hlm:sbsinput id="sf.export"> |
83 <hlm:sbsinput id="sf.export"> |
84 <sbsOptions> |
84 <sbsOptions> |
85 <arg line="-c ${i.sf.spec.sbs.config.expanded} -c ${i.sf.spec.sbs.tools.config.expanded}"/> |
85 <arg line="-c ${i.sf.spec.sbs.config.expanded} -c ${i.sf.spec.sbs.tools.config.expanded}"/> |
86 <arg line="-k" /> |
86 <arg line="-k" /> |