Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2004-05-24 17:18:38 +0000
committerDoug Schaefer2004-05-24 17:18:38 +0000
commitde0397f03eb3dcce3f38379369831f2b181d6925 (patch)
tree9a00248d4041061c27fe7471bd50e095fec0a441
parente2e671d784e352fbf6e0b6b3b3aa59c232e9d6c6 (diff)
downloadorg.eclipse.cdt-de0397f03eb3dcce3f38379369831f2b181d6925.tar.gz
org.eclipse.cdt-de0397f03eb3dcce3f38379369831f2b181d6925.tar.xz
org.eclipse.cdt-de0397f03eb3dcce3f38379369831f2b181d6925.zip
Cleaned up the build.properties files to ensure the right things end up in the binary and source builds.
-rw-r--r--build/org.eclipse.cdt.make.core/build.properties9
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/build.properties1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/build.properties2
-rw-r--r--core/org.eclipse.cdt.core.aix/build.properties4
-rw-r--r--core/org.eclipse.cdt.core.linux/build.properties6
-rw-r--r--core/org.eclipse.cdt.core.qnx/build.properties6
-rw-r--r--core/org.eclipse.cdt.core.solaris/build.properties6
-rw-r--r--core/org.eclipse.cdt.core.tests/build.properties6
-rw-r--r--core/org.eclipse.cdt.core.win32/build.properties6
-rw-r--r--core/org.eclipse.cdt.core/build.properties5
-rw-r--r--core/org.eclipse.cdt.ui.tests/build.properties8
-rw-r--r--core/org.eclipse.cdt.ui/build.properties5
-rw-r--r--debug/org.eclipse.cdt.debug.core/build.properties4
-rw-r--r--debug/org.eclipse.cdt.debug.mi.core/build.properties11
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/build.properties4
-rw-r--r--debug/org.eclipse.cdt.debug.ui.tests/build.properties3
-rw-r--r--debug/org.eclipse.cdt.debug.ui/build.properties4
-rw-r--r--launch/org.eclipse.cdt.launch/build.properties4
-rw-r--r--releng/org.eclipse.cdt-feature/build.properties5
-rw-r--r--releng/org.eclipse.cdt/build.properties26
20 files changed, 36 insertions, 89 deletions
diff --git a/build/org.eclipse.cdt.make.core/build.properties b/build/org.eclipse.cdt.make.core/build.properties
index b092c5dc2ac..2352ec30fd8 100644
--- a/build/org.eclipse.cdt.make.core/build.properties
+++ b/build/org.eclipse.cdt.make.core/build.properties
@@ -3,10 +3,7 @@ bin.includes = plugin.xml,\
cdtmakecore.jar,\
*.html,\
plugin.properties,\
- builtin/,\
- .options,\
- schema/
-src.includes = builtin/,\
- src/,\
- schema/
+ builtin/
+src.includes = schema/,\
+ .options
source.cdtmakecore.jar = src/
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
new file mode 100644
index 00000000000..399332917b7
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
@@ -0,0 +1 @@
+bin.includes = plugin.xml
diff --git a/build/org.eclipse.cdt.managedbuilder.core/build.properties b/build/org.eclipse.cdt.managedbuilder.core/build.properties
index 9f95adad610..e7e860a497b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/build.properties
@@ -1,6 +1,6 @@
bin.includes = plugin.xml,\
plugin.properties,\
about.html,\
- schema/,\
mngbuildcore.jar
source.mngbuildcore.jar = src/
+src.includes = schema/
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index cd23d6f7e18..7b45e92806b 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -1,4 +1,6 @@
source.cdtaix.jar = src/
bin.includes = fragment.xml,\
*.jar,\
- cdtaix.jar
+ cdtaix.jar,\
+ fragment.properties
+src.includes = library/
diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties
index 6e10a326c55..d04ae142e2f 100644
--- a/core/org.eclipse.cdt.core.linux/build.properties
+++ b/core/org.eclipse.cdt.core.linux/build.properties
@@ -3,8 +3,6 @@ bin.includes = fragment.xml,\
about.html,\
os/,\
cdt_linux.jar
-src.includes = fragment.xml,\
- fragment.properties,\
- about.html,\
- os/
+src.includes = about.html,\
+ library/
source.cdt_linux.jar = src/
diff --git a/core/org.eclipse.cdt.core.qnx/build.properties b/core/org.eclipse.cdt.core.qnx/build.properties
index ef4622fb432..5cd7cfcdef7 100644
--- a/core/org.eclipse.cdt.core.qnx/build.properties
+++ b/core/org.eclipse.cdt.core.qnx/build.properties
@@ -4,7 +4,5 @@ bin.includes = fragment.xml,\
os/,\
cdt_qnx.jar
source.cdt_qnx.jar = src/
-src.includes = fragment.xml,\
- fragment.properties,\
- about.html,\
- os/
+src.includes = about.html,\
+ library/
diff --git a/core/org.eclipse.cdt.core.solaris/build.properties b/core/org.eclipse.cdt.core.solaris/build.properties
index 3c308d2f2d2..fd2b62b1870 100644
--- a/core/org.eclipse.cdt.core.solaris/build.properties
+++ b/core/org.eclipse.cdt.core.solaris/build.properties
@@ -3,8 +3,6 @@ bin.includes = fragment.xml,\
about.html,\
os/,\
cdt_solaris.jar
-src.includes = fragment.xml,\
- fragment.properties,\
- about.html,\
- os/
+src.includes = about.html,\
+ library/
source.cdt_solaris.jar = src/
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index 74abeddb207..8ce427f2b5b 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -4,11 +4,7 @@ bin.includes = plugin.xml,\
cdtcoretests.jar,\
test.xml,\
resources/
-src.includes = plugin.xml,\
- about.html,\
- plugin.properties,\
- test.xml,\
- resources/
+src.includes = plugin.properties
output.cdtcoretests.jar = bin/
about.html =
source.cdtcoretests.jar = build/,\
diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties
index 776fc95bb2e..7383b56b49f 100644
--- a/core/org.eclipse.cdt.core.win32/build.properties
+++ b/core/org.eclipse.cdt.core.win32/build.properties
@@ -3,8 +3,6 @@ bin.includes = fragment.xml,\
about.html,\
os/,\
cdt_win32.jar
-src.includes = fragment.xml,\
- fragment.properties,\
- about.html,\
- os/
+src.includes = about.html,\
+ library/
source.cdt_win32.jar = src/
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 368de8ff09a..6cef08186e5 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -3,11 +3,12 @@ bin.includes = plugin.xml,\
about.html,\
cdtparser.jar,\
cdtcore.jar,\
- .options
+ template/
jars.compile.order = cdtparser.jar,\
cdtcore.jar
src.includes = schema/,\
- doc/
+ doc/,\
+ .options
javadoc.packages = org.eclipse.cdt.core.*,\
org.eclipse.cdt.core.index.*,\
org.eclipse.cdt.core.model.*,\
diff --git a/core/org.eclipse.cdt.ui.tests/build.properties b/core/org.eclipse.cdt.ui.tests/build.properties
index 66865c3199e..19ceedb71da 100644
--- a/core/org.eclipse.cdt.ui.tests/build.properties
+++ b/core/org.eclipse.cdt.ui.tests/build.properties
@@ -5,9 +5,7 @@ bin.includes = plugin.xml,\
about.html,\
plugin.properties,\
test.xml,\
- cdtuitests.jar
-src.includes = plugin.xml,\
- about.html,\
- plugin.properties,\
- test.xml
+ cdtuitests.jar,\
+ resources/
+src.includes = plugin.properties
about.html =
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index e88f21f4a74..4ec95cfad3d 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -9,10 +9,7 @@ source.cdtui.jar = src/,\
browser/,\
refactor/
src.includes = about.html,\
- plugin.xml,\
- about.html,\
- icons/,\
- plugin.properties
+ schema/
javadoc.packages = org.eclipse.cdt.ui.*,\
org.eclipse.cdt.ui.wizards.*,\
org.eclipse.cdt.ui.wizards.conversion.*
diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index 682500c6336..a047bc4c345 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -1,11 +1,11 @@
bin.includes = plugin.xml,\
plugin.properties,\
about.html,\
- cdtdebugcore.jar,\
- schema/
+ cdtdebugcore.jar
source.cdtdebugcore.jar = src,\
schema
javadoc.packages = org.eclipse.cdt.debug.core.*,\
org.eclipse.cdt.debug.core.cdi.*,\
org.eclipse.cdt.debug.core.cdi.event.*,\
org.eclipse.cdt.debug.core.cdi.model.*
+src.includes = schema/
diff --git a/debug/org.eclipse.cdt.debug.mi.core/build.properties b/debug/org.eclipse.cdt.debug.mi.core/build.properties
index 10273e99e1a..421d7ab0b9d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/build.properties
@@ -2,16 +2,7 @@ bin.includes = plugin.xml,\
plugin.properties,\
about.html,\
cdtmicore.jar
-src.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- src/,\
- mi/,\
- cdi/,\
- design.txt,\
- build.properties,\
- ChangeLog,\
- .options
+src.includes = .options
source.cdtmicore.jar = src/,\
cdi/,\
mi/
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/build.properties b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
index 86e748287d4..43b8350f68b 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
@@ -3,8 +3,4 @@ bin.includes = plugin.xml,\
about.html,\
icons/,\
cdtmiui.jar
-src.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- icons/
source.cdtmiui.jar = src/
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/build.properties b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
index 2e02fcb8b3a..39b00171e83 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
@@ -5,6 +5,3 @@ bin.includes = about.html,\
resources/,\
cdtdebuguitests.jar,\
test.xml
-src.includes = about.html,\
- plugin.xml,\
- test.xml
diff --git a/debug/org.eclipse.cdt.debug.ui/build.properties b/debug/org.eclipse.cdt.debug.ui/build.properties
index 566017b98c1..e7c2142fa89 100644
--- a/debug/org.eclipse.cdt.debug.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui/build.properties
@@ -3,10 +3,6 @@ bin.includes = plugin.xml,\
about.html,\
icons/,\
cdtdebugui.jar
-src.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- icons/
javadoc.packages = org.eclipse.cdt.debug.ui.*,\
org.eclipse.cdt.debug.ui.sourcelookup.*
source.cdtdebugui.jar = src/
diff --git a/launch/org.eclipse.cdt.launch/build.properties b/launch/org.eclipse.cdt.launch/build.properties
index 39635cca9f4..6e2eb0f9220 100644
--- a/launch/org.eclipse.cdt.launch/build.properties
+++ b/launch/org.eclipse.cdt.launch/build.properties
@@ -3,10 +3,6 @@ bin.includes = plugin.xml,\
icons/,\
about.html,\
cdtlaunch.jar
-src.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- about.html
javadoc.packages = org.eclipse.cdt.launch.ui.*,\
org.eclipse.cdt.launch.sourcelookup*,\
org.eclipse.cdt.launch.*
diff --git a/releng/org.eclipse.cdt-feature/build.properties b/releng/org.eclipse.cdt-feature/build.properties
index fdeec5c9ca8..d086b4c8449 100644
--- a/releng/org.eclipse.cdt-feature/build.properties
+++ b/releng/org.eclipse.cdt-feature/build.properties
@@ -3,8 +3,3 @@ bin.includes = cpl-v10.html,\
feature.properties,\
eclipse_update_120.jpg,\
license.html
-src.includes = cpl-v10.html,\
- feature.xml,\
- feature.properties,\
- eclipse_update_120.jpg,\
- license.html
diff --git a/releng/org.eclipse.cdt/build.properties b/releng/org.eclipse.cdt/build.properties
index 858cde9e51d..c32134c302c 100644
--- a/releng/org.eclipse.cdt/build.properties
+++ b/releng/org.eclipse.cdt/build.properties
@@ -1,25 +1,17 @@
bin.includes = about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- eclipse32.gif,\
- plugin.properties,\
- plugin.xml,\
- welcome.xml
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ eclipse32.gif,\
+ plugin.properties,\
+ plugin.xml,\
+ welcome.xml,\
+ cpl-v10.html,\
+ notice.html
# note: the following files are intentionally not listed in bin.includes
# cpl-v10.html
# notice.html
# these files need to end up as root files in <install>/eclipse/ for a jdt runtime platform build
-src.includes = about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- eclipse32.gif,\
- plugin.properties,\
- plugin.xml,\
- welcome.xml,\
- cpl-v10.html,\
- notice.html

Back to the top