Revert to 3.2.2 for IcedTea

This commit is contained in:
Ben Konrath 2007-06-26 16:01:53 +00:00
parent 24d7ff7656
commit 48553a3bf5
24 changed files with 2611 additions and 530 deletions

View File

@ -1,3 +1,4 @@
icu4jsrc_3_4_5.jar
eclipse-fileinitializerapp.tar.bz2 eclipse-fileinitializerapp.tar.bz2
eclipse-sourceBuild-srcIncluded-3.3RC4.zip eclipse-sourceBuild-srcIncluded-3.2.2.zip
eclipse-fedora-splash-3.3.0.png eclipse-fedora-splash-3.2.2.png

View File

@ -1,14 +0,0 @@
* enable ecj on ppc64, s390{,x}, sparc{,64}
* junit 4.1
* ant 1.7
* deal with these:
javax.servlet_2.4.0.v200704241052.jar
javax.servlet.jsp_2.0.0.v200703221034.jar
org.apache.commons.el_1.0.0.v200704241052.jar
org.apache.commons.logging_1.0.4.v200701082340.jar
org.apache.jasper_5.5.17.v200704241052.jar
org.apache.lucene_1.9.1.v200703221049.jar
org.apache.lucene.analysis_1.9.1.v200703221049.jar
org.mortbay.jetty_5.1.11.v200701082340.jar

View File

@ -0,0 +1,23 @@
Index: customBuildCallbacks.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/customBuildCallbacks.xml,v
retrieving revision 1.5
diff -u -r1.5 customBuildCallbacks.xml
--- customBuildCallbacks.xml 14 Dec 2005 00:07:22 -0000 1.5
+++ customBuildCallbacks.xml 5 Jun 2006 01:18:34 -0000
@@ -80,6 +80,15 @@
</target>
<!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - the directory plugins will be collected to -->
+ <!-- feature.directory - the directory containing the resulting feature -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
<!-- Steps to do after the target gather.bin.parts -->
<!-- Available parameters : -->
<!-- base.dir - root of the project -->

View File

