|
144 | 144 | <echo message="nonroadNEIQA - run the nonroad NEI QA scripts. Usage has the same arguments" />
|
145 | 145 | <echo message=" as the onroadNEIQA command. " />
|
146 | 146 | <echo message="-------------------------------------------------------------------------------"/>
|
| 147 | + <echo message="oniTool - run the ONI Tool against one or more input databases. Use" /> |
| 148 | + <echo message=" -Dinput= argument to provide the name of the database. If" /> |
| 149 | + <echo message=" providing more than one database, either comma separate the" /> |
| 150 | + <echo message=" names and quote the whole argument, or list the database" /> |
| 151 | + <echo message=" names one per line in a text file and supply the path to this" /> |
| 152 | + <echo message=" file in -Dinput. When running the ONI Tool via the command" /> |
| 153 | + <echo message=" line, the output is saved to a table called "onitooloutput"" /> |
| 154 | + <echo message=" in each input database. For additional help, see" /> |
| 155 | + <echo message=" database\ONITool\InstructionsForONITool.pdf and " /> |
| 156 | + <echo message=" docs\ONIToolCommandLine.md" /> |
| 157 | + <echo message=" ant oniTool -Dinput="cXXXXXyYYYY_in,cZZZZZyYYYY_in"" /> |
| 158 | + <echo message=" ant oniTool -Dinput=db_list.txt" /> |
| 159 | + <echo message="-------------------------------------------------------------------------------"/> |
147 | 160 | <echo message="run - Execute a runspec. " />
|
148 | 161 | <echo message=" Use -Drunspec= to name the one runspec that will be used." />
|
149 | 162 | <echo message=" ant run -Drunspec=c:\myrunspecs\runspec1.mrs" />
|
|
232 | 245 | <target name="go64" depends="">
|
233 | 246 | <!-- Build the 64-bit versions of the Go calculator and generators -->
|
234 | 247 | <echo message="Building the 64-bit version of the Go calculator with the system-wide Go compiler."/>
|
235 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc64output.txt" failifexecutionfails="true"> |
| 248 | + <exec executable="go" spawn="false" dir="${user.dir}/calc/" output="gocalc64output.txt" failifexecutionfails="true"> |
236 | 249 | <env key="GOARCH" value="amd64"/>
|
237 | 250 | <env key="GOMAXPROCS" value="4"/>
|
238 | 251 | <arg value="build" />
|
|
241 | 254 | <arg value="externalcalculatorgo.go" />
|
242 | 255 | </exec>
|
243 | 256 | <echo message="Building the 64-bit version of the Go generator with the system-wide Go compiler."/>
|
244 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerators64output.txt" failifexecutionfails="true"> |
| 257 | + <exec executable="go" spawn="false" dir="${user.dir}/generators/" output="gogenerators64output.txt" failifexecutionfails="true"> |
245 | 258 | <env key="GOARCH" value="amd64"/>
|
246 | 259 | <env key="GOMAXPROCS" value="4"/>
|
247 | 260 | <arg value="build" />
|
|
256 | 269 | <target name="go32" depends="">
|
257 | 270 | <!-- Build the 32-bit versions of the Go calculator and generators -->
|
258 | 271 | <echo message="Building the 32-bit version of the Go calculator with the system-wide Go compiler."/>
|
259 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc32output.txt" failifexecutionfails="true"> |
| 272 | + <exec executable="go" spawn="false" dir="${user.dir}/calc/" output="gocalc32output.txt" failifexecutionfails="true"> |
260 | 273 | <env key="GOARCH" value="386"/>
|
261 | 274 | <env key="GOMAXPROCS" value="4"/>
|
262 | 275 | <arg value="build" />
|
|
265 | 278 | <arg value="externalcalculatorgo.go" />
|
266 | 279 | </exec>
|
267 | 280 | <echo message="Building the 32-bit version of the Go generator with the system-wide Go compiler."/>
|
268 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerators32output.txt" failifexecutionfails="true"> |
| 281 | + <exec executable="go" spawn="false" dir="${user.dir}/generators/" output="gogenerators32output.txt" failifexecutionfails="true"> |
269 | 282 | <env key="GOARCH" value="386"/>
|
270 | 283 | <env key="GOMAXPROCS" value="4"/>
|
271 | 284 | <arg value="build" />
|
|
280 | 293 | <target name="go32local" depends="">
|
281 | 294 | <!-- Build the 32-bit versions of the Go calculator and generators using the local \go32 compiler -->
|
282 | 295 | <echo message="Building the 32-bit version of the Go calculator with the local \go32 compiler. Expect errors if no \go32 directory exists."/>
|
283 |
| - <exec executable="${user.dir}\go32\bin\go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc32localoutput.txt" failifexecutionfails="true"> |
| 296 | + <exec executable="${user.dir}\go32\bin\go" spawn="false" dir="${user.dir}/calc/" output="gocalc32localoutput.txt" failifexecutionfails="true"> |
284 | 297 | <env key="Path" value="${user.dir}\go32\bin\;${env.Path}" />
|
285 | 298 | <env key="GOARCH" value="386"/>
|
286 | 299 | <env key="GOMAXPROCS" value="4"/>
|
|
291 | 304 | <arg value="externalcalculatorgo.go" />
|
292 | 305 | </exec>
|
293 | 306 | <echo message="Building the 32-bit version of the Go generators with the local \go32 compiler. Expect errors if no \go32 directory exists."/>
|
294 |
| - <exec executable="${user.dir}\go32\bin\go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerator32localoutput.txt" failifexecutionfails="true"> |
| 307 | + <exec executable="${user.dir}\go32\bin\go" spawn="false" dir="${user.dir}/generators/" output="gogenerator32localoutput.txt" failifexecutionfails="true"> |
295 | 308 | <env key="Path" value="${user.dir}\go32\bin\;${env.Path}" />
|
296 | 309 | <env key="GOARCH" value="386"/>
|
297 | 310 | <env key="GOMAXPROCS" value="4"/>
|
|
316 | 329 | <arg value="externalcalculatorgo.go" />
|
317 | 330 | </exec>
|
318 | 331 | <echo message="Building the default 32/64 version of the Go calculator with the system-wide Go compiler."/>
|
319 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalcdefaultoutput.txt" failifexecutionfails="true"> |
| 332 | + <exec executable="go" spawn="false" dir="${user.dir}/calc/" output="gocalcdefaultoutput.txt" failifexecutionfails="true"> |
320 | 333 | <env key="GOMAXPROCS" value="4"/>
|
321 | 334 | <arg value="build" />
|
322 | 335 | <arg value="-o" />
|
323 | 336 | <arg value="externalcalculatorgo.exe" />
|
324 | 337 | <arg value="externalcalculatorgo.go" />
|
325 | 338 | </exec>
|
326 | 339 | <echo message="Building the 64-bit version of the Go calculator with the system-wide Go compiler. Expect errors if on a 32-bit system."/>
|
327 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc64output.txt" failifexecutionfails="false"> |
| 340 | + <exec executable="go" spawn="false" dir="${user.dir}/calc/" output="gocalc64output.txt" failifexecutionfails="false"> |
328 | 341 | <env key="GOARCH" value="amd64"/>
|
329 | 342 | <env key="GOMAXPROCS" value="4"/>
|
330 | 343 | <arg value="build" />
|
|
333 | 346 | <arg value="externalcalculatorgo.go" />
|
334 | 347 | </exec>
|
335 | 348 | <echo message="Building the 32-bit version of the Go calculator with the system-wide Go compiler."/>
|
336 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc32output.txt" failifexecutionfails="true"> |
| 349 | + <exec executable="go" spawn="false" dir="${user.dir}/calc/" output="gocalc32output.txt" failifexecutionfails="true"> |
337 | 350 | <env key="GOARCH" value="386"/>
|
338 | 351 | <env key="GOMAXPROCS" value="4"/>
|
339 | 352 | <arg value="build" />
|
|
342 | 355 | <arg value="externalcalculatorgo.go" />
|
343 | 356 | </exec>
|
344 | 357 | <echo message="Building the 32-bit version of the Go calculator with the local \go32 compiler. Expect errors if no \go32 directory exists."/>
|
345 |
| - <exec executable="${user.dir}\go32\bin\go.exe" spawn="false" dir="${user.dir}/calc/" output="gocalc32localoutput.txt" failifexecutionfails="false"> |
| 358 | + <exec executable="${user.dir}\go32\bin\go" spawn="false" dir="${user.dir}/calc/" output="gocalc32localoutput.txt" failifexecutionfails="false"> |
346 | 359 | <env key="Path" value="${user.dir}\go32\bin\;${env.Path}" />
|
347 | 360 | <env key="GOARCH" value="386"/>
|
348 | 361 | <env key="GOMAXPROCS" value="4"/>
|
|
363 | 376 | <arg value="externalgenerator.go" />
|
364 | 377 | </exec>
|
365 | 378 | <echo message="Building the default 32/64 version of the Go generators with the system-wide Go compiler."/>
|
366 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/generators/" output="gogeneratorsdefaultoutput.txt" failifexecutionfails="true"> |
| 379 | + <exec executable="go" spawn="false" dir="${user.dir}/generators/" output="gogeneratorsdefaultoutput.txt" failifexecutionfails="true"> |
367 | 380 | <env key="GOMAXPROCS" value="4"/>
|
368 | 381 | <arg value="build" />
|
369 | 382 | <arg value="-mod" />
|
|
373 | 386 | <arg value="externalgenerator.go" />
|
374 | 387 | </exec>
|
375 | 388 | <echo message="Building the 64-bit version of the Go generators with the system-wide Go compiler. Expect errors if on a 32-bit system."/>
|
376 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerators64output.txt" failifexecutionfails="false"> |
| 389 | + <exec executable="go" spawn="false" dir="${user.dir}/generators/" output="gogenerators64output.txt" failifexecutionfails="false"> |
377 | 390 | <env key="GOARCH" value="amd64"/>
|
378 | 391 | <env key="GOMAXPROCS" value="4"/>
|
379 | 392 | <arg value="build" />
|
|
384 | 397 | <arg value="externalgenerator.go" />
|
385 | 398 | </exec>
|
386 | 399 | <echo message="Building the 32-bit version of the Go generators with the system-wide Go compiler."/>
|
387 |
| - <exec executable="go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerators32output.txt" failifexecutionfails="true"> |
| 400 | + <exec executable="go" spawn="false" dir="${user.dir}/generators/" output="gogenerators32output.txt" failifexecutionfails="true"> |
388 | 401 | <env key="GOARCH" value="386"/>
|
389 | 402 | <env key="GOMAXPROCS" value="4"/>
|
390 | 403 | <arg value="build" />
|
|
395 | 408 | <arg value="externalgenerator.go" />
|
396 | 409 | </exec>
|
397 | 410 | <echo message="Building the 32-bit version of the Go generators with the local \go32 compiler. Expect errors if no \go32 directory exists."/>
|
398 |
| - <exec executable="${user.dir}\go32\bin\go.exe" spawn="false" dir="${user.dir}/generators/" output="gogenerator32localoutput.txt" failifexecutionfails="false"> |
| 411 | + <exec executable="${user.dir}\go32\bin\go" spawn="false" dir="${user.dir}/generators/" output="gogenerator32localoutput.txt" failifexecutionfails="false"> |
399 | 412 | <env key="Path" value="${user.dir}\go32\bin\;${env.Path}" />
|
400 | 413 | <env key="GOARCH" value="386"/>
|
401 | 414 | <env key="GOMAXPROCS" value="4"/>
|
|
1191 | 1204 | </if>
|
1192 | 1205 | </target>
|
1193 | 1206 |
|
| 1207 | + <target name="oniTool" depends=""> |
| 1208 | + <if> |
| 1209 | + <or> |
| 1210 | + <not> |
| 1211 | + <isset property="input" /> |
| 1212 | + </not> |
| 1213 | + <equals arg1="${input}" arg2="" /> |
| 1214 | + </or> |
| 1215 | + <then> |
| 1216 | + <echo>ERROR: The -Dinput= argument was not provided. Type ANT for more information.</echo> |
| 1217 | + </then> |
| 1218 | + <else> |
| 1219 | + <java classname="gov.epa.otaq.moves.master.commandline.ONIToolRunner" fork="yes" maxmemory="512m"> |
| 1220 | + <classpath> |
| 1221 | + <pathelement path="${java.class.path}" /> |
| 1222 | + </classpath> |
| 1223 | + <classpath refid="classpath" /> |
| 1224 | + <arg value="-input=${input}" /> |
| 1225 | + <arg value="-output=${output}" /> |
| 1226 | + <arg value="-script=database\ONITool\ONITool.sql" /> |
| 1227 | + </java> |
| 1228 | + </else> |
| 1229 | + </if> |
| 1230 | + </target> |
| 1231 | + |
1194 | 1232 | <target name="setlogin" depends="">
|
1195 | 1233 | <java classname="gov.epa.otaq.moves.master.commandline.SetLogin" fork="yes" maxmemory="512m">
|
1196 | 1234 | <classpath>
|
|
0 commit comments