diff options
| author | Remy Suen | 2011-10-12 12:23:21 +0000 |
|---|---|---|
| committer | Remy Suen | 2011-10-12 12:23:21 +0000 |
| commit | c4ae9ebb391a9e6ff25907b0434893ef114b2c68 (patch) | |
| tree | 4d922a1fbce9b2ef68f2d2e1c0cbe2252aed17d0 | |
| parent | 4afaba6f5f7033d14bfa42113eb7d132312b2644 (diff) | |
| download | eclipse.platform.ui-c4ae9ebb391a9e6ff25907b0434893ef114b2c68.tar.gz eclipse.platform.ui-c4ae9ebb391a9e6ff25907b0434893ef114b2c68.tar.xz eclipse.platform.ui-c4ae9ebb391a9e6ff25907b0434893ef114b2c68.zip | |
Bug 356044 extra packages created when "import" from target as sourcev20111012-1223
folders
The build.properties file of numerous projects were including
additional files and folders in the source build definitions
which caused duplicates of Java files to be created when the
bundle was imported through PDE. Pruning the build.properties of
these extra entries resolves this problem.
15 files changed, 23 insertions, 75 deletions
diff --git a/bundles/org.eclipse.e4.core.commands/build.properties b/bundles/org.eclipse.e4.core.commands/build.properties index 94036ea49dd..1775f15d7c1 100644 --- a/bundles/org.eclipse.e4.core.commands/build.properties +++ b/bundles/org.eclipse.e4.core.commands/build.properties @@ -5,7 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties source.. = src/ -src.includes = src/,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.emf.xpath/build.properties b/bundles/org.eclipse.e4.emf.xpath/build.properties index dcb59d1bba6..5d865fb7fe4 100644 --- a/bundles/org.eclipse.e4.emf.xpath/build.properties +++ b/bundles/org.eclipse.e4.emf.xpath/build.properties @@ -4,8 +4,5 @@ bin.includes = META-INF/,\ .,\ about.html,\ OSGI-INF/ -src.includes = src/,\ - about_files/,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = about_files/,\ + about.html diff --git a/bundles/org.eclipse.e4.ui.bindings/build.properties b/bundles/org.eclipse.e4.ui.bindings/build.properties index 3c1dea9ecb7..1bdf1642e63 100644 --- a/bundles/org.eclipse.e4.ui.bindings/build.properties +++ b/bundles/org.eclipse.e4.ui.bindings/build.properties @@ -5,8 +5,4 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html source.. = src/ -src.includes = src/,\ - plugin.properties,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.css.core/build.properties b/bundles/org.eclipse.e4.ui.css.core/build.properties index 80711a2dd0c..fde2f3aa10e 100644 --- a/bundles/org.eclipse.e4.ui.css.core/build.properties +++ b/bundles/org.eclipse.e4.ui.css.core/build.properties @@ -14,10 +14,6 @@ bin.includes = META-INF/,\ plugin.xml,\ about.html,\ plugin.properties -src.includes = src/,\ - schema/,\ - plugin.xml,\ - plugin.properties,\ +src.includes = schema/,\ apache_about_files/,\ - about.html,\ - META-INF/ + about.html diff --git a/bundles/org.eclipse.e4.ui.css.swt/build.properties b/bundles/org.eclipse.e4.ui.css.swt/build.properties index 05373f7383b..cb0cb8383dd 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/build.properties +++ b/bundles/org.eclipse.e4.ui.css.swt/build.properties @@ -14,8 +14,5 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ about.html -src.includes = src/,\ - schema/,\ - plugin.xml,\ - about.html,\ - META-INF/ +src.includes = schema/,\ + about.html diff --git a/bundles/org.eclipse.e4.ui.di/build.properties b/bundles/org.eclipse.e4.ui.di/build.properties index a6614e622c4..c4b755d17fd 100644 --- a/bundles/org.eclipse.e4.ui.di/build.properties +++ b/bundles/org.eclipse.e4.ui.di/build.properties @@ -5,8 +5,4 @@ bin.includes = META-INF/,\ plugin.properties,\ OSGI-INF/,\ about.html -src.includes = src/,\ - plugin.properties,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.model.workbench/build.properties b/bundles/org.eclipse.e4.ui.model.workbench/build.properties index 28297444eac..3918d39e8ea 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/build.properties +++ b/bundles/org.eclipse.e4.ui.model.workbench/build.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2008 IBM Corporation and others. +# Copyright (c) 2008, 2011 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 @@ -18,9 +18,5 @@ bin.includes = .,\ jars.compile.order = . source.. = src/ output.. = bin/ -src.includes = src/,\ - plugin.xml,\ - plugin.properties,\ - model/,\ - about.html,\ - META-INF/ +src.includes = model/,\ + about.html diff --git a/bundles/org.eclipse.e4.ui.services/build.properties b/bundles/org.eclipse.e4.ui.services/build.properties index 3c1dea9ecb7..1bdf1642e63 100644 --- a/bundles/org.eclipse.e4.ui.services/build.properties +++ b/bundles/org.eclipse.e4.ui.services/build.properties @@ -5,8 +5,4 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html source.. = src/ -src.includes = src/,\ - plugin.properties,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.widgets/build.properties b/bundles/org.eclipse.e4.ui.widgets/build.properties index 72833010748..cdd2db7f1f5 100644 --- a/bundles/org.eclipse.e4.ui.widgets/build.properties +++ b/bundles/org.eclipse.e4.ui.widgets/build.properties @@ -4,8 +4,4 @@ bin.includes = META-INF/,\ .,\ about.html,\ plugin.properties -src.includes = src/,\ - readme.txt,\ - plugin.properties,\ - about.html,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/build.properties b/bundles/org.eclipse.e4.ui.workbench.addons.swt/build.properties index c791ddb1525..a57a6beeabf 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/build.properties @@ -6,9 +6,5 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ icons/ -src.includes = src/,\ - plugin.xml,\ - plugin.properties,\ - icons/,\ - about.html,\ - META-INF/ +src.includes = icons/,\ + about.html diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/build.properties b/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/build.properties index faefe61ae98..5ddc152886e 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ about.html,\ fragment-cocoa.properties,\ . +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/build.properties b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/build.properties index fdf5e780016..cdd2db7f1f5 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/build.properties @@ -4,7 +4,4 @@ bin.includes = META-INF/,\ .,\ about.html,\ plugin.properties -src.includes = src/,\ - plugin.properties,\ - about.html,\ - META-INF/ +src.includes = about.html diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/build.properties b/bundles/org.eclipse.e4.ui.workbench.swt/build.properties index 36706320d73..f8d972958cd 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench.swt/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010 IBM Corporation and others. +# Copyright (c) 2010, 2011 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 @@ -18,10 +18,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties source.. = src/ -src.includes = src/,\ - plugin.xml,\ - plugin.properties,\ - icons/,\ - about.html,\ - OSGI-INF/,\ - META-INF/ +src.includes = icons/,\ + about.html diff --git a/bundles/org.eclipse.e4.ui.workbench/build.properties b/bundles/org.eclipse.e4.ui.workbench/build.properties index dfee831a096..aa4a73d5140 100644 --- a/bundles/org.eclipse.e4.ui.workbench/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench/build.properties @@ -7,10 +7,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = schema/,\ - src/,\ - plugin.xml,\ - plugin.properties,\ - about.html,\ - OSGI-INF/,\ - META-INF/ + about.html source.. = src/ diff --git a/bundles/org.eclipse.e4.ui.workbench3/build.properties b/bundles/org.eclipse.e4.ui.workbench3/build.properties index f8e124cce1e..2b112c46131 100644 --- a/bundles/org.eclipse.e4.ui.workbench3/build.properties +++ b/bundles/org.eclipse.e4.ui.workbench3/build.properties @@ -4,7 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.properties,\ about.html -src.includes = src/,\ - plugin.properties,\ - about.html,\ - META-INF/ +src.includes = about.html |