diff options
15 files changed, 27 insertions, 33 deletions
diff --git a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF index 2e65599bd6..16c0fd2a5e 100644 --- a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.tests;singleton:=true Bundle-Version: 3.3.300.qualifier -Bundle-ClassPath: . Bundle-Activator: org.eclipse.jdt.apt.pluggable.tests.Apt6TestsPlugin Bundle-Localization: plugin Require-Bundle: org.junit, diff --git a/org.eclipse.jdt.apt.tests/build.properties b/org.eclipse.jdt.apt.tests/build.properties index b49f00a1bf..06c47cf01d 100644 --- a/org.eclipse.jdt.apt.tests/build.properties +++ b/org.eclipse.jdt.apt.tests/build.properties @@ -5,6 +5,8 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################### +source.. = src-bundle/ +output.. = bin/ source.apt.jar = src/ source.aptext.jar = srcext/ output.apt.jar = bin/ @@ -14,6 +16,7 @@ bin.includes = plugin.xml,\ resources/,\ *.jar,\ about.html,\ - plugin.properties + plugin.properties\ + . src.includes = about.html -jars.compile.order = aptext.jar,apt.jar
\ No newline at end of file +jars.compile.order = aptext.jar,apt.jar diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java b/org.eclipse.jdt.apt.tests/src-bundle/org/eclipse/jdt/apt/tests/TestAll.java index fe2dfbcb80..fe2dfbcb80 100644 --- a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java +++ b/org.eclipse.jdt.apt.tests/src-bundle/org/eclipse/jdt/apt/tests/TestAll.java diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF index bf3ad94ee5..25daccebc1 100644 --- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.junit, org.eclipse.jdt.core;bundle-version="3.5.0", org.eclipse.core.resources, org.eclipse.core.runtime -Bundle-ClassPath: compilerapttests.jar Export-Package: org.eclipse.jdt.compiler.apt.tests, org.eclipse.jdt.compiler.apt.tests.annotations, org.eclipse.jdt.compiler.apt.tests.processors.base, diff --git a/org.eclipse.jdt.compiler.apt.tests/build.properties b/org.eclipse.jdt.compiler.apt.tests/build.properties index 9c72f16b00..c5077acec4 100644 --- a/org.eclipse.jdt.compiler.apt.tests/build.properties +++ b/org.eclipse.jdt.compiler.apt.tests/build.properties @@ -8,17 +8,14 @@ # Contributors: # wharley@bea.com - initial API and implementation ############################################################################### +source.. = src/,\ + processors/ +output.. = bin/ bin.includes = about.html,\ plugin.properties,\ test.xml,\ - compilerapttests.jar,\ META-INF/,\ - lib/apttestprocessors.jar,\ - resources/ + resources/,\ + . src.includes = about.html -source.compilerapttests.jar = src/ -jars.compile.order = compilerapttests.jar,\ - lib/apttestprocessors.jar -source.lib/apttestprocessors.jar = processors/ -output.compilerapttests.jar = bin/ compilerArg=-proc:none
\ No newline at end of file diff --git a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF index 6f3de6a3f9..c2d1682b03 100644 --- a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.jdt.core;bundle-version="3.2.2", org.junit, org.eclipse.test.performance, org.eclipse.jdt.core.tests.compiler -Bundle-ClassPath: compilertooltests.jar Export-Package: org.eclipse.jdt.compiler.tool.tests Import-Package: org.eclipse.jdt.internal.compiler.tool Eclipse-BundleShape: dir diff --git a/org.eclipse.jdt.compiler.tool.tests/build.properties b/org.eclipse.jdt.compiler.tool.tests/build.properties index 515fd6542d..072da6f864 100644 --- a/org.eclipse.jdt.compiler.tool.tests/build.properties +++ b/org.eclipse.jdt.compiler.tool.tests/build.properties @@ -12,8 +12,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ test.xml,\ - compilertooltests.jar - + . src.includes = about.html -source.compilertooltests.jar = src/ -output.compilertooltests.jar = bin/ +source.. = src/ +output.. = bin/ diff --git a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF index 07a45627f5..b955429ba9 100644 --- a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.builder; singleton:=true Bundle-Version: 3.8.2.qualifier -Bundle-ClassPath: jdtcoretestsbuilder.jar Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests.builder diff --git a/org.eclipse.jdt.core.tests.builder/build.properties b/org.eclipse.jdt.core.tests.builder/build.properties index a51d207244..73af4c9fa2 100644 --- a/org.eclipse.jdt.core.tests.builder/build.properties +++ b/org.eclipse.jdt.core.tests.builder/build.properties @@ -11,9 +11,9 @@ bin.includes = plugin.xml,\ test.xml,\ about.html,\ - jdtcoretestsbuilder.jar,\ + .,\ META-INF/,\ plugin.properties -source.jdtcoretestsbuilder.jar = src/ -output.jdtcoretestsbuilder.jar = bin/ +source.. = src/ +output.. = bin/ src.includes=about.html diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF index 7d7e36f3b2..414db5a5ca 100644 --- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.compiler;singleton:=true -Bundle-Version: 3.8.3.qualifier +Bundle-Version: 3.9.0.qualifier Bundle-ClassPath: jdtcoretestscompiler.jar Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.core.tests.compiler/build.properties b/org.eclipse.jdt.core.tests.compiler/build.properties index 2f28c5297e..156f8d4905 100644 --- a/org.eclipse.jdt.core.tests.compiler/build.properties +++ b/org.eclipse.jdt.core.tests.compiler/build.properties @@ -10,10 +10,10 @@ ############################################################################### bin.includes = test.xml,\ about.html,\ - jdtcoretestscompiler.jar,\ + .,\ META-INF/,\ plugin.properties,\ workspace/ -source.jdtcoretestscompiler.jar = src/ -output.jdtcoretestscompiler.jar = bin/ +source.. = src/ +output.. = bin/ src.includes = about.html diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF index 773870e5e9..61c4dc1536 100644 --- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.model;singleton:=true -Bundle-Version: 3.8.2.qualifier +Bundle-Version: 3.9.0.qualifier Bundle-ClassPath: jdtcoretestsmodel.jar Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.core.tests.model/build.properties b/org.eclipse.jdt.core.tests.model/build.properties index 06adb5c0a3..e3f2f4f54e 100644 --- a/org.eclipse.jdt.core.tests.model/build.properties +++ b/org.eclipse.jdt.core.tests.model/build.properties @@ -12,10 +12,10 @@ bin.includes = plugin.xml,\ plugin.properties,\ test.xml,\ about.html,\ - jdtcoretestsmodel.jar,\ + .,\ JCL/,\ workspace/,\ META-INF/ src.includes = about.html -source.jdtcoretestsmodel.jar = src/ -output.jdtcoretestsmodel.jar = bin/ +source.. = src/ +output.. = bin/ diff --git a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF index 00d2ef3770..6c63f8f1af 100644 --- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.performance Bundle-Version: 3.8.1.qualifier -Bundle-ClassPath: jdtcoretestsperf.jar Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests.performance, diff --git a/org.eclipse.jdt.core.tests.performance/build.properties b/org.eclipse.jdt.core.tests.performance/build.properties index d962a6cf62..c3cfb24a18 100644 --- a/org.eclipse.jdt.core.tests.performance/build.properties +++ b/org.eclipse.jdt.core.tests.performance/build.properties @@ -10,10 +10,10 @@ ############################################################################### bin.includes = test.xml,\ about.html,\ - jdtcoretestsperf.jar,\ + .,\ local_test.xml,\ META-INF/,\ plugin.properties src.includes = about.html -source.jdtcoretestsperf.jar = src/ -output.jdtcoretestsperf.jar = bin/ +source.. = src/ +output.. = bin/ |