Fixed build for jar'd plugins

cleaned up .project files

12 files changed, 23 insertions, 34 deletions

diff --git a/core/org.eclipse.cdt.core.aix/.project b/core/org.eclipse.cdt.core.aix/.project
index 8edd1404d74..b463663a422 100644
--- a/core/org.eclipse.cdt.core.aix/.project
+++ b/core/org.eclipse.cdt.core.aix/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.aix</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index 003cce1ab7a..078a0e987a1 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -10,9 +10,9 @@
 ###############################################################################
 source.cdtaix.jar = src/
 bin.includes = fragment.xml,\
-               *.jar,\
                cdtaix.jar,\
                fragment.properties,\
                about.html,\
-               META-INF/
+               META-INF/,\
+               os/
 src.includes = library/
diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project
index 43f20bda72b..8e8b3560544 100644
--- a/core/org.eclipse.cdt.core.linux/.project
+++ b/core/org.eclipse.cdt.core.linux/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.linux</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.macosx/.project b/core/org.eclipse.cdt.core.macosx/.project
index 0cda5672e50..d56d04e05eb 100644
--- a/core/org.eclipse.cdt.core.macosx/.project
+++ b/core/org.eclipse.cdt.core.macosx/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.macosx</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.qnx/.project b/core/org.eclipse.cdt.core.qnx/.project
index 9aa2652590a..bfff1d26cb1 100644
--- a/core/org.eclipse.cdt.core.qnx/.project
+++ b/core/org.eclipse.cdt.core.qnx/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.qnx</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.solaris/.project b/core/org.eclipse.cdt.core.solaris/.project
index d02ba7f9f05..7cc7c8e5e6d 100644
--- a/core/org.eclipse.cdt.core.solaris/.project
+++ b/core/org.eclipse.cdt.core.solaris/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.solaris</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index c1df6cef610..135e710c55a 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.jface,
  org.eclipse.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 9a4017c94e7..13b51bd0cb8 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtcore.jar
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.cdt.core,
+Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.core.browser,
  org.eclipse.cdt.core.browser.typehierarchy,
  org.eclipse.cdt.core.dom,
@@ -86,4 +84,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.text,
  org.eclipse.core.variables
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 0b308de5d3a..494ed20fe2d 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -11,10 +11,9 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtcore.jar,\
                template/,\
+               .,\
                META-INF/
-jars.compile.order = cdtcore.jar
 src.includes = schema/,\
                doc/,\
                .options
@@ -25,12 +24,11 @@ javadoc.packages = org.eclipse.cdt.core.*,\
                    org.eclipse.cdt.utils.*,\
                    org.eclipse.cdt.utils.elf.*,\
                    org.eclipse.cdt.utils.spawner.*
-source.cdtcore.jar = index/,\
-                     model/,\
-                     src/,\
-                     utils/,\
-                     search/,\
-                     dependency/,\
-                     browser/,\
-                     parser/
-output.cdtcore.jar = bin/
+source.. = src/,\
+           browser/,\
+           dependency/,\
+           index/,\
+           model/,\
+           parser/,\
+           search/,\
+           utils/
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index 4192f26704a..074055d7549 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Require-Bundle: org.eclipse.jface.text,
  org.eclipse.ui.console,
  org.eclipse.core.expressions,
  org.eclipse.cdt.make.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index d411a33b94c..f1aefbf953d 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtui.jar
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.cdt.internal.corext,
+Export-Package: org.eclipse.cdt.internal.corext,
  org.eclipse.cdt.internal.corext.refactoring,
  org.eclipse.cdt.internal.corext.refactoring.base,
  org.eclipse.cdt.internal.corext.refactoring.changes,
@@ -76,4 +74,4 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.filebuffers,
  org.eclipse.core.runtime,
  org.eclipse.help
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index 215c4a6c004..c83f78fcb4f 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -14,15 +14,15 @@ bin.includes = about.html,\
                icons/,\
                plugin.properties,\
                templates/,\
-               cdtui.jar,\
+               .,\
                META-INF/
-source.cdtui.jar = src/,\
-                   utils.ui/,\
-                   browser/,\
-                   refactor/
 src.includes = about.html,\
                schema/
 javadoc.packages = org.eclipse.cdt.ui.*,\
                    org.eclipse.cdt.ui.wizards.*,\
                    org.eclipse.cdt.ui.wizards.conversion.*
-output.cdtui.jar = bin/
+
+source.. = src/,\
+           browser/,\
+           utils.ui/,\
+           refactor/