aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-12-10 08:02:00 (EST)
committerPaul Webster2012-12-10 08:02:00 (EST)
commita1a526dbb6e1c68cc5659b4acadb259336054d92 (patch)
treebf213be254e58f24d8ae2fd1abd21c1df2a2690c
parent4dd2f78edd5366a0c6f19a8211e83b7c8fe11e8b (diff)
downloadeclipse.platform-a1a526dbb6e1c68cc5659b4acadb259336054d92.zip
eclipse.platform-a1a526dbb6e1c68cc5659b4acadb259336054d92.tar.gz
eclipse.platform-a1a526dbb6e1c68cc5659b4acadb259336054d92.tar.bz2
Bug 396096 - Merge in CBI patches from 4.2.2 into 4.3 (non-pom changes) for eclipse.platform
-rw-r--r--.gitignore4
-rw-r--r--platform/org.eclipse.platform/META-INF/MANIFEST.MF1
-rw-r--r--platform/org.eclipse.sdk/META-INF/MANIFEST.MF1
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b82d864..1b659ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
+ant/org.eclipse.ant.tests.core/anttestscore.jar
+ant/org.eclipse.ant.tests.ui/anttestsui.jar
+platform/org.eclipse.platform/platform.jar
platform/org.eclipse.platform/bin-intro/
/*/*/bin/
+/*/*/target/
platform/org.eclipse.platform/bin-intro/
*~
*.rej
diff --git a/platform/org.eclipse.platform/META-INF/MANIFEST.MF b/platform/org.eclipse.platform/META-INF/MANIFEST.MF
index cafc54c..93327ed 100644
--- a/platform/org.eclipse.platform/META-INF/MANIFEST.MF
+++ b/platform/org.eclipse.platform/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.0/Foundation-1.0,
J2SE-1.3
Export-Package: org.eclipse.platform.internal;x-internal:=true
+Eclipse-BundleShape: dir
diff --git a/platform/org.eclipse.sdk/META-INF/MANIFEST.MF b/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
index c532e85..cc9c3f9 100644
--- a/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
+++ b/platform/org.eclipse.sdk/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide.application;bundle-version="[1.0.0,2.0.0)"
Eclipse-AutoStart: true
+Eclipse-BundleShape: dir