To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 059f38ed authored by Rui  Chen's avatar Rui Chen
Browse files

Make Dacapo works when default Java is Java 8

parent 37fab418
......@@ -23,9 +23,11 @@
<target name="unpack" depends="unzip"/>
<target name="bm-build">
<ant antfile="build.xml" dir="${batik-top}" target="all-jar" inheritall="false">
<property name="debug" value="on"/>
</ant>
<exec executable="${ant.home}/bin/ant" dir="${batik-top}" failonerror="yes">
<arg line="all-jar"/>
<arg line="-Ddebug=on"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
</target>
<target name="jar" depends="deps">
......
......@@ -62,7 +62,7 @@
<include name="**/${workspace-full}.zip"/>
</fileset>
</unzip>
<!-- Create two complimentary zips for default and large workspaces -->
<!--Create two complimentary zips for default and large workspaces-->
<zip destfile="${bm-build-dir}/${workspace-default}.zip" basedir="${bm-build-dir}/eclipse-testing/workspace">
<patternset includesfile="${bm-files}/bundles-default.lst"/>
</zip>
......@@ -83,12 +83,16 @@
<!-- build the eclipse plugin, which is necessary to fire up eclipse from within our harness -->
<target name="plugin" depends="unpack">
<ant antfile="build.xml" dir="${bm-files}/plugin" inheritall="false">
<property name="plugin.destination" location="${bm-build-dir}/eclipse/plugins/"/>
<target name="clean"/>
<target name="build.update.jar"/>
</ant>
<!-- add our bundle to the configurator metadata -->
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="clean"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="build.update.jar"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="1"/>
</target>
......@@ -104,6 +108,7 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</touch>
-->
<unzip dest="${bm-build-dir}/" src="${bm-data}/dummyjre.zip"/>
<!-- Install the test data -->
<zip destfile="${bm-dat}/${bm-name}.zip" basedir="${bm-build-dir}" excludes="eclipse/plugins/**">
......@@ -113,4 +118,5 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</zip>
</target>
</project>
......@@ -95,6 +95,8 @@ public class Eclipse extends Benchmark {
System.setProperty("osgi.install.area", "file:" + fileInScratch("eclipse/"));
System.setProperty("osgi.noShutdown", "true");
System.setProperty("osgi.framework", "file:" + fileInScratch(OSGI_BOOTSTRAP_JAR));
String current_working_dir = System.getProperty("user.dir");
System.setProperty("dacapo.local.jre", current_working_dir + "/" + fileInScratch("jre/lib/rt.jar"));
setJavaHomeIfRequired();
String[] args = new String[4];
......
......@@ -347,23 +347,29 @@ public abstract class FullSourceWorkspaceTests {
}
}
// Create lib entries for the JDKs
String jreLibPath = JavaCore.getClasspathVariable("JRE_LIB").toOSString();
String tempPath = System.getProperty("dacapo.local.jre");
String[] jdkLibs = Util.getJavaClassLibs();
int jdkLibsLength = jdkLibs.length;
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength + 1];
int jdkEntriesCount = 0;
for (int i = 0; i < jdkLibsLength; i++) {
if (!jdkLibs[i].equals(jreLibPath)) { // do not include JRE_LIB in
// additional JDK entries
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
}
}
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(tempPath), null, null);
// Set classpaths (workaround bug 73253 Project references not set on
// project open)
ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
int projectsLength = ALL_PROJECTS.length;
for (int i = 0; i < projectsLength; i++) {
String projectName = ALL_PROJECTS[i].getElementName();
if (BIG_PROJECT_NAME.equals(projectName))
......@@ -384,6 +390,7 @@ public abstract class FullSourceWorkspaceTests {
} catch (CoreException jme) {
// skip name collision as it means that JRE lib were already set on the
// classpath
System.out.println("errors in here");
if (jme.getStatus().getCode() != IJavaModelStatusConstants.NAME_COLLISION) {
throw jme;
}
......
......@@ -14,7 +14,10 @@ import java.io.Writer;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
import java.util.logging.Logger;
import javax.sql.DataSource;
......@@ -82,6 +85,10 @@ public class TPCCDataSource implements DataSource {
return null;
}
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new UnsupportedOperationException();
}
private class NullWriter extends Writer {
public void close() throws IOException {
......
......@@ -44,7 +44,9 @@
<copy todir="${bm-build-dir}/src/java">
<fileset file="${bm-build-dir}/build.*"/>
</copy>
<ant antfile="build.xml" dir="${bm-build-dir}" inheritall="false"/>
<exec executable="${ant.home}/bin/ant" dir="${bm-build-dir}" failonerror="yes">
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
</target>
<target name="jar">
......
......@@ -37,7 +37,7 @@
</target>
<target name="copy-data">
<delete dir="${bm-data}/lusearchFix"/>
<mkdir dir="${bm-data}/lusearchFix"/>
<copy todir="${bm-data}/lusearchFix">
<fileset dir="bms/lusearch/data/lusearch">
<include name="**"/>
......@@ -45,8 +45,9 @@
</copy>
</target>
<target name="data" if="bm-data-exists" depends="copy-data">
<target name="data" depends="copy-data">
<zip basedir="${bm-data}" includes="**" destfile="${bm-dat}/${bm-name}.zip"/>
<delete dir="${bm-data}"/>
</target>
</project>
......@@ -26,11 +26,16 @@
<target name="unpack" depends="untar,patch"/>
<target name="bm-build" depends="build-properties,commons-httpclient,dacapo-digest">
<ant antfile="build.xml" inheritall="false" dir="${bm-build-top}">
<property name="base.path" value="${bm-downloads}"/>
<target name="download"/>
<target name="deploy"/>
</ant>
<exec executable="${ant.home}/bin/ant" dir="${bm-build-top}" failonerror="yes">
<env key="JAVA_HOME" value="${jdk16home}"/>
<arg line="download"/>
<arg line="-Dbase.path=${bm-downloads}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${bm-build-top}" failonerror="yes">
<env key="JAVA_HOME" value="${jdk16home}"/>
<arg line="deploy"/>
<arg line="-Dbase.path=${bm-downloads}"/>
</exec>
<ant antfile="dist.xml" inheritall="false" dir="${bm-build-top}">
<property name="base.path" value="${bm-downloads}"/>
<target name="dist-static"/>
......
......@@ -17,10 +17,10 @@ import java.util.List;
/**
* A client of the tomcat benchmark.
*
*
* Each client iterates through a list of queries for a given number of
* iterations, using a single session context.
*
*
* @date $Date: 2009-12-24 11:19:36 +1100 (Thu, 24 Dec 2009) $
* @id $Id: Client.java 738 2009-12-24 00:19:36Z steveb-oss $
*/
......@@ -37,40 +37,40 @@ public class Client implements Runnable {
* The pages to iterate through
*/
private final List<Page> pages = Arrays.asList(
new HttpGet("/examples/jsp/jsp2/el/basic-arithmetic.jsp","396eaab04e83090b4d4b259eeca17a5990b7fd73"),
new HttpGet("/examples/jsp/jsp2/el/basic-comparisons.jsp","2b8b76a06d5b9d3be2ed4c80efcab2adaaad880c"),
new HttpGet("/examples/jsp/jsp2/el/implicit-objects.jsp?foo=bar","e799ace810ab35a0b56627ddd276e4ad35dbaff4"),
new HttpGet("/examples/jsp/jsp2/el/functions.jsp?foo=JSP+2.0","c30b0bc98277ad4c2ce48388b3017873f9ca6c9b"),
new HttpGet("/examples/jsp/jsp2/simpletag/hello.jsp","b741884a658f677c7223296c6138089043030024"),
new HttpGet("/examples/jsp/jsp2/simpletag/repeat.jsp","a171bec81dbabd3ad22f4694e54c79d82c5286b9"),
new HttpGet("/examples/jsp/jsp2/simpletag/book.jsp","56044c60aa6744e100033ac7ee1d7e8a11f7d803"),
new HttpGet("/examples/jsp/jsp2/tagfiles/hello.jsp","5117780dcff2717856acf34424a37bea277e6d48"),
new HttpGet("/examples/jsp/jsp2/tagfiles/panel.jsp","dc67adddb6a2b1f97f0d0991034a88bec8a02009"),
new HttpGet("/examples/jsp/jsp2/tagfiles/products.jsp","96d0f521b94868a2450735a453de19753ce4df6e"),
// Prints the date - don't validate
new HttpGet("/examples/jsp/jsp2/jspx/basic.jspx",200),
new HttpGet("/examples/jsp/jsp2/jspx/svgexample.html",200,"2cc0bde1f9dcdbfdbd2a26ccd7addfce5c332a45"),
new HttpGet("/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX",200,"62d28df98503af07933c280c991d2742edc5f9f9"),
new HttpGet("/examples/jsp/jsp2/jspattribute/jspattribute.jsp","deafbfc6b6d74013c8684af4ff6caf0f713fcb82"),
// Shuffle is by definition dynamic
new HttpGet("/examples/jsp/jsp2/jspattribute/shuffle.jsp",200),
new HttpGet("/examples/jsp/jsp2/misc/dynamicattrs.jsp","30d42a712e2d336fb6ea84e550d592a38879dde2"),
new HttpGet("/examples/jsp/jsp2/misc/config.jsp","549154d36f75580e2ab018d6b67113a39cd67788"),
// Number guessing game
new NumGuess(),
// Shows the current time, so can't be digested
new HttpGet("/examples/jsp/dates/date.jsp"),
// Can return system-specific data
new HttpGet("/examples/jsp/snp/snoop.jsp",200),
new HttpGet("/examples/jsp/error/error.html",200,"7a4eee413a6d4ebc66baca65c1fcf4c2dd1e9904"),
new HttpGet("/examples/jsp/error/err.jsp?name=audi&submit=Submit",500,"7f207b1e98367e0ee43056f5a242421a46d82eb9"),
new HttpGet("/examples/jsp/error/err.jsp?name=integra&submit=Submit",200,"13fd4b057c42253a761c0a6499b89d314c09b2c2"),
new HttpGet("/examples/jsp/jsp2/el/basic-arithmetic.jsp","396eaab04e83090b4d4b259eeca17a5990b7fd73"),
new HttpGet("/examples/jsp/jsp2/el/basic-comparisons.jsp","2b8b76a06d5b9d3be2ed4c80efcab2adaaad880c"),
new HttpGet("/examples/jsp/jsp2/el/implicit-objects.jsp?foo=bar","e799ace810ab35a0b56627ddd276e4ad35dbaff4"),
new HttpGet("/examples/jsp/jsp2/el/functions.jsp?foo=JSP+2.0","c30b0bc98277ad4c2ce48388b3017873f9ca6c9b"),
new HttpGet("/examples/jsp/jsp2/simpletag/hello.jsp","b741884a658f677c7223296c6138089043030024"),
new HttpGet("/examples/jsp/jsp2/simpletag/repeat.jsp","a171bec81dbabd3ad22f4694e54c79d82c5286b9"),
new HttpGet("/examples/jsp/jsp2/simpletag/book.jsp","56044c60aa6744e100033ac7ee1d7e8a11f7d803"),
new HttpGet("/examples/jsp/jsp2/tagfiles/hello.jsp","5117780dcff2717856acf34424a37bea277e6d48"),
new HttpGet("/examples/jsp/jsp2/tagfiles/panel.jsp","dc67adddb6a2b1f97f0d0991034a88bec8a02009"),
new HttpGet("/examples/jsp/jsp2/tagfiles/products.jsp","96d0f521b94868a2450735a453de19753ce4df6e"),
// Prints the date - don't validate
new HttpGet("/examples/jsp/jsp2/jspx/basic.jspx",200),
new HttpGet("/examples/jsp/jsp2/jspx/svgexample.html",200,"2cc0bde1f9dcdbfdbd2a26ccd7addfce5c332a45"),
new HttpGet("/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX",200,"62d28df98503af07933c280c991d2742edc5f9f9"),
new HttpGet("/examples/jsp/jsp2/jspattribute/jspattribute.jsp","deafbfc6b6d74013c8684af4ff6caf0f713fcb82"),
// Shuffle is by definition dynamic
new HttpGet("/examples/jsp/jsp2/jspattribute/shuffle.jsp",200),
new HttpGet("/examples/jsp/jsp2/misc/dynamicattrs.jsp","30d42a712e2d336fb6ea84e550d592a38879dde2"),
new HttpGet("/examples/jsp/jsp2/misc/config.jsp","549154d36f75580e2ab018d6b67113a39cd67788"),
// Number guessing game
new NumGuess(),
// Shows the current time, so can't be digested
new HttpGet("/examples/jsp/dates/date.jsp"),
// Can return system-specific data
new HttpGet("/examples/jsp/snp/snoop.jsp",200),
new HttpGet("/examples/jsp/error/error.html",200,"7a4eee413a6d4ebc66baca65c1fcf4c2dd1e9904"),
new HttpGet("/examples/jsp/error/err.jsp?name=audi&submit=Submit",500,"7f207b1e98367e0ee43056f5a242421a46d82eb9"),
new HttpGet("/examples/jsp/error/err.jsp?name=integra&submit=Submit",200,"13fd4b057c42253a761c0a6499b89d314c09b2c2"),
/*
* The following group of methods form a adding items to a shopping cart
......@@ -78,38 +78,38 @@ public class Client implements Runnable {
* session across several iterations through this list, we should leave the session
* as we find it.
*/
new HttpGet("/examples/jsp/sessions/carts.html",200,"3754d762eca41dc2eb001f98a4707ea38f2c5433"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=NIN+CD&submit=add",200,"3f78ce05a2e8f07aa4f94f19538c28971695d86d"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=JSP+Book&submit=add",200,"7ccdb3cec3da190897151937bf3b9c74967d48db"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=Love+life&submit=add",200,"5f3ab0d1a3beea9335efe9145f833f9d2c394bdd"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=NIN+CD&submit=remove",200,"37eebdc94502e7e68c4dba3ad92ebcea1854a8a5"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=JSP+Book&submit=remove",200,"e0ff09f114b563e50348dae09ae51af519318741"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=Love+life&submit=remove",200,"3b21b228c817c58439223e190f780704f20798f1"),
new HttpGet("/examples/jsp/sessions/carts.html",200,"3754d762eca41dc2eb001f98a4707ea38f2c5433"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=NIN+CD&submit=add",200,"3f78ce05a2e8f07aa4f94f19538c28971695d86d"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=JSP+Book&submit=add",200,"7ccdb3cec3da190897151937bf3b9c74967d48db"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=Love+life&submit=add",200,"5f3ab0d1a3beea9335efe9145f833f9d2c394bdd"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=NIN+CD&submit=remove",200,"37eebdc94502e7e68c4dba3ad92ebcea1854a8a5"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=JSP+Book&submit=remove",200,"e0ff09f114b563e50348dae09ae51af519318741"),
new HttpPost("/examples/jsp/sessions/carts.jsp?item=Love+life&submit=remove",200,"3b21b228c817c58439223e190f780704f20798f1"),
/*
* The validation here is exhibiting weirdness - TODO fix before release
*
* Looks so far like a bug in tomcat :-/
*/
new HttpGet("/examples/jsp/checkbox/check.html",200,"7a8cff196197a6ed7562a45c7844ac6bf99b02a7"),
new HttpGet("/examples/jsp/colors/colors.html","9d87b22161bf2849821d81e5e36eb4be18025719"),
new HttpGet("/examples/jsp/cal/login.html","326bcc06b3ffd9343b9651fcba5f83aaa0866c4d"),
new HttpGet("/examples/jsp/checkbox/check.html",200,"7a8cff196197a6ed7562a45c7844ac6bf99b02a7"),
new HttpGet("/examples/jsp/colors/colors.html","9d87b22161bf2849821d81e5e36eb4be18025719"),
new HttpGet("/examples/jsp/cal/login.html","326bcc06b3ffd9343b9651fcba5f83aaa0866c4d"),
// Shows the current time, so can't be digested
new HttpGet("/examples/jsp/include/include.jsp",200),
// Shows the current time, so can't be digested
new HttpGet("/examples/jsp/include/include.jsp",200),
// Forwards to one of two files based on VM usage, so can't be digested
new HttpGet("/examples/jsp/forward/forward.jsp",200),
// Forwards to one of two files based on VM usage, so can't be digested
new HttpGet("/examples/jsp/forward/forward.jsp",200),
// Just shows the "plugin not accepted' response
new HttpGet("/examples/jsp/plugin/plugin.jsp",200,"6f4fb4e4b400200b1a457d6450009ad1ba2c7c4d"),
new HttpGet("/examples/jsp/jsptoserv/jsptoservlet.jsp",200,"721d04e5831b5e8a4889d08026b6ed101603b74f"),
// Just shows the "plugin not accepted' response
new HttpGet("/examples/jsp/plugin/plugin.jsp",200,"6f4fb4e4b400200b1a457d6450009ad1ba2c7c4d"),
new HttpGet("/examples/jsp/jsptoserv/jsptoservlet.jsp",200,"721d04e5831b5e8a4889d08026b6ed101603b74f"),
// Writes the date
new HttpGet("/examples/jsp/xml/xml.jsp",200),
new HttpGet("/examples/jsp/tagplugin/if.jsp",200,"ca82f131bbb4a0ce4eb4f56260b0e11644a1a467"),
new HttpGet("/examples/jsp/tagplugin/foreach.jsp",200,"3f4c255def31a491097fcc3047c86fc65cea03e8"),
new HttpGet("/examples/jsp/tagplugin/choose.jsp",200,"6199be21e61e279106a59479f93221d414f2b689")
// Writes the date
new HttpGet("/examples/jsp/xml/xml.jsp",200),
new HttpGet("/examples/jsp/tagplugin/if.jsp",200,"ca82f131bbb4a0ce4eb4f56260b0e11644a1a467"),
new HttpGet("/examples/jsp/tagplugin/foreach.jsp",200,"3f4c255def31a491097fcc3047c86fc65cea03e8"),
new HttpGet("/examples/jsp/tagplugin/choose.jsp",200,"6199be21e61e279106a59479f93221d414f2b689")
);
/**
......
......@@ -19,7 +19,7 @@
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}"/>
<target name="unpack" depends="untar"/>
<target name="unpack" depends="untar, patch"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
......@@ -32,4 +32,4 @@
<target name="jar">
<copy file="${lib-build-top}/dist/commons-httpclient.jar" tofile="${commons-httpclient-jar}"/>
</target>
</project>
\ No newline at end of file
</project>
......@@ -267,21 +267,21 @@
<!-- build required plugins -->
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/j2ee" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/client" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/cxf" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/axis" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
</exec>
<!-- build daytrader -->
<exec executable="${mvn}" dir="${dt-build}">
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="JAVA_HOME" path="${jdk16home}"/>
<env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin:${JAVA_HOME}/bin"/>
<env key="GERONIMO_HOME" value="${ger-home}"/>
<!-- <env key="PATH" path="${env.PATH}:${mvn-home}"/> -->
......@@ -361,6 +361,7 @@
<target name="start-geronimo">
<echo message="${ger-home}/bin/${gsh-exe}"/>
<exec executable="${ger-home}/bin/${gsh-exe}" dir="${ger-home}" spawn="true">
<env key="JAVA_HOME" value="${jdk16home}"/>
<env key="GERONIMO_HOME" path="${ger-home}"/>
<arg value="-c"/>
<arg value="geronimo/start-server"/>
......@@ -374,6 +375,7 @@
</target>
<target name="stop-geronimo">
<exec executable="${ger-home}/bin/${gsh-exe}" dir="${ger-home}" spawn="false">
<env key="JAVA_HOME" value="${jdk16home}"/>
<env key="GERONIMO_HOME" path="${ger-home}"/>
<arg value="-c"/>
<arg value="geronimo/stop-server -u system -w manager"/>
......@@ -381,6 +383,7 @@
</target>
<target name="deploy">
<exec executable="${ger-home}/bin/${gsh-exe}">
<env key="JAVA_HOME" value="${jdk16home}"/>
<env key="GERONIMO_HOME" path="${ger-home}"/>
<arg value="-c"/>
<arg value="deploy/install-plugin -u system -w manager ${deploy-subject}"/>
......@@ -388,6 +391,7 @@
</target>
<target name="undeploy">
<exec executable="${ger-home}/bin/${gsh-exe}">
<env key="JAVA_HOME" value="${jdk16home}"/>
<env key="GERONIMO_HOME" path="${ger-home}"/>
<arg value="-c"/>
<arg value="deploy/undeploy -u system -w manager ${deploy-subject}"/>
......
......@@ -29,11 +29,16 @@
<include name="*.jar"/>
</fileset>
</copy>
<ant antfile="build.xml" inheritall="false" dir="${lib-build-top}">
<property name="j16lib" value="${j16lib}"/>
<target name="all"/>
<target name="buildjars"/>
</ant>
<exec executable="${ant.home}/bin/ant" dir="${lib-build-top}" failonerror="yes">
<arg line="all"/>
<arg line="-Dj16lib=${j16lib}"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${lib-build-top}" failonerror="yes">
<arg line="buildjars"/>
<arg line="-Dj16lib=${j16lib}"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
</target>
<target name="jar">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment