Bug 495617: Mars: Honor External Tools Configurations "Classpath | Ant Home" and "JRE | Separate JRE" (work with JavaSE-1.6)
- added required dependency for loggers.jar in Tycho build
- added sources of pre-built JARs to source bundle
Change-Id: Ib614cb3ebfb9d66787bc61a7eb7e55804728c54e
diff --git a/ant/org.eclipse.ant.launching/build.properties b/ant/org.eclipse.ant.launching/build.properties
index 7c78c2f..e086f8a 100644
--- a/ant/org.eclipse.ant.launching/build.properties
+++ b/ant/org.eclipse.ant.launching/build.properties
@@ -21,16 +21,17 @@
jars.compile.order = .,\
lib/loggers.jar
-# antdebug.jar and remote.jar is compiled locally using 1.6 , refer Bug 495617
+# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617:
# lib/antdebug.jar,\
# lib/remote.jar
source.lib/loggers.jar = loggers/
output.lib/loggers.jar = loggers_bin/
+extra.lib/loggers.jar = lib/antdebug.jar
#source.lib/antdebug.jar = common/
#output.lib/antdebug.jar = common_bin/
#source.lib/remote.jar = remote/
#output.lib/remote.jar = remote_bin/
-src.includes = about.html
-src.excludes = common/,\
- remote/
+src.includes = about.html,\
+ remote/,\
+ common/
javacWarnings..=-unavoidableGenericProblems
diff --git a/ant/org.eclipse.ant.ui/build.properties b/ant/org.eclipse.ant.ui/build.properties
index 1b7fab9..188b32f 100644
--- a/ant/org.eclipse.ant.ui/build.properties
+++ b/ant/org.eclipse.ant.ui/build.properties
@@ -13,12 +13,12 @@
Ant Editor/
source.lib/antrunner.jar = Ant Runner Support/
output.lib/antrunner.jar = ant_runner_support_bin/
-# Compiled with 1.6 locally, refer Bug 495617
+# Compiled with 1.6 locally, see bug 495617:
#source.lib/remoteAnt.jar = Remote Ant Support/
#output.lib/remoteAnt.jar = remote_support_bin/
src.includes = about.html,\
- about_files/
-src.excludes = Remote Ant Support/
+ about_files/,\
+ Remote Ant Support/
bin.includes = icons/,\
plugin.properties,\
