Correct output and source specifications in build.properties

* Remove source entries in projects without source folders * Remove duplicate source entries * Add missing output entries * Fix project classpaths with unseparated bin folders and adapt .gitignore
laeubi · Nov 28, 2023 · 4c418ff · 4c418ff
1 parent d5595f7
commit 4c418ff
Show file tree

Hide file tree

Showing 39 changed files with 62 additions and 32 deletions.
diff --git a/debug/org.eclipse.unittest.ui/build.properties b/debug/org.eclipse.unittest.ui/build.properties
@@ -19,6 +19,7 @@ bin.includes = plugin.xml,\
                META-INF/
 
 source.. = src/
+output.. = bin/
 src.includes = about.html,\
                schema/
 

diff --git a/platform/org.eclipse.platform/build.properties b/platform/org.eclipse.platform/build.properties
@@ -48,6 +48,7 @@ bin.includes = about.html,\
                700E4F39BC05364B.asc
 src.includes = about.html
 source.platform.jar = src-intro/
+output.platform.jar = bin-intro/
 
 # Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
 tycho.pomless.parent = ../../

diff --git a/resources/bundles/org.eclipse.core.resources.spysupport/build.properties b/resources/bundles/org.eclipse.core.resources.spysupport/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+output.. = bin/
 src.includes=about.html
 bin.includes=about.html, META-INF/,.
 qualifier=context
diff --git a/resources/bundles/org.eclipse.core.resources/.classpath b/resources/bundles/org.eclipse.core.resources/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_ant"/>
+	<classpathentry kind="src" output="bin_ant" path="src_ant"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/resources/bundles/org.eclipse.core.resources/.gitignore b/resources/bundles/org.eclipse.core.resources/.gitignore
@@ -1,3 +1,3 @@
 temp.folder
-src_ant_bin
+bin_ant
 ant_tasks
diff --git a/resources/bundles/org.eclipse.core.resources/build.properties b/resources/bundles/org.eclipse.core.resources/build.properties
@@ -11,8 +11,10 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source..=src/
-source.ant_tasks/resources-ant.jar=src_ant/
+source.. = src/
+output.. = bin/
+source.ant_tasks/resources-ant.jar = src_ant/
+output.ant_tasks/resources-ant.jar = bin_ant/
 src.includes = about.html,\
                schema/,\
                natives/

diff --git a/resources/bundles/org.eclipse.core.tools.resources/build.properties b/resources/bundles/org.eclipse.core.tools.resources/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+output.. = bin/
 src.includes=*.html
 bin.includes=plugin.xml,icons/,doc/,*.html,.options, META-INF/,.
 qualifier=context
diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html

diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html

diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html

diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html

diff --git a/resources/tests/org.eclipse.core.tests.resources/build.properties b/resources/tests/org.eclipse.core.tests.resources/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                .,\
                MultipleProjectTestFiles/,\

diff --git a/runtime/bundles/org.eclipse.core.contenttype/build.properties b/runtime/bundles/org.eclipse.core.contenttype/build.properties
@@ -23,4 +23,3 @@ bin.includes = META-INF/,\
                OSGI-INF/
 src.includes = about.html,\
                schema/
-source.. = src/
diff --git a/runtime/bundles/org.eclipse.core.expressions/build.properties b/runtime/bundles/org.eclipse.core.expressions/build.properties
@@ -20,3 +20,4 @@ bin.includes = plugin.xml,\
 src.includes = about.html,\
                schema/
 source.. = src/
+output.. = bin/
diff --git a/runtime/bundles/org.eclipse.core.runtime/build.properties b/runtime/bundles/org.eclipse.core.runtime/build.properties
@@ -18,5 +18,6 @@ bin.includes = .options,\
                .,\
                META-INF/
 source.. = src/
+output.. = bin/
 src.includes = about.html,\
                schema/
diff --git a/runtime/bundles/org.eclipse.core.tools/build.properties b/runtime/bundles/org.eclipse.core.tools/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+output.. = bin/
 src.includes=*.html
 bin.includes = plugin.xml,\
                icons/,\

diff --git a/runtime/tests/org.eclipse.core.contenttype.tests/build.properties b/runtime/tests/org.eclipse.core.contenttype.tests/build.properties
@@ -12,6 +12,7 @@
 #     Mickael Istria (Red Hat Inc.) - initial API and implementation
 ###############################################################################
 source.. = src/
+output.. = bin/
 bin.includes = test.xml,\
                about.html,\
                plugin.properties,\

diff --git a/runtime/tests/org.eclipse.core.expressions.tests/build.properties b/runtime/tests/org.eclipse.core.expressions.tests/build.properties
@@ -14,6 +14,7 @@
 #     Lars Vogel <[email protected]> - Bug 474642
 ###############################################################################
 source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                test.xml,\
                about.html,\

diff --git a/runtime/tests/org.eclipse.core.tests.harness/build.properties b/runtime/tests/org.eclipse.core.tests.harness/build.properties
@@ -14,6 +14,7 @@
 #     Lars Vogel <[email protected]> - Bug 474642
 ###############################################################################
 source.. = src/
+output.. = bin/
 bin.includes = .,\
                about.html,\
                META-INF/

diff --git a/runtime/tests/org.eclipse.core.tests.runtime/build.properties b/runtime/tests/org.eclipse.core.tests.runtime/build.properties
@@ -14,6 +14,7 @@
 #     Lars Vogel <[email protected]> - Bug 474642
 ###############################################################################
 source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                .,\
                Plugin_Testing/,\

