summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2014-01-21 11:28:54 (EST)
committerGerrit Code Review @ Eclipse.org2014-01-28 11:10:42 (EST)
commitfedcffa9658e56b549d079cbfd6be821aace83c8 (patch)
tree19b0e97970c7590c43ef3db79ad988d1b0d44c85
parent4ef89d4b16a3562d88191be48b872d3eabf0da9e (diff)
downloadeclipse.platform.text-fedcffa9658e56b549d079cbfd6be821aace83c8.zip
eclipse.platform.text-fedcffa9658e56b549d079cbfd6be821aace83c8.tar.gz
eclipse.platform.text-fedcffa9658e56b549d079cbfd6be821aace83c8.tar.bz2
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=419531 Signed-off-by: Mickael Istria <mistria@redhat.com> Change-Id: I1316e72a4d058735c4fff892dfe985fed0f7b31e
-rw-r--r--org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.core.filebuffers.tests/build.properties7
-rw-r--r--org.eclipse.jface.text.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jface.text.tests/build.properties7
-rw-r--r--org.eclipse.search.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.search.tests/build.properties6
-rw-r--r--org.eclipse.text.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.text.tests/build.properties6
-rw-r--r--org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.ui.editors.tests/build.properties7
-rw-r--r--org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.examples.javaeditor/build.properties15
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/build.properties7
14 files changed, 28 insertions, 35 deletions
diff --git a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
index 56d5ca9..78cc321 100644
--- a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.core.filebuffers.tests;singleton:=true
Bundle-Version: 3.9.0.qualifier
-Bundle-ClassPath: filebufferstests.jar
Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
diff --git a/org.eclipse.core.filebuffers.tests/build.properties b/org.eclipse.core.filebuffers.tests/build.properties
index 583c083..7b1052d 100644
--- a/org.eclipse.core.filebuffers.tests/build.properties
+++ b/org.eclipse.core.filebuffers.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,15 +7,16 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
bin.includes = plugin.properties,\
test.xml,\
about.html,\
testResources/,\
- *.jar,\
+ .,\
META-INF/,\
plugin.xml
src.includes = about.html
-source.filebufferstests.jar = src/
+source.. = src/
diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
index 827d7ee..9af6974 100644
--- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.jface.text.tests
Bundle-Version: 3.10.100.qualifier
-Bundle-ClassPath: jfacetexttests.jar
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package:
diff --git a/org.eclipse.jface.text.tests/build.properties b/org.eclipse.jface.text.tests/build.properties
index 6cf8a32..39b98a4 100644
--- a/org.eclipse.jface.text.tests/build.properties
+++ b/org.eclipse.jface.text.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
bin.includes = plugin.properties,\
test.xml,\
about.html,\
- *.jar,\
+ .,\
META-INF/
src.includes = about.html
-source.jfacetexttests.jar = src/
+source.. = src/
diff --git a/org.eclipse.search.tests/META-INF/MANIFEST.MF b/org.eclipse.search.tests/META-INF/MANIFEST.MF
index 8648f45..79b86c0 100644
--- a/org.eclipse.search.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.search.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.search.tests
Bundle-Version: 3.8.200.qualifier
-Bundle-ClassPath: searchtests.jar
Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.search.tests/build.properties b/org.eclipse.search.tests/build.properties
index 7de5c06..536e2dc 100644
--- a/org.eclipse.search.tests/build.properties
+++ b/org.eclipse.search.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
+# Copyright (c) 2005, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,13 +7,13 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
src.includes = about.html
-source.searchtests.jar = src/
+source.. = src/
bin.includes = plugin.properties,\
.,\
testresources/,\
- *.jar,\
META-INF/,\
about.html,\
test.xml
diff --git a/org.eclipse.text.tests/META-INF/MANIFEST.MF b/org.eclipse.text.tests/META-INF/MANIFEST.MF
index 22726fa..ab4664c 100644
--- a/org.eclipse.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.text.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.text.tests
Bundle-Version: 3.10.0.qualifier
-Bundle-ClassPath: texttests.jar
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package:
diff --git a/org.eclipse.text.tests/build.properties b/org.eclipse.text.tests/build.properties
index 02d5ab9..075a346 100644
--- a/org.eclipse.text.tests/build.properties
+++ b/org.eclipse.text.tests/build.properties
@@ -11,10 +11,10 @@
bin.includes = plugin.properties,\
test.xml,\
about.html,\
- *.jar,\
+ .,\
META-INF/
src.includes = about.html
-source.texttests.jar = projection/,\
- src/
+source.. = projection/,\
+ src/
diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
index 4fc23ab..fabb189 100644
--- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.editors.tests
Bundle-Version: 3.8.200.qualifier
-Bundle-ClassPath: editorstests.jar
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.ui.editors.tests
diff --git a/org.eclipse.ui.editors.tests/build.properties b/org.eclipse.ui.editors.tests/build.properties
index 281cf88..39b98a4 100644
--- a/org.eclipse.ui.editors.tests/build.properties
+++ b/org.eclipse.ui.editors.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
bin.includes = plugin.properties,\
test.xml,\
about.html,\
- *.jar,\
+ .,\
META-INF/
src.includes = about.html
-source.editorstests.jar = src/
+source.. = src/
diff --git a/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF b/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF
index a1847d1..3b0fab8 100644
--- a/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF
@@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.examples.javaeditor; singleton:=true
Bundle-Version: 3.1.400.qualifier
-Bundle-ClassPath: javaeditorexample.jar,
- templateeditorexample.jar
Bundle-Activator: org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.ui.examples.javaeditor/build.properties b/org.eclipse.ui.examples.javaeditor/build.properties
index 8fd9b66..41b71ad 100644
--- a/org.eclipse.ui.examples.javaeditor/build.properties
+++ b/org.eclipse.ui.examples.javaeditor/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,12 +7,12 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
-source.javaeditorexample.jar = Eclipse Java Editor Example/
-source.templateeditorexample.jar = Template Editor Example/
+source.. = Eclipse Java Editor Example/,\
+ Template Editor Example/
-output.javaeditorexample.jar = javaEditorBin/
-output.templateeditorexample.jar = templateEditorBin/
+output.. = bin/
bin.includes = doc-html/,\
icons/,\
@@ -20,10 +20,7 @@ bin.includes = doc-html/,\
about.html,\
plugin.properties,\
plugin.xml,\
- *.jar,\
+ .,\
META-INF/
-jars.compile.order = javaeditorexample.jar,\
- templateeditorexample.jar
-
src.includes = about.html
diff --git a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
index 6597d4c..ea7c6de 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor.tests
Bundle-Version: 3.10.0.qualifier
-Bundle-ClassPath: workbenchtexteditortests.jar
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package:
diff --git a/org.eclipse.ui.workbench.texteditor.tests/build.properties b/org.eclipse.ui.workbench.texteditor.tests/build.properties
index a16ad76..144ff18 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/build.properties
+++ b/org.eclipse.ui.workbench.texteditor.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2014 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,13 +7,14 @@
#
# Contributors:
# IBM Corporation - initial API and implementation
+# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
bin.includes = plugin.properties,\
test.xml,\
about.html,\
- *.jar,\
+ .,\
META-INF/
src.includes = about.html
-source.workbenchtexteditortests.jar = src/
+source.. = src/