equal
deleted
inserted
replaced
20 |
20 |
21 <hlm:argSet id="sbs.main.what.sbs.var"> |
21 <hlm:argSet id="sbs.main.what.sbs.var"> |
22 <hlm:arg name="config" value="${sf.spec.sbs.config}" /> |
22 <hlm:arg name="config" value="${sf.spec.sbs.config}" /> |
23 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" /> |
23 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" /> |
24 <hlm:arg name="command" value="WHAT" /> |
24 <hlm:arg name="command" value="WHAT" /> |
|
25 </hlm:argSet> |
|
26 |
|
27 <hlm:argSet id="sbs.main.check.sbs.var"> |
|
28 <hlm:arg name="config" value="${sf.spec.sbs.config}" /> |
|
29 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" /> |
|
30 <hlm:arg name="command" value="--check" /> |
25 </hlm:argSet> |
31 </hlm:argSet> |
26 |
32 |
27 <hlm:argSet id="sbs.main.clean.sbs.var"> |
33 <hlm:argSet id="sbs.main.clean.sbs.var"> |
28 <hlm:arg name="config" value="${sf.spec.sbs.config}" /> |
34 <hlm:arg name="config" value="${sf.spec.sbs.config}" /> |
29 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" /> |
35 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" /> |
141 <reference refid="sbs.main.sbs.var" torefid="sbs.var" /> |
147 <reference refid="sbs.main.sbs.var" torefid="sbs.var" /> |
142 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" /> |
148 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" /> |
143 <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" /> |
149 <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" /> |
144 </antcall> |
150 </antcall> |
145 |
151 |
|
152 <!-- OS check --> |
|
153 <antcall target="compile-main" inheritAll="false" inheritRefs="true"> |
|
154 <param name="build.system" value="${sf.spec.build.system}" /> |
|
155 <!-- param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" / --> |
|
156 <!-- param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" / --> |
|
157 <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ --> |
|
158 <reference refid="sbs.main.check.sbs.var" torefid="sbs.var" /> |
|
159 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" /> |
|
160 <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" /> |
|
161 </antcall> |
|
162 |
146 <!-- antcall target="sf-list-dir" inheritAll="false"> |
163 <!-- antcall target="sf-list-dir" inheritAll="false"> |
147 <param name="sf.list.name" value="post-build-main"/> |
164 <param name="sf.list.name" value="post-build-main"/> |
148 </antcall --> |
165 </antcall --> |
149 |
166 |
150 <!-- what has been built in tools2+tools+main --> |
167 <!-- what has been built in tools2+tools+main --> |