From 598fd6014290120b1a2be0c2cf6fe8851053641f Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Tue, 10 Jan 2012 08:15:03 +0100 Subject: This is the commit that merges changes I have done to in a branch named gettingEclipse38M4 in order to get a recent January Eclipse version to build with eclipse-build Patch update to 3.8 M4 Removed hack to rebuild plugin from source - it is no longer delivered in a binary format Source building is more error-resistance. While building source multiple times, it is possible that target directory already contains some files, and therefore mv will fail. In this patch mv has been replaced with cp -rf and rm -rf sequence. Existance of some directories is also verified before they are accessed. Implicit build of org.eclipse.equinox.initializer org.eclipse.equinox.initializer is no longer built by Eclipse.org, however, it is still required by eclipse-builder to do native library operations. It needs to be checked out and built by eclipse-builder explicitly. Dependencies has been upgraded. icu requires update in fedora repository felix-gogo dependency has been introduced org.eclipse.jetty* have been introduced org.mortbay.jetty* have been removed. manifests in dependencyManifests were also updated. Almost all patches apply in a clean way. Patches were adjusted to 3.8M4 build. Scripts regenerated for Eclipse 3.8 M4b org.eclipse.help feature patches were merged into one Solving missing dependencies in otg.eclipse.jdt.launching Missing dependencies were caused by the lack of certain el plugins. It was necessary to add apache specific requirements to the jdt feature and jdt.launching plugin Remove jetty5 dependency, adjust patches, build initializer Putting help patch into the repo Fixed broken jdt patch It appears it is enough to patch only JDT feature to get jdt.launching compiling successfully. Temporary support for webkit added. This change should be reverted at some point as the patch was commited to HEAD, so there will be no need to apply it here. Using system jetty 8 Updating to a recent M4 build. --- eclipse-build/build.properties | 8 +- eclipse-build/build.xml | 33 +- eclipse-build/buildSDKSource.sh | 61 +- eclipse-build/dependencies.properties | 20 +- .../META-INF/MANIFEST.MF | 28 - .../META-INF/MANIFEST.MF | 7986 ++++++++++++++++++++ .../javax.el_2.2.0.jar/META-INF/MANIFEST.MF | 13 - .../META-INF/MANIFEST.MF | 15 + .../META-INF/MANIFEST.MF | 13 - .../META-INF/MANIFEST.MF | 17 + .../javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF | 11 - .../META-INF/MANIFEST.MF | 18 + .../META-INF/MANIFEST.MF | 26 + .../META-INF/MANIFEST.MF | 24 + .../META-INF/MANIFEST.MF | 88 + .../META-INF/MANIFEST.MF | 1971 +---- .../META-INF/MANIFEST.MF | 77 + .../META-INF/MANIFEST.MF | 175 + .../META-INF/MANIFEST.MF | 224 + .../META-INF/MANIFEST.MF | 238 + .../META-INF/MANIFEST.MF | 584 ++ .../META-INF/MANIFEST.MF | 181 + .../META-INF/MANIFEST.MF | 470 ++ .../eclipse-build-generatedScripts.tar.bz2 | Bin 21585 -> 22453 bytes ....launch-for-remote-uri-in-the-pure-gio-en.patch | 143 - .../patches/donotstorebuildlogsinfiles.patch | 6 +- eclipse-build/patches/eclipse-add-archs-swt.patch | 10 +- .../patches/eclipse-addArchesAnd64bitSWT.patch | 2 +- .../patches/eclipse-buildswtnatives.patch | 2 +- ...letransfer-ssl-remove-conflicting-imports.patch | 7 + ...clipse-ecf-ssl-remove-conflicting-imports.patch | 13 + .../patches/eclipse-equinox-http-servlet.patch | 8 +- .../patches/eclipse-equinox-jsp-jasper.patch | 30 +- .../eclipse-help-feature-adjust-dependencies.patch | 92 + eclipse-build/patches/eclipse-help-feature.patch | 48 - .../eclipse-nosourcebundlesfordependencies.patch | 36 +- .../patches/eclipse-removeSkipMapsCheck.patch | 15 +- .../patches/eclipse-swt-remove-deprecated.patch | 89 + eclipse-build/patches/eclipse-xpcom-h.patch | 2 +- .../patches/jdt-feature-add-el-imports.patch | 21 + .../patches/jdt-launching-add-el-imports.patch | 13 + eclipse-build/patches/osgi-services-build.patch | 3 +- .../patches/remove-lucene-dependency.patch | 41 - .../serverside-patch-additional-imports.patch | 25 + eclipse-build/patches/webkit.patch | 11 + eclipse-build/pdebuild.properties | 6 +- eclipse-build/pdebuild.xml | 7 +- eclipse-build/regenerateBootstrapFiles.sh | 2 +- 48 files changed, 10584 insertions(+), 2329 deletions(-) delete mode 100644 eclipse-build/dependencyManifests/com.ibm.icu_4.4.2.v20110208.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/com.ibm.icu_4.4.2.v20110823.jar/META-INF/MANIFEST.MF delete mode 100644 eclipse-build/dependencyManifests/javax.el_2.2.0.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF delete mode 100644 eclipse-build/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF delete mode 100644 eclipse-build/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.apache.felix.gogo.command_0.8.0.v201108120515.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.apache.felix.gogo.shell_0.8.0.v201110170705.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.continuation_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.http_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.io_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.security_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.server_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.servlet_8.1.0.RC1.jar/META-INF/MANIFEST.MF create mode 100644 eclipse-build/dependencyManifests/org.eclipse.jetty.util_8.1.0.RC1.jar/META-INF/MANIFEST.MF delete mode 100644 eclipse-build/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch create mode 100644 eclipse-build/patches/eclipse-ecf-provider-filetransfer-ssl-remove-conflicting-imports.patch create mode 100644 eclipse-build/patches/eclipse-ecf-ssl-remove-conflicting-imports.patch create mode 100644 eclipse-build/patches/eclipse-help-feature-adjust-dependencies.patch delete mode 100644 eclipse-build/patches/eclipse-help-feature.patch create mode 100644 eclipse-build/patches/eclipse-swt-remove-deprecated.patch create mode 100644 eclipse-build/patches/jdt-feature-add-el-imports.patch create mode 100644 eclipse-build/patches/jdt-launching-add-el-imports.patch delete mode 100644 eclipse-build/patches/remove-lucene-dependency.patch create mode 100644 eclipse-build/patches/serverside-patch-additional-imports.patch create mode 100644 eclipse-build/patches/webkit.patch diff --git a/eclipse-build/build.properties b/eclipse-build/build.properties index ea83fb0..4cc2615 100644 --- a/eclipse-build/build.properties +++ b/eclipse-build/build.properties @@ -1,10 +1,10 @@ #baseLocation=${basedir}/bootstrap # Note: this is also in pdebuild.properties -buildId=I20110803-1800 -buildTag=I20110803-1800 -label=3.8.0-M1 +buildId=I20120103-0800 +buildTag=vI20120103-0800 +label=3.8.0-M4b EMFlabel=2.7.0 -testsBuildLabel=3.8.0-M1 +testsBuildLabel=3.8.0-M4b testframework=org.eclipse.test_3.3.100 p2.director.version=${testsBuildLabel} testsBuildId=v20100211 diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml index f467b13..4a5d934 100644 --- a/eclipse-build/build.xml +++ b/eclipse-build/build.xml @@ -248,9 +248,9 @@ - + - + @@ -343,6 +343,7 @@ + @@ -352,7 +353,7 @@ - + @@ -367,13 +368,19 @@ - - + + - - - + + + + + + + + + @@ -463,6 +470,13 @@ + + + + + + + @@ -478,7 +492,7 @@ - + @@ -491,6 +505,7 @@ + - + - - - + + + + diff --git a/eclipse-build/patches/eclipse-swt-remove-deprecated.patch b/eclipse-build/patches/eclipse-swt-remove-deprecated.patch new file mode 100644 index 0000000..d2c5f5c --- /dev/null +++ b/eclipse-build/patches/eclipse-swt-remove-deprecated.patch @@ -0,0 +1,89 @@ +diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c +@@ -43,9 +43,9 @@ AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkAction + if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject); + lpStruct->do_action = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.do_action); + lpStruct->get_n_actions = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions); +- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description); +- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name); +- lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding); ++ lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description); ++ lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name); ++ lpStruct->get_keybinding = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding); + lpStruct->set_description = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description); + return lpStruct; + } +@@ -292,8 +292,8 @@ void cacheAtkObjectClassFields(JNIEnv *env, jobject lpObject) + AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct) + { + if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject); +- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name); +- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description); ++ lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name); ++ lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description); + lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_parent); + lpStruct->get_n_children = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children); + lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_child); +@@ -502,9 +502,9 @@ AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIfa + lpStruct->get_column_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at); + lpStruct->get_row_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at); + lpStruct->get_caption = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption); +- lpStruct->get_column_description = (G_CONST_RETURN gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description); ++ lpStruct->get_column_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description); + lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header); +- lpStruct->get_row_description = (G_CONST_RETURN gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description); ++ lpStruct->get_row_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description); + lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header); + lpStruct->get_summary = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary); + lpStruct->set_caption = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption); +diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java +@@ -21,11 +21,11 @@ public class AtkActionIface { + public int /*long*/ do_action; + /** @field cast=(gint (*)()) */ + public int /*long*/ get_n_actions; +- /** @field cast=(G_CONST_RETURN gchar *(*)()) */ ++ /** @field cast=(const gchar *(*)()) */ + public int /*long*/ get_description; +- /** @field cast=(G_CONST_RETURN gchar *(*)()) */ ++ /** @field cast=(const gchar *(*)()) */ + public int /*long*/ get_name; +- /** @field cast=(G_CONST_RETURN gchar *(*)()) */ ++ /** @field cast=(const gchar *(*)()) */ + public int /*long*/ get_keybinding; + /** @field cast=(gboolean (*)()) */ + public int /*long*/ set_description; +diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java +@@ -16,9 +16,9 @@ package org.eclipse.swt.internal.accessibility.gtk; + + + public class AtkObjectClass { +- /** @field cast=(G_CONST_RETURN gchar *(*)()) */ ++ /** @field cast=(const gchar *(*)()) */ + public int /*long*/ get_name; +- /** @field cast=(G_CONST_RETURN gchar *(*)()) */ ++ /** @field cast=(const gchar *(*)()) */ + public int /*long*/ get_description; + /** @field cast=(AtkObject *(*)()) */ + public int /*long*/ get_parent; +diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java +@@ -34,11 +34,11 @@ public class AtkTableIface { + public int /*long*/ get_row_extent_at; + /** @field cast=(AtkObject* (*)()) */ + public int /*long*/ get_caption; +- /** @field cast=(G_CONST_RETURN gchar* (*)()) */ ++ /** @field cast=(const gchar* (*)()) */ + public int /*long*/ get_column_description; + /** @field cast=(AtkObject* (*)()) */ + public int /*long*/ get_column_header; +- /** @field cast=(G_CONST_RETURN gchar* (*)()) */ ++ /** @field cast=(const gchar* (*)()) */ + public int /*long*/ get_row_description; + /** @field cast=(AtkObject* (*)()) */ + public int /*long*/ get_row_header; diff --git a/eclipse-build/patches/eclipse-xpcom-h.patch b/eclipse-build/patches/eclipse-xpcom-h.patch index e2dfbc4..0f09e32 100644 --- a/eclipse-build/patches/eclipse-xpcom-h.patch +++ b/eclipse-build/patches/eclipse-xpcom-h.patch @@ -1,7 +1,7 @@ diff -up ./xpcom.h.fix ./xpcom.h --- ./xpcom.h.fix 2010-09-17 11:31:46.317620889 -0400 +++ ./xpcom.h 2010-09-17 11:33:58.558646774 -0400 -@@ -36,6 +36,10 @@ +@@ -38,6 +38,10 @@ #ifdef __APPLE__ #define NO__1NS_1InitXPCOM2 #endif /* __APPLE__ */ diff --git a/eclipse-build/patches/jdt-feature-add-el-imports.patch b/eclipse-build/patches/jdt-feature-add-el-imports.patch new file mode 100644 index 0000000..7b26de1 --- /dev/null +++ b/eclipse-build/patches/jdt-feature-add-el-imports.patch @@ -0,0 +1,21 @@ +--- features/org.eclipse.jdt/Copy of feature.xml 2012-01-16 11:55:47.000000000 +0100 ++++ features/org.eclipse.jdt/feature.xml 2012-01-18 18:47:15.489195402 +0100 +@@ -211,4 +211,18 @@ + version="0.0.0" + unpack="false"/> + ++ ++ ++ ++ + diff --git a/eclipse-build/patches/jdt-launching-add-el-imports.patch b/eclipse-build/patches/jdt-launching-add-el-imports.patch new file mode 100644 index 0000000..089e7ff --- /dev/null +++ b/eclipse-build/patches/jdt-launching-add-el-imports.patch @@ -0,0 +1,13 @@ +--- plugins/org.eclipse.jdt.launching/META-INF/Copy of MANIFEST.MF 2012-01-18 18:42:16.464377717 +0100 ++++ plugins/org.eclipse.jdt.launching/META-INF/MANIFEST.MF 2012-01-16 11:55:51.000000000 +0100 +@@ -19,9 +19,7 @@ + org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.osgi;bundle-version="[3.8.0,4.0.0)", +- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", +- javax.el, +- org.apache.el;bundle-version="[7.0.0,8.0.0)" ++ org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)" + Bundle-ActivationPolicy: lazy + Import-Package: com.ibm.icu.text + Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/eclipse-build/patches/osgi-services-build.patch b/eclipse-build/patches/osgi-services-build.patch index 95cad3e..7414f1f 100644 --- a/eclipse-build/patches/osgi-services-build.patch +++ b/eclipse-build/patches/osgi-services-build.patch @@ -2,7 +2,7 @@ diff --git a/eclipse/plugins/org.eclipse.osgi.services/build.properties b/eclips index 7962dc5..ca55afb 100644 --- a/plugins/org.eclipse.osgi.services/build.properties +++ b/plugins/org.eclipse.osgi.services/build.properties -@@ -11,10 +11,12 @@ +@@ -11,11 +11,13 @@ bin.includes = plugin.properties,\ about.html,\ META-INF/,\ @@ -20,3 +20,4 @@ index 7962dc5..ca55afb 100644 +javacSource=1.5 +javacTarget=1.5 output.. = . + customBuildCallbacks=customBuildCallbacks.xml diff --git a/eclipse-build/patches/remove-lucene-dependency.patch b/eclipse-build/patches/remove-lucene-dependency.patch deleted file mode 100644 index 854f384..0000000 --- a/eclipse-build/patches/remove-lucene-dependency.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml ---- eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml 2011-03-27 10:30:27.000000000 -0400 -+++ eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml 2011-08-23 14:01:19.026328809 -0400 -@@ -57,13 +57,6 @@ - unpack="false"/> - - -- -- ++ ++ ++ ++ ++ + @@ -107,12 +107,13 @@ - + + @@ -131,7 +132,7 @@ diff --git a/eclipse-build/regenerateBootstrapFiles.sh b/eclipse-build/regenerateBootstrapFiles.sh index 2efc69f..ce5c478 100755 --- a/eclipse-build/regenerateBootstrapFiles.sh +++ b/eclipse-build/regenerateBootstrapFiles.sh @@ -18,5 +18,5 @@ $launcherDir/plugins/org.eclipse.equinox.launcher_*.jar \ -application org.eclipse.ant.core.antRunner \ -f pdebuild.xml generateScripts \ -DskipBase=true \ --DsdkSource=build/eclipse-3.8.0-M1-src \ +-DsdkSource=build/eclipse-3.8.0-M4b-src \ 2>&1 | tee ./generatePdeBuildScripts.log -- cgit v1.2.3