@ -0,0 +1,165 @@
Index: src/org/eclipse/core/runtime/Platform.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java,v
retrieving revision 1.106
diff -u -r1.106 Platform.java
--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 13 Apr 2006 00:42:47 -0000 1.106
+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 31 Jan 2007 21:33:51 -0000
@@ -339,6 +339,11 @@
* @since 3.1
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+
+ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
+ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
/**
* Constant string (value "win32") indicating the platform is running on a
Index: src/org/eclipse/core/internal/runtime/InternalPlatform.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java,v
retrieving revision 1.253
diff -u -r1.253 InternalPlatform.java
--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 21 Apr 2006 20:49:57 -0000 1.253
+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 31 Jan 2007 21:33:50 -0000
@@ -52,6 +52,10 @@
Platform.ARCH_X86, //
Platform.ARCH_AMD64, //
Platform.ARCH_IA64, //
+ Platform.ARCH_PPC64, //
+ Platform.ARCH_SPARC64, //
+ Platform.ARCH_S390, //
+ Platform.ARCH_S390X, //
Platform.ARCH_IA64_32};
private static final String BOOT = "-boot"; //$NON-NLS-1$
private static final String CLASSLOADER_PROPERTIES = "-classloaderProperties"; //$NON-NLS-1$
Index: eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java,v
retrieving revision 1.13
diff -u -r1.13 PluginConverterImpl.java
--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 13 Apr 2006 16:10:27 -0000 1.13
+++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 31 Jan 2007 21:33:52 -0000
@@ -64,7 +64,7 @@
private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
private static PluginConverterImpl instance;
- private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
+ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X};
static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
Index: eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java,v
retrieving revision 1.9
diff -u -r1.9 Constants.java
--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 13 Jun 2005 17:14:22 -0000 1.9
+++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 31 Jan 2007 21:33:52 -0000
@@ -119,6 +119,11 @@
*/
public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
+ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
+
/**
* Constant string (value "win32") indicating the platform is running on a
* machine using the Windows windowing system.
Index: feature.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/org.eclipse.rcp/feature.xml,v
retrieving revision 1.40.2.1
diff -u -r1.40.2.1 feature.xml
--- features/org.eclipse.rcp/feature.xml 1 Aug 2006 17:29:33 -0000 1.40.2.1
+++ features/org.eclipse.rcp/feature.xml 6 Feb 2007 23:44:22 -0000
@@ -308,5 +308,60 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.ppc64"
+ os="linux"
+ ws="gtk"
+ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.s390"
+ os="linux"
+ ws="gtk"
+ arch="s390"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.s390x"
+ os="linux"
+ ws="gtk"
+ arch="s390x"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.sparc"
+ os="linux"
+ ws="gtk"
+ arch="sparc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.sparc64"
+ os="linux"
+ ws="gtk"
+ arch="sparc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
</feature>
diff -ru features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
--- features/org.eclipse.platform.source/feature.xml 2007-02-06 19:04:05.000000000 -0500
+++ features/org.eclipse.platform.source/feature.xml 2007-02-06 19:07:26.000000000 -0500
@@ -28,4 +28,8 @@
<plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
<plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390x" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
</feature>
diff -ru features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
--- features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:04:06.000000000 -0500
+++ features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:09:11.000000000 -0500
@@ -28,4 +28,9 @@
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
<plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
<plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390x" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
</feature>

View File

@ -5,17 +5,20 @@ retrieving revision 1.9
diff -u -r1.9 build.xml diff -u -r1.9 build.xml
--- build.xml 11 May 2006 20:51:39 -0000 1.9 --- build.xml 11 May 2006 20:51:39 -0000 1.9
+++ build.xml 26 May 2006 23:06:38 -0000 +++ build.xml 26 May 2006 23:06:38 -0000
@@ -95,6 +95,15 @@ @@ -95,6 +95,18 @@
<arg line="build.sh" /> <arg line="build.sh" />
</exec> </exec>
<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" /> <move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
+ +
+ <!-- build liblocalfile --> + <delete dir="${launcherlibs}/library"/>
+
+ <!-- Build JNI libs -->
+ <!-- liblocalfile -->
+ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true"/> + <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true"/>
+ <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" + <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so"
+ todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}"> + todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
+ </move> + </move>
+ <!-- build libupdate --> + <!-- and libupdate -->
+ <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> + <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+ +
</target> </target>

View File

@ -367,7 +367,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ + this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ } + }
+ this.destinationPath = arg; + this.destinationPath = arg;
+ //this.generatePackagesStructure = true; + this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ + } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg); + classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ + } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$

View File

@ -0,0 +1,107 @@
Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
retrieving revision 1.254.4.2
diff -u -r1.254.4.2 Main.java
--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Oct 2006 14:11:48 -0000 1.254.4.2
+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 16 Feb 2007 18:40:23 -0000
@@ -2723,6 +2723,10 @@
ArrayList currentRuleSpecs = new ArrayList(defaultSize);
StringTokenizer tokenizer = new StringTokenizer(currentPath,
File.pathSeparator + "[]", true); //$NON-NLS-1$
+ ArrayList tokens = new ArrayList();
+ while (tokenizer.hasMoreTokens()) {
+ tokens.add(tokenizer.nextToken());
+ }
// state machine
final int start = 0;
final int readyToClose = 1;
@@ -2737,14 +2741,20 @@
// 'path[' 'path1;path2['
final int rulesReadyToClose = 6;
// 'path[rule' 'path[rule1;rule2'
+ final int bracketOpened = 7;
+ // '.*[.*'
+ final int bracketClosed = 8;
+ // '.*([.*])+'
final int error = 99;
int state = start;
String token = null;
- while (tokenizer.hasMoreTokens() && state != error) {
- token = tokenizer.nextToken();
+ int cursor = 0, tokensNb = tokens.size(), bracket = -1;
+ while (cursor < tokensNb && state != error) {
+ token = (String) tokens.get(cursor++);
if (token.equals(File.pathSeparator)) {
switch (state) {
case start:
+ case bracketOpened:
break;
case readyToClose:
case readyToCloseEndingWithRules:
@@ -2757,14 +2767,21 @@
case rulesReadyToClose:
state = rulesNeedAnotherRule;
break;
+ case bracketClosed:
+ cursor = bracket + 1;
+ state = rulesStart;
+ break;
default:
state = error;
}
} else if (token.equals("[")) { //$NON-NLS-1$
switch (state) {
case readyToClose:
- state = rulesStart;
+ bracket = cursor - 1;
+ case bracketClosed:
+ state = bracketOpened;
break;
+ case bracketOpened:
default:
state = error;
}
@@ -2773,6 +2790,10 @@
case rulesReadyToClose:
state = readyToCloseEndingWithRules;
break;
+ case bracketOpened:
+ state = bracketClosed;
+ break;
+ case bracketClosed:
default:
state = error;
}
@@ -2789,10 +2810,22 @@
state = rulesReadyToClose;
currentRuleSpecs.add(token);
break;
+ case bracketClosed:
+ for (int i = bracket; i < cursor ; i++) {
+ currentClasspathName += (String) tokens.get(i);
+ }
+ state = readyToClose;
+ break;
+ case bracketOpened:
+ break;
default:
state = error;
}
}
+ if (state == bracketClosed && cursor == tokensNb) {
+ cursor = bracket + 1;
+ state = rulesStart;
+ }
}
switch(state) {
case readyToClose:
@@ -2801,6 +2834,8 @@
addNewEntry(paths, currentClasspathName, currentRuleSpecs,
customEncoding, isSourceOnly);
break;
+ case bracketOpened:
+ case bracketClosed:
default :
// we go on anyway
this.logger.logIncorrectClasspath(currentPath);

View File

@ -0,0 +1,144 @@
Index: library/eclipse.c
===================================================================
RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
retrieving revision 1.71
diff -u -r1.71 eclipse.c
--- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71
+++ library/eclipse.c 14 May 2007 11:14:30 -0000
@@ -512,6 +512,8 @@
/* Get the command to start the Java VM. */
vmCommandArgs = getVMCommand( argc, argv );
+ addPlatformToTildeDotEclipse();
+
/* While the Java VM should be restarted */
vmCommand = vmCommandArgs;
while (vmCommand != NULL)
Index: library/gtk/eclipseGtk.c
===================================================================
RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/eclipseGtk.c,v
retrieving revision 1.27
diff -u -r1.27 eclipseGtk.c
--- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27
+++ library/gtk/eclipseGtk.c 14 May 2007 11:14:30 -0000
@@ -335,3 +335,120 @@
gtk_main_quit();
return FALSE;
}
+
+/* Add the platform to ~/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml */
+void addPlatformToTildeDotEclipse()
+{
+ gchar *platform_xml, *touched, *dot_eclipse;
+ gchar *rcp321_position;
+ gchar *platform_xml_contents;
+ GError *error = NULL;
+
+ platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
+ dot_eclipse = g_strconcat(g_get_home_dir(), "/.eclipse", NULL);
+ touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
+
+
+ if (!g_file_test(dot_eclipse, G_FILE_TEST_EXISTS))
+ {
+ /* If .eclipse doesn't exist, Eclipse has yet to be started.
+ * We don't have worry about doing anything now and in the future
+ * so add the appropriate file to ~/.eclipse. */
+ if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 511) < 0)
+ {
+ g_print("Error creating ~/.eclipse/.");
+ g_free(platform_xml);
+ g_free(dot_eclipse);
+ g_free(touched);
+ return;
+
+ }
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
+ {
+ g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
+ g_print(g_strconcat(error->message, "\n\0", NULL));
+ g_free(error);
+ g_free(platform_xml);
+ g_free(dot_eclipse);
+ g_free(touched);
+ return;
+ }
+
+ }
+ else if (g_file_test(platform_xml, G_FILE_TEST_EXISTS))
+ {
+ /* platform_xml exists, workaround these two bugs:
+ * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238107
+ * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238109
+ *
+ * remove the unwanted feature if its in platform.xml */
+
+ if (g_file_get_contents(platform_xml, &platform_xml_contents, NULL, &error) == FALSE)
+ {
+ g_print("Error reading platform.xml in ~/.eclipse.\
+ You should remove ~/.eclipse before restarting Eclipse:\0");
+ g_print(g_strconcat(error->message, "\n\0", NULL));
+ g_free(error);
+ g_free(platform_xml);
+ g_free(touched);
+ return;
+ }
+
+ gchar *unwanted_feature = "<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\0";
+ rcp321_position = g_strrstr(platform_xml_contents, unwanted_feature);
+
+ if (rcp321_position != NULL)
+ {
+ int i;
+ for (i = 0; i < strlen(unwanted_feature); i++) {
+ rcp321_position[i] = ' ';
+ }
+ }
+
+ if (g_file_set_contents(platform_xml, platform_xml_contents, -1, &error) == FALSE)
+ {
+ g_print("Error writing platform.xml in ~/.eclipse.\
+ You should remove ~/.eclipse before restarting Eclipse:\0");
+ g_print(g_strconcat(error->message, "\n\0", NULL));
+ g_free(error);
+ g_free(touched);
+ g_free(dot_eclipse);
+ g_free(platform_xml);
+ g_free(platform_xml_contents);
+ return;
+ }
+
+ g_free(platform_xml_contents);
+ }
+
+ g_free(dot_eclipse);
+ if (g_file_test(touched, G_FILE_TEST_EXISTS))
+ {
+ /* touched exists, we don't need to do anything */
+ g_free(platform_xml);
+ g_free(touched);
+ return;
+ }
+
+ /* At this point platform_xml exists and touched does not exist. */
+ if (g_file_test(platform_xml, G_FILE_TEST_EXISTS))
+ {
+ if (g_remove(platform_xml) < 0)
+ {
+ g_print("Error writing platform.xml in ~/.eclipse.\
+ You should remove ~/.eclipse before restarting Eclipse:\0");
+ g_free(platform_xml);
+ g_free(touched);
+ return;
+ }
+ }
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
+ {
+ g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
+ g_print(g_strconcat(error->message, "\n\0", NULL));
+ g_free(error);
+ }
+ g_free(platform_xml);
+ g_free(touched);
+ return;
+}

View File

@ -1,23 +1,121 @@
### Eclipse Workspace Patch 1.0
#P platform-launcher
Index: library/eclipseConfig.c
===================================================================
RCS file: /cvsroot/eclipse/platform-launcher/library/eclipseConfig.c,v
retrieving revision 1.11
diff -u -r1.11 eclipseConfig.c
--- library/eclipseConfig.c 15 Apr 2005 19:17:10 -0000 1.11
+++ library/eclipseConfig.c 25 Oct 2006 22:10:20 -0000
@@ -30,8 +30,11 @@
#endif
-int readConfigFile(_TCHAR* program, _TCHAR* arg0, int *argc, _TCHAR ***argv)
+/* installDir must end in path separator */
+int readConfigFile(_TCHAR* installDir, _TCHAR* arg0, int *argc, _TCHAR ***argv)
{
+ _TCHAR* temp;
+ _TCHAR* programName;
_TCHAR* config_file = NULL;
_TCHAR buffer[1024];
_TCHAR argument[1024];
@@ -39,11 +42,20 @@
int maxArgs = 128;
int index;
- if (program == NULL || argc == NULL || argv == NULL) return -1;
-
- /* Get a copy */
- config_file = _tcsdup(program);
+ if (installDir == NULL || argc == NULL || argv == NULL) return -1;
+ /* Determine the name of the executable */
+ temp = malloc( (_tcslen( arg0 ) + 1) * sizeof(_TCHAR) );
+ _tcscpy( temp, arg0 );
+ programName = _tcsrchr( temp, dirSeparator );
+ if (programName == NULL)
+ programName = temp;
+ else
+ programName++;
+
+ /* Get a copy */
+ config_file = _tcsdup(installDir);
+
#ifdef _WIN32
{
/* Search for the extension .exe and replace it with .ini */
@@ -57,8 +69,11 @@
}
#else
/* Append the extension */
- config_file = (char*)realloc(config_file, strlen(config_file) + 5);
- strcat(config_file, ".ini");
+ config_file = (char*)realloc(config_file, strlen(config_file) + strlen(programName) + 5);
+ strcat(config_file, programName);
+ free(temp);
+ programName = NULL;
+ strcat(config_file, ".ini");
#endif
/* Open the config file as a text file
Index: library/eclipse.c Index: library/eclipse.c
=================================================================== ===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
retrieving revision 1.20 retrieving revision 1.71
diff -u -r1.20 eclipse.c diff -u -r1.71 eclipse.c
--- library/eclipse.c 8 Feb 2007 16:57:15 -0000 1.20 --- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71
+++ library/eclipse.c 1 Mar 2007 03:44:19 -0000 +++ library/eclipse.c 25 Oct 2006 22:10:20 -0000
@@ -330,8 +330,9 @@ @@ -295,7 +295,8 @@
/* Define the required VM arguments (all platforms). */ /* Define the required VM arguments (all platforms). */
static _TCHAR* cp = NULL; static _TCHAR* jar = _T_ECLIPSE("-jar");
-static _TCHAR* cpValue = NULL; -static _TCHAR** reqVMarg[] = { &jar, &jarFile, NULL };
-static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL }; /* required VM args */
+static _TCHAR* cpValue = NULL;
+static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration"); +static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
+static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL }; /* required VM args */ +static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &jar, &jarFile, NULL };
static _TCHAR** userVMarg = NULL; /* user specific args for the Java VM */
static _TCHAR** eeVMarg = NULL; /* vm args specified in ee file */ /* Local methods */
static int nEEargs = 0; static int createUserArgs(int configArgc, _TCHAR **configArgv, int *argc, _TCHAR ***argv);
@@ -915,20 +916,12 @@ @@ -387,8 +388,19 @@
#endif
}
+ /* Find the directory where Eclipse is installed. */
+ programDir = getProgramDir();
+ if (programDir == NULL)
+ {
+ errorMsg = malloc( (_tcslen(homeMsg) + _tcslen(officialName) + 10) * sizeof(_TCHAR) );
+ _stprintf( errorMsg, homeMsg, officialName );
+ displayMessage( officialName, errorMsg );
+ free( errorMsg );
+ exit( 1 );
+ }
+
/* Parse configuration file arguments */
- if (isMainEclipse(argc, argv) && readConfigFile(program, argv[0], &configArgc, &configArgv) == 0)
+ if (isMainEclipse(argc, argv) && readConfigFile(programDir, argv[0], &configArgc, &configArgv) == 0)
{
parseArgs (&configArgc, configArgv);
}
@@ -411,17 +423,6 @@
/* Initialize the window system. */
initWindowSystem( &argc, argv, (showSplashArg != NULL) );
- /* Find the directory where the Eclipse program is installed. */
- programDir = getProgramDir();
- if (programDir == NULL)
- {
- errorMsg = malloc( (_tcslen(homeMsg) + _tcslen(officialName) + 10) * sizeof(_TCHAR) );
- _stprintf( errorMsg, homeMsg, officialName );
- displayMessage( officialName, errorMsg );
- free( errorMsg );
- exit( 1 );
- }
-
/* If the exit data option was given, set exit data */
if (exitDataArg != NULL)
{
@@ -1078,19 +1079,12 @@
*/ */
_TCHAR* getProgramDir( ) _TCHAR* getProgramDir( )
{ {
@ -41,20 +139,20 @@ diff -u -r1.20 eclipse.c
+ return programDir; + return programDir;
} }
static _TCHAR* findStartupJar(){ +
Index: library/gtk/make_linux.mak Index: library/gtk/make_linux.mak
=================================================================== ===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/gtk/make_linux.mak,v RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/make_linux.mak,v
retrieving revision 1.10 retrieving revision 1.11
diff -u -r1.10 make_linux.mak diff -u -r1.11 make_linux.mak
--- library/gtk/make_linux.mak 7 Feb 2007 18:13:48 -0000 1.10 --- library/gtk/make_linux.mak 9 Mar 2006 19:01:05 -0000 1.11
+++ library/gtk/make_linux.mak 1 Mar 2007 03:44:19 -0000 +++ library/gtk/make_linux.mak 25 Oct 2006 22:10:20 -0000
@@ -43,7 +43,7 @@ @@ -27,7 +27,7 @@
DLL = $(PROGRAM_LIBRARY) OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseMozilla.o eclipseGtk.o
LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl EXEC = $(PROGRAM_OUTPUT)
LFLAGS = -shared -fpic -Wl,--export-dynamic LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0
-CFLAGS = -O -s -Wall\ -CFLAGS = -O -s \
+CFLAGS = -O -s -Wall -g \ +CFLAGS = -O -s -g \
-fpic \ -fpic \
-DLINUX \ -DLINUX \
-DMOZILLA_FIX \ -DMOZILLA_FIX \

View File

@ -0,0 +1,29 @@
--- plugins/org.eclipse.update.core.linux/src/build.xml.orig 2005-02-07 14:16:05.353485675 -0500
+++ plugins/org.eclipse.update.core.linux/src/build.xml 2005-02-07 14:17:04.365259400 -0500
@@ -47,7 +47,7 @@
<property name="header-path" value="${jdk-path}/../include"/>
<property name="header-linux-path" value="${header-path}/linux" />
- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
+ <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} -fPIC ${library-file}"/>
<apply executable="gcc" dest="${eclipse-home}/" parallel="false">
<arg value="-o"/>
@@ -56,9 +56,8 @@
<arg value="-I${src-path}"/>
<arg value="-I${header-path}"/>
<arg value="-I${header-linux-path}"/>
+ <arg value="-fPIC"/>
<srcfile/>
- <arg value="-static"/>
- <arg value="-lc"/>
<fileset dir="${src-path}" includes="*.c"/>
<mapper type="glob" from="*.c" to="*.o"/>
</apply>
@@ -67,4 +66,4 @@
</target>
-</project>
\ No newline at end of file
+</project>

View File

@ -0,0 +1,168 @@
Index: profile.list
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.osgi/profile.list,v
retrieving revision 1.2
diff -u -r1.2 profile.list
--- profile.list 12 Jan 2006 14:34:30 -0000 1.2
+++ profile.list 19 Jun 2007 19:00:57 -0000
@@ -9,6 +9,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
java.profiles = \
+ JavaSE-1.7.profile,\
JavaSE-1.6.profile,\
J2SE-1.5.profile,\
J2SE-1.4.profile,\
Index: JavaSE-1.7.profile
===================================================================
RCS file: JavaSE-1.7.profile
diff -N JavaSE-1.7.profile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ JavaSE-1.7.profile 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,146 @@
+###############################################################################
+# Copyright (c) 2003, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+org.osgi.framework.system.packages = \
+ javax.accessibility,\
+ javax.activity,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.transaction,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ org.ietf.jgss,\
+ org.omg.CORBA,\
+ org.omg.CORBA_2_3,\
+ org.omg.CORBA_2_3.portable,\
+ org.omg.CORBA.DynAnyPackage,\
+ org.omg.CORBA.ORBPackage,\
+ org.omg.CORBA.portable,\
+ org.omg.CORBA.TypeCodePackage,\
+ org.omg.CosNaming,\
+ org.omg.CosNaming.NamingContextExtPackage,\
+ org.omg.CosNaming.NamingContextPackage,\
+ org.omg.Dynamic,\
+ org.omg.DynamicAny,\
+ org.omg.DynamicAny.DynAnyFactoryPackage,\
+ org.omg.DynamicAny.DynAnyPackage,\
+ org.omg.IOP,\
+ org.omg.IOP.CodecFactoryPackage,\
+ org.omg.IOP.CodecPackage,\
+ org.omg.Messaging,\
+ org.omg.PortableInterceptor,\
+ org.omg.PortableInterceptor.ORBInitInfoPackage,\
+ org.omg.PortableServer,\
+ org.omg.PortableServer.CurrentPackage,\
+ org.omg.PortableServer.POAManagerPackage,\
+ org.omg.PortableServer.POAPackage,\
+ org.omg.PortableServer.portable,\
+ org.omg.PortableServer.ServantLocatorPackage,\
+ org.omg.SendingContext,\
+ org.omg.stub.java.rmi,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.events,\
+ org.w3c.dom.ls,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers
+org.osgi.framework.bootdelegation = \
+ javax.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
+ org.w3c.*,\
+ org.xml.*,\
+ sun.*,\
+ com.sun.*
+org.osgi.framework.executionenvironment = \
+ OSGi/Minimum-1.0,\
+ OSGi/Minimum-1.1,\
+ JRE-1.1,\
+ J2SE-1.2,\
+ J2SE-1.3,\
+ J2SE-1.4,\
+ J2SE-1.5,\
+ JavaSE-1.6,\
+ JavaSE-1.7
+osgi.java.profile.name = JavaSE-1.7

16
eclipse-ppc64gre64.patch Normal file
View File

@ -0,0 +1,16 @@
Index: library/eclipseMozilla.c
===================================================================
RCS file: /cvsroot/eclipse/platform-launcher/library/eclipseMozilla.c,v
retrieving revision 1.2
diff -u -r1.2 eclipseMozilla.c
--- library/eclipseMozilla.c 10 Aug 2006 21:21:26 -0000 1.2
+++ library/eclipseMozilla.c 17 Nov 2006 18:39:08 -0000
@@ -102,7 +102,7 @@
{
struct stat buf;
FILE *file = NULL;
-#if defined(__amd64__) || defined(__x86_64__)
+#if defined(__amd64__) || defined(__x86_64__) || defined(__powerpc64__)
if (stat("/etc/gre64.conf", &buf) == 0)
{
file = fopen("/etc/gre64.conf", "r");

View File

@ -0,0 +1,33 @@
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt.tools
Index: JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v
retrieving revision 1.11.2.1
diff -u -r1.11.2.1 org.eclipse.swt.internal.mozilla.XPCOM.properties
--- JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 26 Jul 2006 16:33:11 -0000 1.11.2.1
+++ JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 29 Sep 2006 04:51:03 -0000
@@ -24,17 +24,18 @@
XPCOM_NS_GetServiceManager=
XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
-XPCOM_NS_InitEmbedding=
-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3=
+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
XPCOM_NS_NewLocalFile=
XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
XPCOM_NS_NewLocalFile_1=
XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
-XPCOM_NS_TermEmbedding=
-
XPCOM_PR_Free=
XPCOM_PR_Free_0=cast=(void *)

475
eclipse-swt-firefox.patch Normal file
View File

@ -0,0 +1,475 @@
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
Index: Eclipse_SWT_PI/gtk/library/make_linux.mak
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/make_linux.mak,v
retrieving revision 1.33.2.1
diff -u -r1.33.2.1 make_linux.mak
--- Eclipse_SWT_PI/gtk/library/make_linux.mak 26 Jul 2006 16:33:23 -0000 1.33.2.1
+++ Eclipse_SWT_PI/gtk/library/make_linux.mak 29 Sep 2006 13:21:51 -0000
@@ -202,7 +202,7 @@
#
# Mozilla lib
#
-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB)
+make_mozilla:$(MOZILLA_LIB)
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS}
@@ -220,22 +220,22 @@
$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp
$(PROFILE14_OBJECTS): xpcom_profile.cpp
- $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp
+ $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp
$(PROFILE17_OBJECTS): xpcom_profile.cpp
- $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp
+ $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp
$(PROFILE18_OBJECTS): xpcom_profile.cpp
- $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp
+ $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp
$(PROFILE14_LIB): $(PROFILE14_OBJECTS)
- $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
+ $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS}
$(PROFILE17_LIB): $(PROFILE17_OBJECTS)
- $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
+ $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS}
$(PROFILE18_LIB): $(PROFILE18_OBJECTS)
- $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
+ $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS}
#
# GLX lib
@@ -264,4 +264,4 @@
# Clean
#
clean:
- rm -f *.o *.so
+ rm -f *.o *.so
\ No newline at end of file
Index: Eclipse_SWT_PI/gtk/library/build.sh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/build.sh,v
retrieving revision 1.40
diff -u -r1.40 build.sh
--- Eclipse_SWT_PI/gtk/library/build.sh 22 Nov 2005 04:48:15 -0000 1.40
+++ Eclipse_SWT_PI/gtk/library/build.sh 29 Sep 2006 13:21:51 -0000
@@ -87,9 +87,9 @@
fi
if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
+ if [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+ GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom`
+ GECKO_LIBS=`pkg-config --libs firefox-xpcom`
export GECKO_INCLUDES
export GECKO_LIBS
MAKE_MOZILLA=make_mozilla
Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp,v
retrieving revision 1.15.2.1
diff -u -r1.15.2.1 xpcom_stats.cpp
--- Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 26 Jul 2006 16:33:23 -0000 1.15.2.1
+++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 29 Sep 2006 13:21:49 -0000
@@ -31,15 +31,14 @@
#ifdef NATIVE_STATS
-int XPCOM_nativeFunctionCount = 132;
-int XPCOM_nativeFunctionCallCount[132];
+int XPCOM_nativeFunctionCount = 131;
+int XPCOM_nativeFunctionCallCount[131];
char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
"NS_1GetServiceManager",
- "NS_1InitEmbedding",
+ "NS_1InitXPCOM3_FUNC",
"NS_1NewLocalFile",
- "NS_1TermEmbedding",
"PR_1Free",
"PR_1Malloc",
"VtblCall__II",
Index: Eclipse_SWT_Mozilla/common/library/xpcom_profile.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_profile.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xpcom_profile.h
--- Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 26 Jul 2006 16:33:23 -0000 1.1.2.1
+++ Eclipse_SWT_Mozilla/common/library/xpcom_profile.h 29 Sep 2006 13:21:48 -0000
@@ -32,7 +32,7 @@
#define NDEBUG
#include "nsCOMPtr.h"
-#include "nsProfileDirServiceProvider.h"
+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
#include "xpcom_stats.h"
#endif /* INC_xpcom_profile_H */
Index: Eclipse_SWT_Mozilla/common/library/xpcom.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 xpcom.h
--- Eclipse_SWT_Mozilla/common/library/xpcom.h 26 Jul 2006 16:33:23 -0000 1.6.2.1
+++ Eclipse_SWT_Mozilla/common/library/xpcom.h 29 Sep 2006 13:21:48 -0000
@@ -32,7 +32,6 @@
#define NDEBUG
#include "nsXPCOM.h"
-#include "nsEmbedAPI.h"
#include "nsEmbedString.h"
#include "nsIInputStream.h"
#include "nsISupportsUtils.h"
Index: Eclipse_SWT_Mozilla/common/library/xpcom.cpp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp,v
retrieving revision 1.29.2.1
diff -u -r1.29.2.1 xpcom.cpp
--- Eclipse_SWT_Mozilla/common/library/xpcom.cpp 26 Jul 2006 16:33:23 -0000 1.29.2.1
+++ Eclipse_SWT_Mozilla/common/library/xpcom.cpp 29 Sep 2006 13:21:48 -0000
@@ -85,14 +85,16 @@
}
#endif
-#ifndef NO_NS_1InitEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#ifndef NO_NS_1InitXPCOM3
+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
- rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
- XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC);
+ rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1,
+ (nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3,
+ (PRUint32) arg4);
+ XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC);
return rc;
}
#endif
@@ -113,18 +115,6 @@
}
#endif
-#ifndef NO_NS_1TermEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding)
- (JNIEnv *env, jclass that)
-{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC);
- rc = (jint)NS_TermEmbedding();
- XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_PR_1Free
JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free)
(JNIEnv *env, jclass that, jint arg0)
Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 xpcom_stats.h
--- Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 26 Jul 2006 16:33:23 -0000 1.14.2.1
+++ Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 29 Sep 2006 13:21:49 -0000
@@ -41,9 +41,8 @@
Call_FUNC,
NS_1GetComponentManager_FUNC,
NS_1GetServiceManager_FUNC,
- NS_1InitEmbedding_FUNC,
+ NS_1InitXPCOM3_FUNC,
NS_1NewLocalFile_FUNC,
- NS_1TermEmbedding_FUNC,
PR_1Free_FUNC,
PR_1Malloc_FUNC,
VtblCall__II_FUNC,
Index: Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java,v
retrieving revision 1.61.2.2
diff -u -r1.61.2.2 Browser.java
--- Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 24 Aug 2006 20:19:25 -0000 1.61.2.2
+++ Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 29 Sep 2006 13:21:51 -0000
@@ -10,15 +10,75 @@
*******************************************************************************/
package org.eclipse.swt.browser;
-import java.io.*;
-import java.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.gtk.*;
-import org.eclipse.swt.internal.mozilla.*;
-import org.eclipse.swt.layout.*;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.internal.Callback;
+import org.eclipse.swt.internal.Converter;
+import org.eclipse.swt.internal.Library;
+import org.eclipse.swt.internal.gtk.GdkEvent;
+import org.eclipse.swt.internal.gtk.LONG;
+import org.eclipse.swt.internal.gtk.OS;
+import org.eclipse.swt.internal.mozilla.XPCOM;
+import org.eclipse.swt.internal.mozilla.XPCOMObject;
+import org.eclipse.swt.internal.mozilla.nsEmbedString;
+import org.eclipse.swt.internal.mozilla.nsIAppShell;
+import org.eclipse.swt.internal.mozilla.nsIBaseWindow;
+import org.eclipse.swt.internal.mozilla.nsICategoryManager;
+import org.eclipse.swt.internal.mozilla.nsIComponentManager;
+import org.eclipse.swt.internal.mozilla.nsIComponentRegistrar;
+import org.eclipse.swt.internal.mozilla.nsIContextMenuListener;
+import org.eclipse.swt.internal.mozilla.nsICookie;
+import org.eclipse.swt.internal.mozilla.nsICookieManager;
+import org.eclipse.swt.internal.mozilla.nsID;
+import org.eclipse.swt.internal.mozilla.nsIDOMEvent;
+import org.eclipse.swt.internal.mozilla.nsIDOMMouseEvent;
+import org.eclipse.swt.internal.mozilla.nsIDOMWindow;
+import org.eclipse.swt.internal.mozilla.nsIDirectoryService;
+import org.eclipse.swt.internal.mozilla.nsIDocShell;
+import org.eclipse.swt.internal.mozilla.nsIEmbeddingSiteWindow;
+import org.eclipse.swt.internal.mozilla.nsIFile;
+import org.eclipse.swt.internal.mozilla.nsIIOService;
+import org.eclipse.swt.internal.mozilla.nsIInterfaceRequestor;
+import org.eclipse.swt.internal.mozilla.nsILocalFile;
+import org.eclipse.swt.internal.mozilla.nsIPrefBranch;
+import org.eclipse.swt.internal.mozilla.nsIPrefLocalizedString;
+import org.eclipse.swt.internal.mozilla.nsIPrefService;
+import org.eclipse.swt.internal.mozilla.nsIProperties;
+import org.eclipse.swt.internal.mozilla.nsIRequest;
+import org.eclipse.swt.internal.mozilla.nsIServiceManager;
+import org.eclipse.swt.internal.mozilla.nsISimpleEnumerator;
+import org.eclipse.swt.internal.mozilla.nsISupports;
+import org.eclipse.swt.internal.mozilla.nsISupportsWeakReference;
+import org.eclipse.swt.internal.mozilla.nsITooltipListener;
+import org.eclipse.swt.internal.mozilla.nsIURI;
+import org.eclipse.swt.internal.mozilla.nsIURIContentListener;
+import org.eclipse.swt.internal.mozilla.nsIWeakReference;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowser;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChrome;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChromeFocus;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserFocus;
+import org.eclipse.swt.internal.mozilla.nsIWebBrowserStream;
+import org.eclipse.swt.internal.mozilla.nsIWebNavigation;
+import org.eclipse.swt.internal.mozilla.nsIWebProgress;
+import org.eclipse.swt.internal.mozilla.nsIWebProgressListener;
+import org.eclipse.swt.internal.mozilla.nsIWindowWatcher;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
/**
* Instances of this class implement the browser user interface
@@ -175,40 +235,43 @@
* - mozilla17profile/mozilla17profile-gcc should succeed for mozilla 1.7.x and firefox
* - mozilla18profile/mozilla18profile-gcc should succeed for mozilla 1.8.x (seamonkey)
*/
- try {
- Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e1) {
- try {
- Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e2) {
- try {
- Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e3) {
- try {
- Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e4) {
- try {
- Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e5) {
- try {
- Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$
- usingProfile = true;
- } catch (UnsatisfiedLinkError e6) {
- /*
- * fail silently, the Browser will still work without profile support
- * but will abort any attempts to navigate to HTTPS pages
- */
- }
- }
- }
- }
- }
- }
+// Library.loadLibrary("swt-mozilla17-profile");
+ // We build the profile stuff without the need for a separate DSO
+ usingProfile = true;
+// try {
+// Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e1) {
+// try {
+// Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e2) {
+// try {
+// Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e3) {
+// try {
+// Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e4) {
+// try {
+// Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e5) {
+// try {
+// Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$
+// usingProfile = true;
+// } catch (UnsatisfiedLinkError e6) {
+// /*
+// * fail silently, the Browser will still work without profile support
+// * but will abort any attempts to navigate to HTTPS pages
+// */
+// }
+// }
+// }
+// }
+// }
+// }
int /*long*/[] retVal = new int /*long*/[1];
nsEmbedString pathString = new nsEmbedString(mozillaPath);
@@ -218,11 +281,11 @@
if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
nsILocalFile localFile = new nsILocalFile(retVal[0]);
- rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0);
+ rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0);
localFile.Release();
if (rc != XPCOM.NS_OK) {
dispose();
- SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
rc = XPCOM.NS_GetComponentManager(result);
@@ -283,7 +346,7 @@
rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result);
if (rc != XPCOM.NS_OK) error(rc);
if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
- properties.Release();
+ // properties.Release() is now after the Set below
nsIFile profileDir = new nsIFile(result[0]);
result[0] = 0;
@@ -305,24 +368,15 @@
pathString.dispose(); //
profileDir = new nsIFile(result[0]);
- result[0] = 0;
-
- rc = XPCOM_PROFILE.NS_NewProfileDirServiceProvider(true, result);
+
+ // Set the profile dir property so that it's initialized for
+ // things like password manager and https
+ buffer = Converter.wcsToMbcs(null, XPCOM.NS_APP_USER_PROFILE_50_DIR, true);
+ rc = properties.Set(buffer, profileDir.getAddress());
if (rc != XPCOM.NS_OK) error(rc);
- if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
-
- final int /*long*/ dirServiceProvider = result[0];
+ properties.Release();
+
result[0] = 0;
- rc = XPCOM_PROFILE.ProfileDirServiceProvider_Register(dirServiceProvider);
- if (rc != XPCOM.NS_OK) error(rc);
- rc = XPCOM_PROFILE.ProfileDirServiceProvider_SetProfileDir(dirServiceProvider, profileDir.getAddress());
- if (rc != XPCOM.NS_OK) error(rc);
-
- getDisplay().addListener(SWT.Dispose, new Listener() {
- public void handleEvent(Event e) {
- XPCOM_PROFILE.ProfileDirServiceProvider_Shutdown(dirServiceProvider);
- }
- });
}
/*
@@ -1354,27 +1408,6 @@
tip = null;
BrowserCount--;
- /*
- * This code is intentionally commented. It is not possible to reinitialize
- * Mozilla once it has been terminated. NS_InitEmbedding always fails after
- * NS_TermEmbedding has been called. The workaround is to call NS_InitEmbedding
- * once and never call NS_TermEmbedding.
- */
-// if (BrowserCount == 0) {
-// if (AppShell != null) {
-// // Shutdown the appshell service.
-// rc = AppShell.Spindown();
-// if (rc != XPCOM.NS_OK) error(rc);
-// AppShell.Release();
-// AppShell = null;
-// }
-// WindowCreator.Release();
-// WindowCreator = null;
-// PromptService.Release();
-// PromptService = null;
-// XPCOM.NS_TermEmbedding();
-// mozilla = false;
-// }
}
void Activate() {
Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v
retrieving revision 1.48.2.1
diff -u -r1.48.2.1 XPCOM.java
--- Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 26 Jul 2006 16:33:23 -0000 1.48.2.1
+++ Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 29 Sep 2006 13:21:49 -0000
@@ -89,6 +89,7 @@
public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3;
public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$
+ public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$
public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
@@ -103,7 +104,6 @@
public static final native void memmove(byte[] dest, char[] src, int nbytes);
public static final native int NS_GetComponentManager(int /*long*/[] result);
public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
+public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount);
public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
-public static final native int NS_TermEmbedding();
public static final native int strlen_PRUnichar(int /*long*/ s);

View File

@ -1,14 +1,37 @@
--- build.xml.orig 2007-02-22 10:14:59.000000000 -0500 Index: build.xml
+++ build.xml 2007-03-01 10:38:05.000000000 -0500 ===================================================================
@@ -228,6 +228,11 @@ RCS file: /home/eclipse/org.eclipse.swt.gtk.linux.x86_64/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- build.xml 18 Apr 2005 20:27:37 -0000 1.3
+++ build.xml 26 Apr 2005 19:13:30 -0000
@@ -21,7 +21,6 @@
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- <!--compile the jar in org.eclipse.swt.tools-->
</target>
<target name="build.update.jar" depends="init">
@@ -200,8 +199,11 @@
</target> </target>
<target name="build.cfiles" depends="build.jars"> <target name="build.cfiles" depends="build.jars">
+ <!-- delete swttools.jar so that it will be compiled in the build.jars target --> + <!--compile the jar in org.eclipse.swt.tools-->
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
+ <!--compile swtools.jar in org.eclipse.swt.tools-->
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" /> + <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
+ +
<!-- generate the C code from the (64 bit) SWT PI java classes --> <!-- generate the C code from the (64 bit) SWT PI java classes -->
<!-- assumes the swt.jar has already been built --> - <!-- assumes the swt.jar has already been built -->
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java> + <!-- assumes the swttools.jar has already been built -->
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
@@ -304,6 +306,8 @@
<delete file="${plugin.destination}/${full.name}.jar"/>
<delete file="${plugin.destination}/${full.name}.zip"/>
<delete dir="${temp.folder}"/>
+ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
</target>
<target name="refresh" depends="init" if="eclipse.running">

View File

@ -1,53 +1,53 @@
--- build.xml.orig 2006-07-05 12:47:26.000000000 -0400 --- build.xml.orig 2006-07-05 12:47:26.000000000 -0400
+++ build.xml 2006-07-05 12:50:49.000000000 -0400 +++ build.xml 2006-07-05 12:50:49.000000000 -0400
@@ -144,50 +144,56 @@ @@ -144,50 +144,56 @@
<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-swing.jar"/> <pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-trax.jar"/> <pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
<pathelement path="../org.apache.ant_1.7.0.v200705232135/lib/ant-weblogic.jar"/> <pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
- <pathelement path="catalina.jar"/> - <pathelement path="catalina.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/catalina.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
- <pathelement path="bootstrap.jar"/> - <pathelement path="bootstrap.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/bootstrap.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
- <pathelement path="commons-beanutils.jar"/> - <pathelement path="commons-beanutils.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-beanutils.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
- <pathelement path="commons-collections.jar"/> - <pathelement path="commons-collections.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-collections.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
- <pathelement path="commons-digester.jar"/> - <pathelement path="commons-digester.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-digester.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
- <pathelement path="commons-logging-api.jar"/> - <pathelement path="commons-logging-api.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-logging-api.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
- <pathelement path="commons-modeler.jar"/> - <pathelement path="commons-modeler.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-modeler.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
- <pathelement path="jakarta-regexp-1.3.jar"/> - <pathelement path="jakarta-regexp-1.3.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jakarta-regexp-1.3.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
- <pathelement path="jasper-compiler.jar"/> - <pathelement path="jasper-compiler.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-compiler.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
- <pathelement path="jasper-runtime.jar"/> - <pathelement path="jasper-runtime.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-runtime.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
- <pathelement path="mx4j-jmx.jar"/> - <pathelement path="mx4j-jmx.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/mx4j-jmx.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
- <pathelement path="naming-common.jar"/> - <pathelement path="naming-common.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-common.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
- <pathelement path="naming-factory.jar"/> - <pathelement path="naming-factory.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-factory.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
- <pathelement path="naming-resources.jar"/> - <pathelement path="naming-resources.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-resources.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
- <pathelement path="servlet.jar"/> - <pathelement path="servlet.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlet.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="servlets-common.jar"/> - <pathelement path="servlets-common.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-common.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
- <pathelement path="servlets-default.jar"/> - <pathelement path="servlets-default.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-default.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
- <pathelement path="servlets-invoker.jar"/> - <pathelement path="servlets-invoker.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-invoker.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
- <pathelement path="servlets-manager.jar"/> - <pathelement path="servlets-manager.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-manager.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
- <pathelement path="tomcat-coyote.jar"/> - <pathelement path="tomcat-coyote.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-coyote.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
- <pathelement path="tomcat-http11.jar"/> - <pathelement path="tomcat-http11.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-http11.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
- <pathelement path="tomcat-util.jar"/> - <pathelement path="tomcat-util.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-util.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
+ <pathelement path="lib/catalina.jar"/> + <pathelement path="lib/catalina.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
+ <pathelement path="lib/catalina-optional.jar"/> + <pathelement path="lib/catalina-optional.jar"/>

View File

@ -736,7 +736,7 @@ diff -u -r1.21 MANIFEST.MF
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
Bundle-Version: 4.1.230.qualifier Bundle-Version: 4.1.130.qualifier
Bundle-ClassPath: tomcatwrapper.jar, Bundle-ClassPath: tomcatwrapper.jar,
- catalina.jar, - catalina.jar,
- bootstrap.jar, - bootstrap.jar,
@ -860,5 +860,5 @@ diff -u -r1.21 MANIFEST.MF
+ org.apache.tomcat.util.threads;x-internal:=true, + org.apache.tomcat.util.threads;x-internal:=true,
+ org.eclipse.tomcat.internal;x-internal:=true, + org.eclipse.tomcat.internal;x-internal:=true,
+ org.eclipse.tomcat.internal;x-internal:=true, + org.eclipse.tomcat.internal;x-internal:=true,
org.eclipse.tomcat.internal.extensions org.eclipse.tomcat.internal.extensions;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4

256
eclipse-updatehomedir.patch Normal file
View File

@ -0,0 +1,256 @@
Index: src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java,v
retrieving revision 1.12.2.1
diff -u -r1.12.2.1 InstallWizard2.java
--- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 23 Aug 2006 03:55:35 -0000 1.12.2.1
+++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 25 Sep 2006 22:38:03 -0000
@@ -153,7 +153,7 @@
addPage(licensePage);
optionalFeaturesPage = new OptionalFeaturesPage(config);
addPage(optionalFeaturesPage);
- targetPage = new TargetPage(config);
+ targetPage = new TargetPage(config, isUpdate);
addPage(targetPage);
}
Index: src/org/eclipse/update/internal/ui/wizards/TargetPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java,v
retrieving revision 1.81.2.1
diff -u -r1.81.2.1 TargetPage.java
--- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 23 Aug 2006 03:55:35 -0000 1.81.2.1
+++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 25 Sep 2006 22:38:03 -0000
@@ -18,6 +18,9 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -92,6 +95,7 @@
private Label installLocation;
private Button changeLocation;
static HashSet added;
+ private boolean isUpdate; // whether the wizard is updating a feature or installing a new one
class JobsContentProvider
extends DefaultContentProvider
@@ -236,13 +240,14 @@
/**
* Constructor for ReviewPage2
*/
- public TargetPage(IInstallConfiguration config) {
+ public TargetPage(IInstallConfiguration config, boolean isUpdate) {
super("Target"); //$NON-NLS-1$
setTitle(UpdateUIMessages.InstallWizard_TargetPage_title);
setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc);
this.config = config;
UpdateUI.getDefault().getLabelProvider().connect(this);
configListener = new ConfigListener();
+ this.isUpdate = isUpdate;
}
public void setJobs(IInstallFeatureOperation[] jobs) {
@@ -273,7 +278,7 @@
label.setLayoutData(gd);
installLocation = new Label(client, SWT.NULL);
- installLocation.setText("foo"); //$NON-NLS-1$
+ installLocation.setText(""); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
installLocation.setLayoutData(gd);
@@ -656,12 +661,45 @@
continue;
}
- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
+ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
+ if (csite == null && Platform.getInstallLocation().isReadOnly() && isUpdate == false) {
+ // there are no updateable sites, the installation location is read-only and we are installing a new feature
+ // make an update site in the user's home direcotry
+ File site = new File(System.getProperty("user.home") + File.separator + ".eclipse" + File.separator + //$NON-NLS-1$ //$NON-NLS-2$
+ Platform.getProduct().getId() + File.separator + "updates"); //$NON-NLS-1$
+
+ try {
+ csite = config.createConfiguredSite(site);
+ config.addConfiguredSite(csite);
+ IStatus status = csite.verifyUpdatableStatus();
+ if (!status.isOK())
+ throw new CoreException(status);
+
+ } catch (CoreException e) {
+ // there was a problem, the user must choose an installation site
+ csite = null;
+ // no need to check if the directory exists because File.delete() returns false if it's not there
+ deleteDir(site);
+ }
+ }
+ jobs[i].setTargetSite(csite);
}
}
-
+
+ private boolean deleteDir(File dir) {
+ if (dir.isDirectory()) {
+ String[] files = dir.list();
+ for (int i=0; i < files.length; i++) {
+ if (!deleteDir(new File(dir, files[i]))) {
+ return false;
+ }
+ }
+ }
+ return dir.delete();
+ }
+
private IConfiguredSite getMostReceantlyUsedSite() {
IDialogSettings master = UpdateUI.getDefault().getDialogSettings();
IDialogSettings section = master.getSection(TargetSiteDialog.MOST_RECEANTLY_USED_SITE_URL);
@@ -696,7 +734,7 @@
IConfiguredSite[] sites = config.getConfiguredSites();
for (int i = 0; i < sites.length; i++) {
IConfiguredSite csite = sites[i];
- if (getSiteVisibility(csite, job))
+ if (getSiteVisibility(csite, job) && csite.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
return csite;
}
return null;
Index: src/org/eclipse/update/search/UpdateSearchRequest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java,v
retrieving revision 1.31
diff -u -r1.31 UpdateSearchRequest.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 8 Aug 2006 20:21:42 -0000 1.31
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 25 Sep 2006 22:38:05 -0000
@@ -282,6 +282,10 @@
// currently, the next conditional is only executed (qsite!=null) when
// running an update search.
if (qsite != null && searchFeatureProvidedSites) {
+ // do not update features that are installed in read-only locations
+ IFeature feature = query.getFeature();
+ if (feature != null && !feature.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
+ continue;
// check for mapping
IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite);
// when there is no mapped site the feature is not updatable
Index: src/org/eclipse/update/search/IUpdateSearchQuery.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java,v
retrieving revision 1.8
diff -u -r1.8 IUpdateSearchQuery.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 1 Mar 2005 20:29:16 -0000 1.8
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 25 Sep 2006 22:38:05 -0000
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat Incorporated - getFeature() API addition
*******************************************************************************/
package org.eclipse.update.search;
@@ -50,4 +51,12 @@
* @param monitor a progress monitor to report search progress within the provided site
*/
public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor);
+
+/**
+ * Returns IFeature associated with the IUpdateSearchQuery
+ *
+ * @return the IFeature that is associated with the IUpdateSearchQuery
+ * @since 3.2
+ */
+ public IFeature getFeature();
}
Index: src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java,v
retrieving revision 1.9
diff -u -r1.9 OptionalFeatureSearchCategory.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 11 Apr 2006 15:47:09 -0000 1.9
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 25 Sep 2006 22:38:05 -0000
@@ -76,6 +76,13 @@
public IQueryUpdateSiteAdapter getQuerySearchSite() {
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
+ */
+ public IFeature getFeature() {
+ return null;
+ }
}
public void addVersionedIdentifier(VersionedIdentifier vid) {
Index: src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java,v
retrieving revision 1.27
diff -u -r1.27 UpdatesSearchCategory.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 11 Apr 2006 15:47:09 -0000 1.27
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 25 Sep 2006 22:38:05 -0000
@@ -285,6 +285,10 @@
monitor.worked(1);
monitor.done();
}
+
+ public IFeature getFeature() {
+ return candidate;
+ }
}
private ArrayList candidates;
Index: src/org/eclipse/update/internal/search/SiteSearchCategory.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 SiteSearchCategory.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 18 Aug 2006 23:31:21 -0000 1.14.2.1
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 25 Sep 2006 22:38:05 -0000
@@ -133,6 +133,14 @@
public IQueryUpdateSiteAdapter getQuerySearchSite() {
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
+ */
+ public IFeature getFeature() {
+ return null;
+ }
+
}
public SiteSearchCategory() {
Index: src/org/eclipse/update/internal/core/ConfiguredSite.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java,v
retrieving revision 1.96
diff -u -r1.96 ConfiguredSite.java
--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 30 Mar 2006 02:34:37 -0000 1.96
+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java 25 Sep 2006 22:38:05 -0000
@@ -35,6 +35,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.util.NLS;
import org.eclipse.update.configuration.IActivity;
import org.eclipse.update.configuration.IConfiguredSite;
@@ -803,7 +804,9 @@
}
} else {
File container = getSiteContaining(file);
- if (container != null) {
+ // allow the install location to pass even though it looks like this
+ // site is contained in another site
+ if (container != null && !siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) {
verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null);
return verifyStatus;
}

View File

@ -0,0 +1,158 @@
--- features/org.eclipse.platform/build.xml.orig 2006-06-01 15:45:39.000000000 -0400
+++ features/org.eclipse.platform/build.xml 2006-06-01 15:45:08.000000000 -0400
@@ -394,6 +394,11 @@
<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060525a-gszCg6CPhlzUdGe/feature.xml" selfVersion="3.2.0.v20060525a-gszCg6CPhlzUdGe" featureIds="org.eclipse.rcp,3.2.0.v20060511-2000-wbi2Ul87V-MbMKc," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060510a,org.eclipse.ant.core,3.1.100.v20060511,org.eclipse.compare,3.2.0.v20060525,org.eclipse.core.boot,3.1.100.v20060511,org.eclipse.core.filebuffers,3.2.0.v20060518-0800,org.eclipse.core.filesystem,1.0.0.v20060510,org.eclipse.core.resources,3.2.0.v20060512,org.eclipse.core.resources.compatibility,3.2.0.v20060510,org.eclipse.core.runtime.compatibility,3.1.100.v20060511,org.eclipse.osgi.services,3.1.100.v20060511,org.eclipse.osgi.util,3.1.100.v20060511,org.eclipse.core.variables,3.1.100.v20060517,org.eclipse.debug.core,3.2.0.v20060525,org.eclipse.debug.ui,3.2.0.v20060525a,org.eclipse.help.webapp,3.2.0.v20060510b,org.eclipse.help.base,3.2.0.v20060510a,org.eclipse.help.ui,3.2.0.v20060510b,org.eclipse.help.appserver,3.1.100.v20060510b,org.eclipse.ltk.core.refactoring,3.2.0.v20060526-0010,org.eclipse.ltk.ui.refactoring,3.2.0.v20060526-0010,org.eclipse.platform,3.2.0.v20060525,org.eclipse.platform.doc.user,3.2.0.v20060525,org.eclipse.search,3.2.0.v20060526-0010,org.eclipse.team.core,3.2.0.I200605181830,org.eclipse.team.cvs.core,3.2.0.I20060510,org.eclipse.team.cvs.ssh,3.2.0.I20060510,org.eclipse.team.cvs.ssh2,3.2.0.I20060510,org.eclipse.team.cvs.ui,3.2.0.I200605251705,org.eclipse.team.ui,3.2.0.I200605181830,org.eclipse.tomcat,4.1.130.v20060510a,org.eclipse.text,3.2.0.v20060518-0800,org.eclipse.jface.text,3.2.0.v20060518-0800,org.eclipse.ui.console,3.1.100.v20060518,org.eclipse.ui.presentations.r21,3.2.0.I20060511-2000,org.eclipse.ui.intro,3.2.0.v20060518,org.eclipse.ui.intro.universal,3.2.0.v20060510b,org.eclipse.ui.cheatsheets,3.2.0.v20060516,org.eclipse.ui.browser,3.2.0.v20060518,org.eclipse.ui.navigator,3.2.0.I20060526-0010,org.eclipse.ui.navigator.resources,3.2.0.I20060511-2000,org.eclipse.ui.workbench.texteditor,3.2.0.v20060526-0010,org.eclipse.ui.views,3.2.0.I20060511-2000,org.eclipse.ui.editors,3.2.0.v20060518-0800,org.eclipse.ui.forms,3.2.0.v20060510,org.eclipse.ui.externaltools,3.1.100.v20060511,org.eclipse.ui.ide,3.2.0.I20060519-0010,org.eclipse.update.core,3.2.0.v20060511,org.eclipse.update.scheduler,3.2.0.v20060511,org.eclipse.update.ui,3.2.0.v20060511,org.eclipse.ui.workbench.compatibility,3.2.0.I20060511-2000,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060510,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060510,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060510,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060510,org.eclipse.core.filesystem.macosx,1.0.0.v20060502,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060510,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060510,org.eclipse.core.resources.win32,3.2.0.v20060510,org.eclipse.ui.carbon,3.2.0.I20060519-0010,org.eclipse.ui.win32,3.2.0.I20060511-2000,org.eclipse.update.core.linux,3.2.0.v20060511,org.eclipse.update.core.win32,3.2.0.v20060511,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060511-0800a,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060426,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
+ <target name="copybuiltlauncher" if="libsconfig">
+ <copy todir="${feature.base}/${os}.${ws}.${arch}/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/../../launchertmp" includes="**" />
+ </copy>
+ </target>
<target name="rootFileswin32_win32_x86">
<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -402,6 +407,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesmacosx_carbon_ppc">
@@ -412,6 +419,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" />
<exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux">
@@ -429,6 +438,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -440,6 +451,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" />
</target>
@@ -451,6 +464,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" />
</target>
@@ -463,6 +478,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" />
</target>
@@ -474,6 +491,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_motif_x86">
@@ -487,6 +506,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -498,6 +519,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilessolaris_gtk_x86">
@@ -508,6 +531,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilessolaris_motif_sparc">
@@ -518,6 +543,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesaix_motif_ppc">
@@ -528,6 +555,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_PA_RISC">
@@ -538,6 +567,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64">
@@ -548,6 +579,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64_32">
@@ -558,6 +591,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesqnx_photon_x86">
@@ -568,6 +603,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesgroup_group_group">

View File

@ -0,0 +1,90 @@
Index: build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
retrieving revision 1.71
diff -u -r1.71 build.xml
--- build.xml 16 Mar 2006 21:57:15 -0000 1.71
+++ build.xml 5 Jul 2006 15:48:12 -0000
@@ -84,8 +84,8 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
</classpath>
<src path="src/" />
<compilerarg line="-log ${temp.folder}/webapp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -141,8 +141,12 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/tomcat-util.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-el.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-logging.jar"/>
</classpath>
<src path="src_servlets/" />
<compilerarg line="-log ${temp.folder}/WEB-INF/lib/servlets.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -170,21 +174,22 @@
<!-- generate java code from JSPs -->
<path id="jasper.classpath" >
<pathelement location="../org.apache.ant/lib/ant.jar"/>
- <pathelement location="../org.apache.ant/lib/optional.jar"/>
- <pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
- <pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
- <pathelement location="../org.eclipse.tomcat/servlet.jar" />
- <pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />
+ <pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
+ <pathelement location="../org.eclipse.tomcat/lib/jasper-compiler.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/jasper-runtime.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/commons-logging-api.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/commons-el.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/jspapi.jar" />
</path>
<delete dir="${temp.folder}/jsp.jar.src"/>
<mkdir dir="${temp.folder}/jsp.jar.src"/>
<java
classname="org.apache.jasper.JspC"
fork="true"
- failonerror="false"
+ failonerror="true"
classpathref="jasper.classpath"
output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
- <arg value="-v3" />
<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
<arg value="-die" />
<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
@@ -222,8 +227,9 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
</classpath>
<src path="${temp.folder}/jsp.jar.src/" />
<compilerarg line="-log ${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
Index: build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v
retrieving revision 1.32
diff -u -r1.32 build.properties
--- build.properties 18 Mar 2005 08:00:28 -0000 1.32
+++ build.properties 5 Jul 2006 15:48:11 -0000
@@ -33,5 +33,5 @@
../org.eclipse.help.appserver/bin,\
../org.eclipse.help.appserver,\
../org.eclipse.help.appserver/@dot,\
- ../org.eclipse.tomcat/servlet.jar,\
- ../org.eclipse.tomcat/jasper-runtime.jar
+ ../org.eclipse.tomcat/lib/servletapi5.jar,\
+ ../org.eclipse.tomcat/lib/jasper-runtime.jar

View File

@ -0,0 +1,22 @@
Index: src/org/eclipse/pde/internal/core/plugin/PluginHandler.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginHandler.java,v
retrieving revision 1.6
diff -u -r1.6 PluginHandler.java
--- src/org/eclipse/pde/internal/core/plugin/PluginHandler.java 3 Apr 2006 19:48:18 -0000 1.6
+++ src/org/eclipse/pde/internal/core/plugin/PluginHandler.java 17 Nov 2006 22:18:53 -0000
@@ -52,11 +52,13 @@
}
}
+ boolean setLineAttr = false;
Element element = fDocument.createElement(qName);
for (int i = 0; i < attributes.getLength(); i++) {
element.setAttribute(attributes.getQName(i), attributes.getValue(i));
- if ("extension".equals(qName) || "extension-point".equals(qName)) { //$NON-NLS-1$ //$NON-NLS-2$
+ if (("extension".equals(qName) || "extension-point".equals(qName)) && !setLineAttr) { //$NON-NLS-1$ //$NON-NLS-2$
element.setAttribute("line", Integer.toString(fLocator.getLineNumber())); //$NON-NLS-1$
+ setLineAttr = true;
}
}

View File

@ -1,6 +0,0 @@
#!/bin/sh
exec @LIBDIR@/eclipse/eclipse \
--launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.@ECLIPSELIBSUFFIX@ \
-startup /usr/share/eclipse/startup.jar \
${1+"$@"}

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,4 @@
c3be75d8af3c31b7a1748247ab3fee95 icu4jsrc_3_4_5.jar
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
8a50adfea6b126fdbd231a620f94a5ca eclipse-sourceBuild-srcIncluded-3.3RC4.zip 5d1b9f6a146ffc59191e513083a6ec86 eclipse-sourceBuild-srcIncluded-3.2.2.zip
3f5ee621f738ee107e312817dadacab4 eclipse-fedora-splash-3.3.0.png d48b18e6e50ce7713242a3e0092fdbe9 eclipse-fedora-splash-3.2.2.png