diff --git a/team/bundles/org.eclipse.core.net.linux/build.properties b/team/bundles/org.eclipse.core.net.linux/build.properties
@@ -17,3 +17,4 @@ bin.includes = fragment.properties,\
                about.html
 src.includes = about.html
 source.. = src/
+output.. = bin/
diff --git a/team/bundles/org.eclipse.core.net.win32/build.properties b/team/bundles/org.eclipse.core.net.win32/build.properties
@@ -17,3 +17,4 @@ bin.includes = fragment.properties,\
                META-INF/
 src.includes = about.html
 source.. = src/
+output.. = bin/
diff --git a/team/bundles/org.eclipse.team.core/build.properties b/team/bundles/org.eclipse.team.core/build.properties
@@ -18,5 +18,6 @@ bin.includes = about.html,\
                .,\
                .options,\
                META-INF/
-source..=src/
-src.includes=about.html,schema/
+source.. = src/
+output.. = bin/
+src.includes = about.html,schema/
diff --git a/team/bundles/org.eclipse.team.ui/build.properties b/team/bundles/org.eclipse.team.ui/build.properties
@@ -19,5 +19,6 @@ bin.includes = about.html,\
                .,\
                META-INF/,\
                .options
-source..=src/
-src.includes=about.html,schema/
+source.. = src/
+output.. = bin/
+src.includes = about.html,schema/
diff --git a/team/examples/org.eclipse.compare.examples.xml/.classpath b/team/examples/org.eclipse.compare.examples.xml/.classpath
@@ -3,6 +3,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests"/>
+	<classpathentry kind="src" output="bin_tests" path="tests">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/team/examples/org.eclipse.compare.examples.xml/.gitignore b/team/examples/org.eclipse.compare.examples.xml/.gitignore
@@ -0,0 +1 @@
+bin_tests/
diff --git a/team/examples/org.eclipse.compare.examples.xml/build.properties b/team/examples/org.eclipse.compare.examples.xml/build.properties
@@ -13,7 +13,7 @@
 #     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
 source.. = src/
-
+output.. = bin/
 bin.includes = doc-html/,\
                about.html,\
                plugin.properties,\

diff --git a/team/examples/org.eclipse.compare.examples/build.properties b/team/examples/org.eclipse.compare.examples/build.properties
@@ -13,7 +13,7 @@
 #     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
 source.. = src/
-
+output.. = bin/
 bin.includes = doc-html/,\
                about.html,\
                plugin.properties,\

diff --git a/team/examples/org.eclipse.team.examples.filesystem/build.properties b/team/examples/org.eclipse.team.examples.filesystem/build.properties
@@ -13,8 +13,9 @@
 #     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
 # Eclipse build contribution
-source..=src/
-src.includes=about.html
+source.. = src/
+output.. = bin/
+src.includes = about.html
 bin.includes = about.html,\
                icons/,\
                doc-html/,\

diff --git a/team/tests/org.eclipse.compare.tests/build.properties b/team/tests/org.eclipse.compare.tests/build.properties
@@ -22,7 +22,8 @@ bin.includes = plugin.properties,\
 
 src.includes = about.html
 
-source..= src/
+source.. = src/
+output.. = bin/
 
 # Maven/Tycho pom model adjustments
 pom.model.property.testClass = org.eclipse.compare.tests.AllCompareTests

diff --git a/team/tests/org.eclipse.team.tests.core/build.properties b/team/tests/org.eclipse.team.tests.core/build.properties
@@ -12,7 +12,8 @@
 #     IBM Corporation - initial API and implementation
 #     Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
 ###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
 bin.includes = about.html,\
                plugin.xml,\
                .,\

diff --git a/ua/org.eclipse.help.base/build.properties b/ua/org.eclipse.help.base/build.properties
@@ -11,10 +11,10 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source..=src/,\
-         src_demo/
-src.includes=schema/,about.html
+source.. = src/,\
+           src_demo/
 output.. = bin/
+src.includes = schema/,about.html
 bin.includes = doc/,\
                plugin.xml,\
                preferences.ini,\

diff --git a/ua/org.eclipse.help.ui/build.properties b/ua/org.eclipse.help.ui/build.properties
@@ -11,8 +11,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source..=src/
-src.includes=schema/,about.html
+source.. = src/
+output.. = bin/
+src.includes = schema/,about.html
 bin.includes = icons/,\
                plugin.xml,\
                .,\

diff --git a/ua/org.eclipse.help/build.properties b/ua/org.eclipse.help/build.properties
@@ -11,8 +11,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source..=src/
-src.includes=schema/,about.html
+source.. = src/
+output.. = bin/
+src.includes = schema/,about.html
 bin.includes = livehelp.js,\
                plugin.xml,\
                preferences.ini,\

diff --git a/ua/org.eclipse.ui.cheatsheets/build.properties b/ua/org.eclipse.ui.cheatsheets/build.properties
@@ -18,5 +18,6 @@ bin.includes = plugin.properties,\
                about.html,\
                META-INF/
 source.. = src/
+output.. = bin/
 src.includes = schema/,\
                about.html
diff --git a/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties b/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

diff --git a/ua/org.eclipse.ui.intro.solstice.examples/build.properties b/ua/org.eclipse.ui.intro.solstice.examples/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

diff --git a/ua/org.eclipse.ui.intro/build.properties b/ua/org.eclipse.ui.intro/build.properties
@@ -12,6 +12,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                .,\
                icons/,\

diff --git a/update/org.eclipse.update.configurator/build.properties b/update/org.eclipse.update.configurator/build.properties
@@ -19,6 +19,7 @@ bin.includes = .options,\
                OSGI-INF/
 src.includes = about.html
 source.. = src/
+output.. = bin/
 
 # Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
 tycho.pomless.parent = ../../