@@ -20,18 +20,30 @@ |
</target> |
<target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> |
<echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/> |
- <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" |
- classpath="${tomcat.home}/server/lib/catalina-ant.jar"/> |
- <deploy url="${tomcat.url}/manager" username="${tomcat.username}" |
+ <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"> |
+ <classpath> |
+ <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> |
+ <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> |
+ <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> |
+ <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> |
+ </classpath> |
+ </taskdef> |
+ <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}" |
password="${tomcat.password}" path="${Context(path)}" |
war="${deploy.ant.archive}"/> |
<property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/> |
</target> |
<target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> |
<echo message="Undeploying ${Context(path)}"/> |
- <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" |
- classpath="${tomcat.home}/server/lib/catalina-ant.jar"/> |
- <undeploy url="${tomcat.url}/manager" username="${tomcat.username}" |
+ <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"> |
+ <classpath> |
+ <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> |
+ <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> |
+ <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> |
+ <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> |
+ </classpath> |
+ </taskdef> |
+ <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}" |
password="${tomcat.password}" path="${Context(path)}"/> |
</target> |
</project> |
@@ -50,6 +50,36 @@ |
</target> |
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/> |
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
+ <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/> |
+ <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> |
+ <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> |
+ <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> |
+ <condition property="platform.javac" value="${platform.home}/bin/javac"> |
+ <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> |
+ </condition> |
+ <property name="platform.javac" value="${platform.javac.tmp}"/> |
+ <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> |
+ <condition property="platform.java" value="${platform.home}/bin/java"> |
+ <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> |
+ </condition> |
+ <property name="platform.java" value="${platform.java.tmp}"/> |
+ <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> |
+ <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> |
+ <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> |
+ </condition> |
+ <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> |
+ <fail unless="platform.home">Must set platform.home</fail> |
+ <fail unless="platform.bootcp">Must set platform.bootcp</fail> |
+ <fail unless="platform.java">Must set platform.java</fail> |
+ <fail unless="platform.javac">Must set platform.javac</fail> |
+ <fail if="platform.invalid"> |
+ The J2SE Platform is not correctly set up. |
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. |
+ Either open the project in the IDE and setup the Platform with the same name or add it manually. |
+ For example like this: |
+ ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file) |
+ or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) |
+ </fail> |
<condition property="have.tests"> |
<or> |
<available file="${test.src.dir}"/> |
@@ -191,15 +221,6 @@ |
<length length="0" string="${endorsed.classpath}" when="greater"/> |
</and> |
</condition> |
- <condition else="false" property="jdkBug6558476"> |
- <and> |
- <matches pattern="1\.[56]" string="${java.specification.version}"/> |
- <not> |
- <os family="unix"/> |
- </not> |
- </and> |
- </condition> |
- <property name="javac.fork" value="${jdkBug6558476}"/> |
<condition property="junit.available"> |
<or> |
<available classname="org.junit.Test" classpath="${run.test.classpath}"/> |
@@ -294,7 +315,7 @@ |
<property location="${build.dir}/empty" name="empty.dir"/> |
<mkdir dir="${empty.dir}"/> |
<mkdir dir="@{apgeneratedsrcdir}"/> |
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
<src> |
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
<include name="*"/> |
@@ -331,7 +352,7 @@ |
<sequential> |
<property location="${build.dir}/empty" name="empty.dir"/> |
<mkdir dir="${empty.dir}"/> |
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
<src> |
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
<include name="*"/> |
@@ -408,7 +429,7 @@ |
<attribute default="" name="testmethods"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
<syspropertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -431,7 +452,7 @@ |
<element name="customize" optional="true"/> |
<sequential> |
<property name="run.jvmargs.ide" value=""/> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
<batchtest todir="${build.test.results.dir}"> |
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
<filename name="@{testincludes}"/> |
@@ -471,7 +492,7 @@ |
</fileset> |
</union> |
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> |
- <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-erosion" testname="TestNG tests" workingDir="${basedir}"> |
+ <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-erosion" testname="TestNG tests" workingDir="${basedir}"> |
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> |
<propertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -549,7 +570,7 @@ |
<attribute default="" name="testmethods"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
<syspropertyset> |
<propertyref prefix="test-sys-prop."/> |
@@ -574,7 +595,7 @@ |
<element name="customize" optional="true"/> |
<sequential> |
<property name="run.jvmargs.ide" value=""/> |
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
+ <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
<batchtest todir="${build.test.results.dir}"> |
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
<filename name="@{testincludes}"/> |
@@ -698,7 +719,7 @@ |
<attribute default="${debug.classpath}" name="classpath"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <java classname="@{classname}" fork="true"> |
+ <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
<jvmarg line="${runmain.jvmargs}"/> |
<classpath> |
@@ -730,6 +751,9 @@ |
<classpath> |
<path path="@{classpath}"/> |
</classpath> |
+ <bootclasspath> |
+ <path path="${platform.bootcp}"/> |
+ </bootclasspath> |
</nbjpdastart> |
</sequential> |
</macrodef> |
@@ -750,7 +774,9 @@ |
</macrodef> |
</target> |
<target name="-init-debug-args"> |
- <property name="version-output" value="java version "${ant.java.version}"/> |
+ <exec executable="${platform.java}" outputproperty="version-output"> |
+ <arg value="-version"/> |
+ </exec> |
<condition property="have-jdk-older-than-1.4"> |
<or> |
<contains string="${version-output}" substring="java version "1.0"/> |
@@ -776,7 +802,7 @@ |
<attribute default="${application.args.param}" name="args"/> |
<element name="customize" optional="true"/> |
<sequential> |
- <java classname="@{classname}" fork="true"> |
+ <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
<jvmarg line="${debug-args-line}"/> |
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
@@ -1381,6 +1407,9 @@ |
<sourcepath> |
<path path="${web.docbase.dir}"/> |
</sourcepath> |
+ <bootclasspath> |
+ <path path="${platform.bootcp}"/> |
+ </bootclasspath> |
</nbjpdaconnect> |
</target> |
<target if="do.display.browser.debug.old" name="debug-display-browser-old"> |
@@ -1503,7 +1532,7 @@ |
--> |
<target depends="init" if="have.sources" name="javadoc-build"> |
<mkdir dir="${dist.javadoc.dir}"/> |
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
+ <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
<classpath> |
<path path="${javac.classpath}:${j2ee.platform.classpath}"/> |
</classpath> |
@@ -1011,7 +1011,6 @@ |
<copyfiles files="${file.reference.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1030,7 +1029,6 @@ |
<copyfiles files="${file.reference.commons-digester-1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.commons-io-2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.commons-jxpath-1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.commons-lang-2.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.commons-logging-1.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.commons-pool-1.5.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.core.commands-3.6.0.I20100512-1500.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1110,6 +1108,7 @@ |
<copyfiles files="${file.reference.jts-1.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.vecmath-1.3.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.xsd-2.6.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<mkdir dir="${build.web.dir}/META-INF"/> |
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
</target> |
@@ -1119,7 +1118,6 @@ |
<copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1138,7 +1136,6 @@ |
<copyfiles files="${file.reference.commons-digester-1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.commons-io-2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.commons-jxpath-1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.commons-lang-2.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.commons-logging-1.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.commons-pool-1.5.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.core.commands-3.6.0.I20100512-1500.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1218,6 +1215,7 @@ |
<copyfiles files="${file.reference.jts-1.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.vecmath-1.3.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.xsd-2.6.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
</target> |
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
<delete dir="${build.web.dir}/WEB-INF/lib"/> |
@@ -173,7 +173,7 @@ |
pc = new ProcessComponent(); |
|
// linux based WEPS |
- pc.exe = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/weps", new File(binDir)).toString(); |
+ pc.exe = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/weps.exe", new File(binDir)).toString(); |
// C15 tells WEPS to perform up to 15 calibration cycles for convergence, could do fewer cycles |
// Z50 is required with calibration flag |
String[] wepsArgs = (cropCalibrationMode ? new String[]{"-W1", "-u0", "-I2", "-t1", "-T1", "-P./", "-C15", "-Z50"} |
@@ -542,7 +542,7 @@ |
pcCliGen.working_dir = sessionWorkDir; |
LOG.info("extract cligen to:/bin/" + Binaries.getArch()); |
LOG.info("binDir is=" + binDir); |
- pcCliGen.exe = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/cligen", new File(binDir)).toString(); |
+ pcCliGen.exe = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/cligen.exe", new File(binDir)).toString(); |
LOG.info("extract climate db"); |
String dbpath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/upd_US_cligen_stations.par", new File(binDir)).toString(); |
pcCliGen.args = new String[]{"-S" + cligenStation.state, "-s" + cligenStation.stationId, "-i" + dbpath, "-t5", "-I3", "-F", "-b01", "-y" + simulationYears, "-o" + sessionWorkDir + "/cli_gen.cli"}; |
@@ -599,7 +599,7 @@ |
ProcessComponent pcInterpolate = new ProcessComponent(); |
|
// linux |
- String exepath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/interpolate", new File(binDir)).toString(); |
+ String exepath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/interpolate.exe", new File(binDir)).toString(); |
|
String dbpath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/wind_gen_his_upper_US_NRCS.idx", new File(binDir)).toString(); |
String polygon = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/interpolation_boundary.pol", new File(binDir)).toString(); |
@@ -648,7 +648,7 @@ |
ProcessComponent pcInterpWdb = new ProcessComponent(); |
|
// linux |
- exepath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/interp_wdb", new File(binDir)).toString(); |
+ exepath = Binaries.unpackResource("/bin/" + Binaries.getArch() + "/interp_wdb.exe", new File(binDir)).toString(); |
|
// String station1Db = BinUtils.unpackResourceAbsolute("/bin/" + BinUtils.getArch() + "/windstations/" + wp.station1 + ".wdb", sessionWorkDir + "/" + wp.station1 + ".wdb").toString(); |
// String station2Db = BinUtils.unpackResourceAbsolute("/bin/" + BinUtils.getArch() + "/windstations/" + wp.station2 + ".wdb", sessionWorkDir + "/" + wp.station2 + ".wdb").toString(); |
@@ -46,18 +46,19 @@ |
@Polling(first = 25000, next = 2000) |
|
// weps, weps.version is in the csip-conf.file |
-@Resource(type = EXECUTABLE, file = "/bin/${arch}/${weps.version}/weps", id = WEPS_EXE) |
+//@Resource(type = EXECUTABLE, file = "/bin/${arch}/${weps.version}/weps.exe", id = WEPS_EXE) |
+@Resource(type = EXECUTABLE, file = "/bin/${arch}/1.3.9/weps.exe", id = WEPS_EXE) |
//@Resource(type = EXECUTABLE, file = "/bin/${csip.arch}/weps", id = WEPS_EXE) |
////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/weps-1.3.9", id = WEPS_EXE) |
// cligen |
-@Resource(type = EXECUTABLE, file = "/bin/${arch}/cligen", id = CLIGEN) |
+@Resource(type = EXECUTABLE, file = "/bin/${arch}/cligen.exe", id = CLIGEN) |
//@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/cligen", id = CLIGEN) |
@Resource(type = FILE, file = "/data/upd_US_cligen_stations.par", id = STATION_PAR) |
// windgen |
@Resource(type = EXECUTABLE, file = "/bin/win-x86/wind_gen4.exe", wine = true, id = WINDGEN) |
-@Resource(type = EXECUTABLE, file = "/bin/${arch}/interpolate", id = INTERPOLATE) |
+@Resource(type = EXECUTABLE, file = "/bin/${arch}/interpolate.exe", id = INTERPOLATE) |
////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interpolate", id = INTERPOLATE) |
-@Resource(type = EXECUTABLE, file = "/bin/${arch}/interp_wdb", id = INTERP_WDB) |
+@Resource(type = EXECUTABLE, file = "/bin/${arch}/interp_wdb.exe", id = INTERP_WDB) |
////@Resource(type = EXECUTABLE, file = "/bin/lin-amd64/interp_wdb", id = INTERP_WDB) |
@Resource(type = FILE, file = "/data/wind_gen_his_upper_US_NRCS.idx", id = WINDGEN_IDX) |
@Resource(type = FILE, file = "/data/wind_gen_his_upper_US.wdb", id = DEFAULT_WIND_STATION_DB) |