diff options
| -rw-r--r-- | gentools/build.xml | 2 | ||||
| -rw-r--r-- | java/build.deps | 37 | ||||
| -rw-r--r-- | java/module.xml | 3 |
3 files changed, 20 insertions, 22 deletions
diff --git a/gentools/build.xml b/gentools/build.xml index 5d0976f56d..f6760a215e 100644 --- a/gentools/build.xml +++ b/gentools/build.xml @@ -25,7 +25,7 @@ <property name="java.target" value="1.5"/> <target name="compile"> - <javac srcdir="${src}" source="${java.source}" target="${java.target}" fork="true" debug="on"> + <javac srcdir="${src}" source="${java.source}" target="${java.target}" fork="true" debug="on" includeantruntime="false"> <classpath> <fileset dir="${src}/../lib"> <include name="**/*.jar"/> diff --git a/java/build.deps b/java/build.deps index cfbd122527..100aa87a2a 100644 --- a/java/build.deps +++ b/java/build.deps @@ -103,30 +103,27 @@ ecl-equinox-launcher-solaris-gtk-sparc=lib/org.eclipse.equinox.launcher.gtk.sola management-common.libs= +management-eclipse-plugin.core-libs=${ibm-icu} ${ecl-core-jface} ${ecl-core-jface-databinding} \ + ${ecl-core-commands} ${ecl-core-contenttype} ${ecl-core-databinding} ${ecl-core-expressions} \ + ${ecl-core-jobs} ${ecl-core-runtime} ${ecl-equinox-app} ${ecl-equinox-common} ${ecl-equinox-launcher} \ + ${ecl-equinox-prefs} ${ecl-equinox-registry} ${ecl-help} ${ecl-osgi} ${ecl-swt} ${ecl-ui} ${ecl-ui-forms} \ + ${ecl-ui-workbench} ${apache-commons-codec} + +management-eclipse-plugin.swt-libs=${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} ${ecl-swt-macosx-carbon} \ + ${ecl-swt-linux-gtk-x86_64} ${ecl-swt-solaris-gtk-sparc} + +management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${management-eclipse-plugin.swt-libs} + management-eclipse-plugin-win32-win32-x86.libs=${management-eclipse-plugin.core-libs} \ - ${ecl-swt-win32-win32-x86} ${ecl-equinox-launcher-win32-win32-x86} + ${ecl-swt-win32-win32-x86} ${ecl-equinox-launcher-win32-win32-x86} ${ecl-core-runtime-compat-registry} management-eclipse-plugin-linux-gtk-x86.libs=${management-eclipse-plugin.core-libs} \ - ${ecl-swt-linux-gtk-x86} ${ecl-equinox-launcher-linux-gtk-x86} + ${ecl-swt-linux-gtk-x86} ${ecl-equinox-launcher-linux-gtk-x86} ${ecl-core-runtime-compat-registry} management-eclipse-plugin-linux-gtk-x86_64.libs=${management-eclipse-plugin.core-libs} \ - ${ecl-swt-linux-gtk-x86_64} ${ecl-equinox-launcher-linux-gtk-x86_64} + ${ecl-swt-linux-gtk-x86_64} ${ecl-equinox-launcher-linux-gtk-x86_64} ${ecl-core-runtime-compat-registry} management-eclipse-plugin-macosx.libs=${management-eclipse-plugin.core-libs} \ - ${ecl-swt-macosx-carbon} ${ecl-equinox-launcher-macosx-carbon} + ${ecl-swt-macosx-carbon} ${ecl-equinox-launcher-macosx-carbon} ${ecl-core-runtime-compat-registry} management-eclipse-plugin-solaris-gtk-sparc.libs=${management-eclipse-plugin.core-libs} \ - ${ecl-swt-solaris-gtk-sparc} ${ecl-equinox-launcher-solaris-gtk-sparc} - -management-eclipse-plugin.core-libs=${ibm-icu} ${ecl-core-jface} ${ecl-core-jface-databinding} \ - ${ecl-core-commands} ${ecl-core-contenttype} ${ecl-core-databinding} ${ecl-core-expressions} \ - ${ecl-core-jobs} ${ecl-core-runtime} ${ecl-core-runtime-compat-registry} ${ecl-equinox-app} \ - ${ecl-equinox-common} ${ecl-equinox-launcher} ${ecl-equinox-prefs} ${ecl-equinox-registry} \ - ${ecl-help} ${ecl-osgi} ${ecl-swt} ${ecl-ui} ${ecl-ui-forms} ${ecl-ui-workbench} ${apache-commons-codec} - -management-eclipse-plugin.platform-libs=${ecl-equinox-launcher-win32-win32-x86} \ - ${ecl-equinox-launcher-linux-gtk-x86} ${ecl-equinox-launcher-macosx-carbon} \ - ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} ${ecl-swt-macosx-carbon} \ - ${ecl-swt-linux-gtk-x86_64} ${ecl-equinox-launcher-linux-gtk-x86_64} \ - ${ecl-swt-solaris-gtk-sparc} ${ecl-equinox-launcher-solaris-gtk-sparc} - -management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${management-eclipse-plugin.platform-libs} + ${ecl-swt-solaris-gtk-sparc} ${ecl-equinox-launcher-solaris-gtk-sparc} ${ecl-core-runtime-compat-registry} common.test.libs=${test.libs} broker.test.libs=${test.libs} @@ -139,5 +136,5 @@ systests.libs=${test.libs} broker-plugins.test.libs=${test.libs} broker-plugins-experimental-info.test.libs=${test.libs} ${servlet-api} ${jetty} ${jetty-util} ${jetty-servlet-tester} -management-eclipse-plugin.test.libs=${systests.libs} +management-eclipse-plugin.test.libs=${test.libs} management-common.test.libs=${test.libs} diff --git a/java/module.xml b/java/module.xml index c7819febf4..050382ee80 100644 --- a/java/module.xml +++ b/java/module.xml @@ -281,7 +281,8 @@ <javac target="${java.target}" source="${java.source}" destdir="${module.test.classes}" debug="on" deprecation="${javac.deprecation}" - srcdir="${module.test.src}"> + srcdir="${module.test.src}" + includeantruntime="false"> <classpath refid="module.test.path"/> </javac> |