- Build with eclipse-build 0.4.0 RC0.
This commit is contained in:
Alexander Kurtakov
parent
4d25313152
commit
fa9c551ca7
|
|
@ -3,3 +3,4 @@ eclipse-ecj-gcj.tar.bz2
|
|||
eclipse-I20090611-1540-fetched-src.tar.bz2
|
||||
eclipse-build-R0_3_0.tar.gz
|
||||
ecf-filetransfer-v20090604-1131.tar.bz2
|
||||
eclipse-build-0_4_RC0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
--- assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig 2009-04-17 16:10:31.000000000 +0200
|
||||
+++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2009-04-17 16:16:48.000000000 +0200
|
||||
@@ -205,6 +205,7 @@
|
||||
<customGather dir="plugins/org.eclipse.update.scheduler" projectName="org.eclipse.update.scheduler_3.2.200.v20081127" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.200.v20090213" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
<customGather dir="plugins/org.eclipse.ui.workbench.compatibility" projectName="org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
+ <customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
<customGather dir="plugins/org.eclipse.core.variables" projectName="org.eclipse.core.variables_3.2.200.v20090302-1500" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
<customGather dir="plugins/org.eclipse.ui.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090413" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
|
||||
@@ -838,6 +839,10 @@
|
||||
</antcall>
|
||||
<antcall target="jarUp">
|
||||
<param name="source" value="${eclipse.plugins}"/>
|
||||
+ <param name="elementName" value="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316"/>
|
||||
+ </antcall>
|
||||
+ <antcall target="jarUp">
|
||||
+ <param name="source" value="${eclipse.plugins}"/>
|
||||
<param name="elementName" value="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800"/>
|
||||
</antcall>
|
||||
<antcall target="jarUp">
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.nonupstreamarches ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties
|
||||
--- ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.nonupstreamarches 2008-07-29 09:36:30.000000000 -0400
|
||||
+++ ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-07-29 09:37:19.000000000 -0400
|
||||
@@ -21,6 +21,7 @@ root.linux.motif.x86=eclipse,libcairo-sw
|
||||
root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.ia64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
+root.linux.gtk.s390x=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.ppc=eclipse
|
||||
root.macosx.carbon.ppc=eclipse,Eclipse.app/
|
||||
root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product
|
||||
--- ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation 2009-09-14 11:04:38.000000000 -0400
|
||||
+++ ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product 2009-09-14 10:56:56.000000000 -0400
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
<launcherArgs>
|
||||
<programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
|
||||
- <vmArgs>-Xms40m -Xmx256m</vmArgs>
|
||||
+ <vmArgs>-Xms40m -Xmx256m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
|
||||
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
|
||||
</launcherArgs>
|
||||
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
--- ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml.orig 2009-03-24 18:54:29.000000000 +0100
|
||||
+++ ./plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2009-03-25 10:02:07.000000000 +0100
|
||||
@@ -276,6 +276,10 @@
|
||||
</target>
|
||||
|
||||
<target name="build.cfiles" depends="build.jars">
|
||||
+ <!-- delete swttools.jar so that it will be compiled in the build.jars target -->
|
||||
+ <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" />
|
||||
<!-- generate the C code from the (64 bit) SWT PI java classes -->
|
||||
<!-- 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">
|
||||
@@ -325,6 +329,7 @@
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library" />
|
||||
+ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
|
||||
<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library" />
|
||||
--- ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml.orig 2009-03-24 18:54:28.000000000 +0100
|
||||
+++ ./plugins/org.eclipse.swt.gtk.linux.ppc/build.xml 2009-03-25 10:06:41.000000000 +0100
|
||||
@@ -139,6 +139,29 @@
|
||||
<jar jarfile="${build.result.folder}/${jar.filename}" basedir="${temp.folder}/@dot.bin" />
|
||||
<delete dir="${temp.folder}/@dot.bin" />
|
||||
</target>
|
||||
+
|
||||
+ <target name="build.cfiles" depends="init">
|
||||
+ <mkdir dir="${build.result.folder}/library"/>
|
||||
+ <copy todir="${build.result.folder}/library">
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
|
||||
+ </copy>
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="build.nativeLibraries" depends="build.cfiles">
|
||||
+ <exec dir="${build.result.folder}/library" executable="sh">
|
||||
+ <env key="OUTPUT_DIR" value="${build.result.folder}"/>
|
||||
+ <arg line="${build.result.folder}/library/build.sh"/>
|
||||
+ <arg line="install"/>
|
||||
+ </exec>
|
||||
+ </target>
|
||||
|
||||
<target name="build.jars" depends="init">
|
||||
<available property="@dot" file="${build.result.folder}/@dot" />
|
||||
--- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.orig 2009-03-24 18:54:29.000000000 +0100
|
||||
+++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml 2009-03-25 10:08:51.000000000 +0100
|
||||
@@ -330,6 +335,7 @@
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library" />
|
||||
+ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
|
||||
<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library" />
|
||||
<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library" />
|
||||
--- ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml.orig 2009-03-24 18:54:29.000000000 +0100
|
||||
+++ ./plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml 2009-03-25 10:11:05.000000000 +0100
|
||||
@@ -175,6 +175,29 @@
|
||||
<replace dir="${plugindir}" includes="**/*.java" token="long /*int*/" value="int /*long*/" />
|
||||
<antcall target="refresh" />
|
||||
</target>
|
||||
+
|
||||
+ <target name="build.cfiles" depends="init">
|
||||
+ <mkdir dir="${build.result.folder}/library"/>
|
||||
+ <copy todir="${build.result.folder}/library">
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
|
||||
+ </copy>
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="build.nativeLibraries" depends="build.cfiles">
|
||||
+ <exec dir="${build.result.folder}/library" executable="sh">
|
||||
+ <env key="OUTPUT_DIR" value="${build.result.folder}"/>
|
||||
+ <arg line="${build.result.folder}/library/build.sh"/>
|
||||
+ <arg line="install"/>
|
||||
+ </exec>
|
||||
+ </target>
|
||||
|
||||
<target name="src.zip" depends="init" unless="src.zip">
|
||||
<mkdir dir="${build.result.folder}/" />
|
||||
--- ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml.orig 2009-03-24 18:54:28.000000000 +0100
|
||||
+++ ./plugins/org.eclipse.swt.gtk.linux.x86/build.xml 2009-03-25 10:13:29.000000000 +0100
|
||||
@@ -153,13 +153,14 @@
|
||||
<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library" />
|
||||
<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library" />
|
||||
<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library" />
|
||||
+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
|
||||
<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library" />
|
||||
<fileset dir="${plugindir}/Eclipse SWT Program/cde/library" />
|
||||
<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
- <target name="build.jnilibs" depends="build.cfiles">
|
||||
+ <target name="build.nativeLibraries" depends="build.cfiles">
|
||||
<exec dir="${build.result.folder}/library" executable="sh">
|
||||
<env key="OUTPUT_DIR" value="${build.result.folder}" />
|
||||
<arg line="${build.result.folder}/library/build.sh" />
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
--- build.xml.compilelibs 2008-07-25 09:15:34.000000000 -0400
|
||||
+++ build.xml 2008-07-25 09:15:40.000000000 -0400
|
||||
@@ -1,7 +1,7 @@
|
||||
<project name="Eclipse SDK Source Build" default="run" basedir=".">
|
||||
|
||||
<!-- default target that runs complete build -->
|
||||
- <target name="run" depends="fetch,insertBuildId,compile,install" />
|
||||
+ <target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />
|
||||
|
||||
<!-- all features required to build eclipse sdk and javadoc -->
|
||||
<target name="allElements">
|
||||
@@ -71,6 +71,33 @@
|
||||
<record name="compilelog.txt" action="stop" />
|
||||
</target>
|
||||
|
||||
+ <target name="compilelibs" depends="init,clean,compile" if="libsconfig">
|
||||
+ <ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
|
||||
+
|
||||
+ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
|
||||
+ <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
|
||||
+ <arg line="build.sh" />
|
||||
+ </exec>
|
||||
+ <copy file="${launcherlibs}/library/${installWs}/eclipse" todir="${buildDirectory}/eclipse/" />
|
||||
+
|
||||
+ <property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />
|
||||
+
|
||||
+ <copy file="${launcherlibs}/library/${installWs}/eclipse" todir="features/org.eclipse.equinox.executable/contributed/${installWs}/${installOs}/${installArch}/" />
|
||||
+ <copy todir="${buildDirectory}/plugins/${launcherfragment}">
|
||||
+ <fileset dir="${launcherlibs}/library/${installWs}">
|
||||
+ <include name="**/*.so" />
|
||||
+ </fileset>
|
||||
+ </copy>
|
||||
+
|
||||
+ <!-- build liblocalfile -->
|
||||
+ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}" executable="make" failonerror="true" />
|
||||
+ <move file="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.${installOs}.${installArch}/os/${installOs}/${installArch}">
|
||||
+ </move>
|
||||
+ <!-- build libupdate -->
|
||||
+ <ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" />
|
||||
+
|
||||
+ </target>
|
||||
+
|
||||
<!--create an installable eclipse runtime-->
|
||||
<target name="install" depends="init">
|
||||
<echo message="Assembling..." />
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
# Eclipse runtime configuration file
|
||||
# This file contains a number of key/value pairs that are merged into the
|
||||
# System properties on system startup. The values control the way the
|
||||
# runtime is structured and runs.
|
||||
|
||||
# Note: Only platform:/base/ and file: URLs are supported. In general the
|
||||
# URLs given may include a version number (e.g., .../location_1.2.3).
|
||||
# If a version is not specified, the system binds
|
||||
# to the location which matches exactly or to the versioned location with the
|
||||
# latest version number. If a version number is given then only exact matches
|
||||
# are considered.
|
||||
|
||||
# The URL for the runtime entry point. The default value is
|
||||
# platform:/base/plugins/org.eclipse.osgi
|
||||
#osgi.framework=platform:/base/plugins/org.eclipse.osgi
|
||||
|
||||
# The classpath for the framework found at the osgi.framework location. This
|
||||
# comma-separated list contains either URLs or simple element names. Simple
|
||||
# names are assumed to be relative to the framework's install directory.
|
||||
# Typically this value need not be set as it is initialized by the framework itself.
|
||||
# Version match searching is not done for URLs listed here.
|
||||
#osgi.frameworkClassPath =
|
||||
|
||||
# The comma-separated list of locations to search for the splash screen file (splash.bmp).
|
||||
# For each list element a subdirectory structure based on the pattern nl/<locale> is searched.
|
||||
# The system binds to the first matching file. There is no default value.
|
||||
#osgi.splashPath=
|
||||
|
||||
# The location of the splash screen file. If this value is set at system startup it is used
|
||||
# in favour of the osgi.splashPath searching outlined above. If the value is not set
|
||||
# the searching is done and this key is bound to the result of the search.
|
||||
#osgi.splashLocation =
|
||||
|
||||
# The comma-separated list of bundles which are automatically installed and optionally started
|
||||
# once the system is up and running. Each entry if of the form
|
||||
# <URL | simple bundle location>[@ [<startlevel>] [":start"]]
|
||||
# If the startlevel is omitted then the framework will use the default start level for the bundle.
|
||||
# If the "start" tag is added then the bundle will be marked as started after being installed.
|
||||
# Simple bundle locations are interepreted as relative to the framework's parent directory.
|
||||
# The startlevel indicates the OSGi start level at which the bundle should run.
|
||||
osgi.bundles=\
|
||||
org.eclipse.core.databinding.observable,\
|
||||
org.eclipse.core.jobs,\
|
||||
org.eclipse.core.runtime,\
|
||||
org.eclipse.ecf,\
|
||||
org.eclipse.ecf.filetransfer,\
|
||||
org.eclipse.ecf.provider.filetransfer.httpclient,\
|
||||
org.eclipse.ecf.identity,\
|
||||
org.eclipse.ecf.provider.filetransfer,\
|
||||
org.eclipse.equinox.app@start,\
|
||||
org.eclipse.equinox.common,\
|
||||
org.eclipse.equinox.frameworkadmin,\
|
||||
org.eclipse.equinox.frameworkadmin.equinox@start,\
|
||||
org.eclipse.equinox.p2.artifact.repository,\
|
||||
org.eclipse.equinox.p2.console,\
|
||||
org.eclipse.equinox.p2.core,\
|
||||
org.eclipse.equinox.p2.director,\
|
||||
org.eclipse.equinox.p2.director.app,\
|
||||
org.eclipse.equinox.p2.engine,\
|
||||
org.eclipse.equinox.p2.exemplarysetup@start,\
|
||||
org.eclipse.equinox.p2.jarprocessor,\
|
||||
org.eclipse.equinox.p2.metadata,\
|
||||
org.eclipse.equinox.p2.metadata.repository,\
|
||||
org.eclipse.equinox.p2.touchpoint.eclipse,\
|
||||
org.eclipse.equinox.p2.touchpoint.natives,\
|
||||
org.eclipse.equinox.registry,\
|
||||
org.eclipse.equinox.simpleconfigurator,\
|
||||
org.eclipse.equinox.simpleconfigurator.manipulator@start,\
|
||||
org.eclipse.osgi.services,\
|
||||
org.eclipse.update.configurator,\
|
||||
org.sat4j.core,\
|
||||
org.sat4j.pb
|
||||
|
||||
org.eclipse.update.reconcile=false
|
||||
|
||||
# The product to run. A given Eclipse configuration may contain many products.
|
||||
# The product identified will supply the branding (window icons, title bar text) etc
|
||||
# as well as define the default application to run.
|
||||
#eclipse.product=
|
||||
|
||||
# The application to run. The value specified here is the id of the application extension
|
||||
# the runtime will find, instantiate and execute once the system is up. Note that typically
|
||||
# the identified eclipse.product defines the default application to run.
|
||||
#eclipse.application=
|
||||
|
||||
# The build identifier
|
||||
eclipse.buildId=@build@
|
||||
|
||||
# End of file marker - must be here
|
||||
eof=eof
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff -up features/org.eclipse.help.source/build.properties.dontpackicu4jsource features/org.eclipse.help.source/build.properties
|
||||
--- features/org.eclipse.help.source/build.properties.dontpackicu4jsource 2008-07-08 11:17:59.000000000 -0400
|
||||
+++ features/org.eclipse.help.source/build.properties 2008-07-08 11:18:35.000000000 -0400
|
||||
@@ -15,5 +15,5 @@ feature.xml,\
|
||||
feature.properties,\
|
||||
license.html
|
||||
|
||||
-generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier;unpack="false"
|
||||
+generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier
|
||||
|
||||
diff -up features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource features/org.eclipse.help/sourceTemplateFeature/build.properties
|
||||
--- features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource 2008-07-08 11:18:12.000000000 -0400
|
||||
+++ features/org.eclipse.help/sourceTemplateFeature/build.properties 2008-07-08 11:18:32.000000000 -0400
|
||||
@@ -15,5 +15,5 @@ feature.xml,\
|
||||
feature.properties,\
|
||||
license.html
|
||||
|
||||
-generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier;unpack="false"
|
||||
+generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier
|
||||
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
diff -up plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:54:07.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true
|
||||
-Bundle-Version: 2.0.0.qualifier
|
||||
+Bundle-Version: 2.0.0.v20080611-1715
|
||||
Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: %plugin.provider
|
||||
diff -up plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true
|
||||
-Bundle-Version: 2.0.0.qualifier
|
||||
+Bundle-Version: 2.0.0.v20080611-1715
|
||||
Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator
|
||||
Bundle-Vendor: %plugin.provider
|
||||
Eclipse-LazyStart: true
|
||||
diff -up plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -1,7 +1,7 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf;singleton:=true
|
||||
-Bundle-Version: 2.0.0.qualifier
|
||||
+Bundle-Version: 2.0.0.v20080611-1715
|
||||
Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
|
||||
Bundle-Vendor: %plugin.provider
|
||||
Bundle-Localization: plugin
|
||||
diff -up plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true
|
||||
-Bundle-Version: 2.0.0.qualifier
|
||||
+Bundle-Version: 2.0.0.v20080611-1715
|
||||
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator
|
||||
Bundle-Vendor: %plugin.provider
|
||||
Bundle-Localization: plugin
|
||||
diff -up plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.ssl
|
||||
-Bundle-Version: 1.0.0.qualifier
|
||||
+Bundle-Version: 1.0.0.v20080611-1715
|
||||
Bundle-Vendor: %plugin.provider
|
||||
Fragment-Host: org.eclipse.ecf.provider.filetransfer;bundle-version="2.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
diff -up plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF
|
||||
--- plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400
|
||||
+++ plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.ecf.ssl
|
||||
-Bundle-Version: 1.0.0.qualifier
|
||||
+Bundle-Version: 1.0.0.v20080611-1715
|
||||
Fragment-Host: org.eclipse.ecf;bundle-version="2.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
Import-Package: org.eclipse.osgi.service.security;version="1.0.0",
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-10-15 17:04:01.000000000 +0200
|
||||
+++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-10-15 17:22:09.000000000 +0200
|
||||
@@ -57,7 +57,6 @@
|
||||
"x86_64")
|
||||
defaultOSArch="x86_64"
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
- javaHome="/usr/java64/1.5"
|
||||
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
i?86)
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
### Eclipse Workspace Patch 1.0
|
||||
#P org.eclipse.help.webapp
|
||||
Index: advanced/tocToolbar.jsp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v
|
||||
retrieving revision 1.14
|
||||
diff -u -r1.14 tocToolbar.jsp
|
||||
--- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 22 Jan 2009 22:19:55 -0000 1.14
|
||||
+++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 21 Sep 2009 20:55:27 -0000
|
||||
@@ -16,6 +16,9 @@
|
||||
String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
|
||||
String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
|
||||
String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
|
||||
+ // See Bug 290064 for an explanation of why these constants are used
|
||||
+ final String ON = "on";
|
||||
+ final String OFF = "off";
|
||||
%>
|
||||
|
||||
<jsp:include page="toolbar.jsp">
|
||||
@@ -62,6 +65,6 @@
|
||||
<jsp:param name="image" value="auto_synch_toc.gif"/>
|
||||
<jsp:param name="action" value="toggleAutosynch"/>
|
||||
<jsp:param name="param" value=""/>
|
||||
- <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
|
||||
+ <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
|
||||
|
||||
</jsp:include>
|
||||
\ No newline at end of file
|
||||
Index: advanced/searchToolbar.jsp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v
|
||||
retrieving revision 1.12
|
||||
diff -u -r1.12 searchToolbar.jsp
|
||||
--- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 29 Aug 2007 22:45:40 -0000 1.12
|
||||
+++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 21 Sep 2009 20:55:27 -0000
|
||||
@@ -1,5 +1,5 @@
|
||||
<%--
|
||||
- Copyright (c) 2000, 2007 IBM Corporation and others.
|
||||
+ Copyright (c) 2000, 2009 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
|
||||
@@ -9,6 +9,11 @@
|
||||
IBM Corporation - initial API and implementation
|
||||
--%>
|
||||
<%@ include file="header.jsp"%>
|
||||
+<%
|
||||
+ // See Bug 290064 for an explanation of why these constants are used
|
||||
+ final String ON = "on";
|
||||
+ final String OFF = "off";
|
||||
+%>
|
||||
|
||||
|
||||
<jsp:include page="toolbar.jsp">
|
||||
@@ -27,13 +32,13 @@
|
||||
<jsp:param name="image" value="show_categories.gif"/>
|
||||
<jsp:param name="action" value="toggleShowCategories"/>
|
||||
<jsp:param name="param" value=""/>
|
||||
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
|
||||
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
|
||||
|
||||
<jsp:param name="name" value="show_descriptions"/>
|
||||
<jsp:param name="tooltip" value='show_descriptions'/>
|
||||
<jsp:param name="image" value="show_descriptions.gif"/>
|
||||
<jsp:param name="action" value="toggleShowDescriptions"/>
|
||||
<jsp:param name="param" value=""/>
|
||||
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
|
||||
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
|
||||
|
||||
</jsp:include>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.ia64 ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties
|
||||
--- ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties.ia64 2008-07-22 08:55:34.000000000 -0400
|
||||
+++ ./plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-07-22 08:56:01.000000000 -0400
|
||||
@@ -20,6 +20,7 @@ root.win32.win32.x86=eclipse.exe, eclips
|
||||
root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
+root.linux.gtk.ia64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
|
||||
root.linux.gtk.ppc=eclipse
|
||||
root.macosx.carbon.ppc=eclipse,Eclipse.app/
|
||||
root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
--- plugins/org.eclipse.jdt.launching/scripts/customBuild.xml.orig 2009-03-09 15:06:45.000000000 +0100
|
||||
+++ plugins/org.eclipse.jdt.launching/scripts/customBuild.xml 2009-03-09 16:57:53.000000000 +0100
|
||||
@@ -14,5 +14,64 @@
|
||||
<property name="bundleJavacTarget" value="${tempTarget}"/>
|
||||
</target>
|
||||
|
||||
+ <target name="noDefault">
|
||||
+ <echo message="This file must be called with explicit targets" />
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.build.jars">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.build.jars">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.build.sources">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.build.sources">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.name">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.@dot">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.compile.name">
|
||||
+ </target>
|
||||
+ <target name="post.compile.lib/launchingsupport.jar">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.compile.@dot">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.name">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.@dot">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.gather.bin.parts">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.gather.bin.parts">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.gather.sources">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.gather.sources">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.gather.logs">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.gather.logs">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="pre.clean">
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="post.clean">
|
||||
+ </target>
|
||||
|
||||
</project>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- library/gtk/build.sh.orig 2007-08-30 18:33:51.000000000 -0400
|
||||
+++ library/gtk/build.sh 2007-08-30 18:35:20.000000000 -0400
|
||||
@@ -36,7 +36,7 @@
|
||||
defaultOSArch=""
|
||||
defaultWS="gtk"
|
||||
defaultJava=DEFAULT_JAVA_JNI
|
||||
-javaHome=""
|
||||
+javaHome=$JAVA_HOME
|
||||
makefile=""
|
||||
if [ "$OS" = "" ]; then
|
||||
OS=`uname -s`
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
--- gtk/eclipse.ini 2008-06-18 02:52:18.000000000 +0200
|
||||
+++ gtk/eclipse.ini.patched 2008-09-25 13:38:03.000000000 +0200
|
||||
@@ -4,4 +4,12 @@ org.eclipse.platform
|
||||
256m
|
||||
-vmargs
|
||||
-Xms40m
|
||||
--Xmx256m
|
||||
+-Xmx512m
|
||||
+-XX:MaxPermSize=128m
|
||||
+-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
|
||||
+-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
|
||||
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
|
||||
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
|
||||
+-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
|
||||
+-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles
|
||||
+-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
|
||||
|
|
@ -1,203 +0,0 @@
|
|||
--- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.orig 2009-02-02 22:45:45.000000000 +0100
|
||||
+++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF 2009-02-19 17:09:24.000000000 +0100
|
||||
@@ -12,18 +12,3 @@
|
||||
unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni
|
||||
t.textui;version="3.8.2"
|
||||
|
||||
-Name: junit.jar
|
||||
-SHA1-Digest: c3q6P9LmZ5Def1MlP4MpqblgEgg=
|
||||
-
|
||||
-Name: plugin.properties
|
||||
-SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A=
|
||||
-
|
||||
-Name: about.html
|
||||
-SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA=
|
||||
-
|
||||
-Name: META-INF/eclipse.inf
|
||||
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
|
||||
-
|
||||
-Name: about_files/cpl-v10.html
|
||||
-SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
|
||||
-
|
||||
|
||||
|
||||
--- plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF.orig 2009-02-02 22:45:40.000000000 +0100
|
||||
+++ plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF 2009-02-19 17:08:54.000000000 +0100
|
||||
@@ -58,177 +58,3 @@
|
||||
bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
|
||||
Require-Bundle: org.eclipse.osgi
|
||||
|
||||
-Name: lib/ant-apache-bsf.jar
|
||||
-SHA1-Digest: M2d6lresQp0xa4ei3/6UT0IvvOo=
|
||||
-
|
||||
-Name: lib/ant-trax.jar
|
||||
-SHA1-Digest: h2GIw5t/8Awgscfr4Kp8ijnUnio=
|
||||
-
|
||||
-Name: etc/maudit-frames.xsl
|
||||
-SHA1-Digest: 1oML7OYqWjV+hPKu/ItdzrAFGcA=
|
||||
-
|
||||
-Name: bin/lcp.bat
|
||||
-SHA1-Digest: eX7ICcBsanATsaEDkn5+oTA4QaQ=
|
||||
-
|
||||
-Name: bin/runrc.cmd
|
||||
-SHA1-Digest: eNo+cuYQicndcc56FVkRScD5w30=
|
||||
-
|
||||
-Name: etc/jdepend.xsl
|
||||
-SHA1-Digest: 0rf14aLzhLsun24uUsXVVvkHM6I=
|
||||
-
|
||||
-Name: bin/antenv.cmd
|
||||
-SHA1-Digest: s2zvcJEs2E2x6ckfXZoGxx1OF1Y=
|
||||
-
|
||||
-Name: about_files/LICENSE.sax.txt
|
||||
-SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek=
|
||||
-
|
||||
-Name: META-INF/eclipse.inf
|
||||
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
|
||||
-
|
||||
-Name: lib/ant-launcher.jar
|
||||
-SHA1-Digest: j5MKo11ChREVqI8KAf2yOdoUwUw=
|
||||
-
|
||||
-Name: lib/ant-apache-bcel.jar
|
||||
-SHA1-Digest: UG6yMPpDDbFxF0IZBgyYlF5b8Bo=
|
||||
-
|
||||
-Name: lib/ant-antlr.jar
|
||||
-SHA1-Digest: 96qgI+qE4mkMTOueBU6BnOGr3F4=
|
||||
-
|
||||
-Name: etc/changelog.xsl
|
||||
-SHA1-Digest: 2EZZ+jSTt1TTlBYPN4vGUAX7cTQ=
|
||||
-
|
||||
-Name: etc/jdepend-frames.xsl
|
||||
-SHA1-Digest: U2Bb6aMxgbEYqXkCm2sujeLP7Zo=
|
||||
-
|
||||
-Name: lib/ant-starteam.jar
|
||||
-SHA1-Digest: RJsY/xmhxl6ubDDU6QoA/vM1yA4=
|
||||
-
|
||||
-Name: about.html
|
||||
-SHA1-Digest: cPPs9diR9VPNDzWrCs1FLNOdJEo=
|
||||
-
|
||||
-Name: lib/ant-jai.jar
|
||||
-SHA1-Digest: n8D/dzR//eyQWMESchVqF5rRTUA=
|
||||
-
|
||||
-Name: lib/ant-junit.jar
|
||||
-SHA1-Digest: I580f1s/QFktmmHjSojgmt81LQc=
|
||||
-
|
||||
-Name: lib/ant-swing.jar
|
||||
-SHA1-Digest: WJU3ePHwpg4Pdodu5cKbgSJh6pA=
|
||||
-
|
||||
-Name: lib/ant-apache-log4j.jar
|
||||
-SHA1-Digest: 5YHgX/HtmvKU4bSP1VAwh20/Au8=
|
||||
-
|
||||
-Name: bin/ant
|
||||
-SHA1-Digest: jK7w10Hy+BIiSimUAhjgizdaBuY=
|
||||
-
|
||||
-Name: bin/ant.cmd
|
||||
-SHA1-Digest: 4jPJI7nJO+v3oPpbi5GbrT7x9qk=
|
||||
-
|
||||
-Name: lib/ant-commons-net.jar
|
||||
-SHA1-Digest: TDn0QivPCf35qccRtl8z87UP4Yg=
|
||||
-
|
||||
-Name: lib/ant-jsch.jar
|
||||
-SHA1-Digest: NIFaHRPHD9wFblAPcnd9jbU4mHM=
|
||||
-
|
||||
-Name: lib/ant-netrexx.jar
|
||||
-SHA1-Digest: IAealF7ASH6uMNCx+e1xKARXN+4=
|
||||
-
|
||||
-Name: etc/checkstyle/checkstyle-text.xsl
|
||||
-SHA1-Digest: CqSzAXEeeV20DtFpeujwjL9FEW8=
|
||||
-
|
||||
-Name: lib/ant-jdepend.jar
|
||||
-SHA1-Digest: RaJxbDfsfacKS0SdZq7rxR2dfp4=
|
||||
-
|
||||
-Name: lib/ant-stylebook.jar
|
||||
-SHA1-Digest: 4h44nYKPpjWBoZNHPFUY6z0g0UA=
|
||||
-
|
||||
-Name: about_files/NOTICE
|
||||
-SHA1-Digest: v3XrGNGv2sQGqBe+ObJZnq9915g=
|
||||
-
|
||||
-Name: etc/coverage-frames.xsl
|
||||
-SHA1-Digest: 5SE/NhPWEbqzGDGL58dwEbkhwRs=
|
||||
-
|
||||
-Name: lib/ant-nodeps.jar
|
||||
-SHA1-Digest: Tug9J6tn3AF4hSbXRKez+oq/HV4=
|
||||
-
|
||||
-Name: bin/complete-ant-cmd.pl
|
||||
-SHA1-Digest: F1mrSua1xk98goAA1YvtOoJNiuw=
|
||||
-
|
||||
-Name: about_files/LICENSE.dom.html
|
||||
-SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk=
|
||||
-
|
||||
-Name: etc/tagdiff.xsl
|
||||
-SHA1-Digest: ddaegkBkww5CoIlRpSR8RDUI1bQ=
|
||||
-
|
||||
-Name: etc/junit-frames.xsl
|
||||
-SHA1-Digest: XIcHcYoM8I5hzTkhdiy5iskupIM=
|
||||
-
|
||||
-Name: lib/ant-weblogic.jar
|
||||
-SHA1-Digest: an89ZCKDUQcczNIGX24YKHlDw14=
|
||||
-
|
||||
-Name: lib/ant-jmf.jar
|
||||
-SHA1-Digest: 49xPxSZkHqTnpc7ObkxCx1FbGRg=
|
||||
-
|
||||
-Name: bin/ant.bat
|
||||
-SHA1-Digest: Rc2etgn1RATkrEL3NCa3Fs75Ov8=
|
||||
-
|
||||
-Name: plugin.properties
|
||||
-SHA1-Digest: oZ8G+d0YZCeLv5mafw0x2OwbwOY=
|
||||
-
|
||||
-Name: etc/checkstyle/checkstyle-xdoc.xsl
|
||||
-SHA1-Digest: yL3TqCA4pc0daZXtXwAiCN6xHxI=
|
||||
-
|
||||
-Name: lib/ant.jar
|
||||
-SHA1-Digest: TFaLIuMxJspDdKHi2pjTE2Ekz6Y=
|
||||
-
|
||||
-Name: lib/ant-javamail.jar
|
||||
-SHA1-Digest: vYv9iGIOQvdi0qIfGkzQlKaq+l8=
|
||||
-
|
||||
-Name: lib/ant-apache-resolver.jar
|
||||
-SHA1-Digest: bhF0iM9f9L1KT/v8Ys+v2j+vh3E=
|
||||
-
|
||||
-Name: bin/antRun
|
||||
-SHA1-Digest: S63QT5F5EI1BCpIj59nosT3lVTw=
|
||||
-
|
||||
-Name: bin/envset.cmd
|
||||
-SHA1-Digest: EJ+ljL5sbUQ8mWVn8V49XPBuAz0=
|
||||
-
|
||||
-Name: bin/antRun.pl
|
||||
-SHA1-Digest: mynp1agPByxojQUKZqlVZkXZSHY=
|
||||
-
|
||||
-Name: etc/mmetrics-frames.xsl
|
||||
-SHA1-Digest: cQnziGYZC2FrO0zwFE92P1bP2v8=
|
||||
-
|
||||
-Name: etc/checkstyle/checkstyle-frames.xsl
|
||||
-SHA1-Digest: 5KYg/jQq+iuWKS5gF1qX37F+UX0=
|
||||
-
|
||||
-Name: lib/ant-apache-oro.jar
|
||||
-SHA1-Digest: p/P5j9dkS+qaqPV5fzx6LJL/9K0=
|
||||
-
|
||||
-Name: bin/antRun.bat
|
||||
-SHA1-Digest: zB9JbFFhlXTVgwaJlw61wNELj6k=
|
||||
-
|
||||
-Name: etc/junit-noframes.xsl
|
||||
-SHA1-Digest: zmgmTYDnXS0QZvMd3wUarjPR7aE=
|
||||
-
|
||||
-Name: bin/runant.pl
|
||||
-SHA1-Digest: tynYaGh8+BtWDsZ6PljZdoi+egU=
|
||||
-
|
||||
-Name: about_files/asl-v20.txt
|
||||
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
|
||||
-
|
||||
-Name: etc/junit-frames-xalan1.xsl
|
||||
-SHA1-Digest: ME/2vW22HRXG87EwVJ9LFfkfyEI=
|
||||
-
|
||||
-Name: etc/log.xsl
|
||||
-SHA1-Digest: juv2H0VplMm4ri1rzgdOW0yCroc=
|
||||
-
|
||||
-Name: lib/ant-commons-logging.jar
|
||||
-SHA1-Digest: X+YGW0HqKzBgYy7LvSiU07wuksY=
|
||||
-
|
||||
-Name: lib/ant-apache-regexp.jar
|
||||
-SHA1-Digest: WDOmb9jCRBSCrPZRPb8EpoPV2V8=
|
||||
-
|
||||
-Name: bin/runant.py
|
||||
-SHA1-Digest: Kg3iFzRnZW6PVIFmbj7Eyuo72cM=
|
||||
-
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
--- features/org.eclipse.platform/build.xml.orig 2009-04-17 16:21:20.000000000 +0200
|
||||
+++ features/org.eclipse.platform/build.xml 2009-04-17 16:26:21.000000000 +0200
|
||||
@@ -166,6 +166,11 @@
|
||||
<property name="ws" value="win32"/>
|
||||
<property name="os" value="win32"/>
|
||||
</ant>
|
||||
+ <ant antfile="build.xml" dir="../../features/org.eclipse.help" target="${target}">
|
||||
+ <property name="arch" value="x86"/>
|
||||
+ <property name="ws" value="win32"/>
|
||||
+ <property name="os" value="win32"/>
|
||||
+ </ant>
|
||||
<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.cheatsheets" target="${target}">
|
||||
<property name="arch" value="x86"/>
|
||||
<property name="ws" value="win32"/>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
### Eclipse Workspace Patch 1.0
|
||||
#P org.eclipse.swt
|
||||
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.48
|
||||
diff -u -r1.48 build.sh
|
||||
--- Eclipse SWT PI/gtk/library/build.sh 5 Jun 2008 17:31:51 -0000 1.48
|
||||
+++ Eclipse SWT PI/gtk/library/build.sh 6 Apr 2009 21:11:22 -0000
|
||||
@@ -99,19 +99,19 @@
|
||||
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
|
||||
export MOZILLA_INCLUDES
|
||||
export MOZILLA_LIBS
|
||||
- MAKE_MOZILLA=make_mozilla
|
||||
+ MAKE_MOZILLA="make_mozilla make_xpcominit"
|
||||
elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
|
||||
MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
|
||||
MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
|
||||
export MOZILLA_INCLUDES
|
||||
export MOZILLA_LIBS
|
||||
- MAKE_MOZILLA=make_mozilla
|
||||
+ MAKE_MOZILLA="make_mozilla make_xpcominit"
|
||||
elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
|
||||
XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
|
||||
- XULRUNNER_LIBS=`pkg-config --libs libxul`
|
||||
+ XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
|
||||
export XULRUNNER_INCLUDES
|
||||
export XULRUNNER_LIBS
|
||||
- MAKE_MOZILLA=make_xulrunner
|
||||
+ MAKE_MOZILLA="make_xulrunner make_xpcominit"
|
||||
else
|
||||
echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
|
||||
echo " *** Mozilla embedding support will not be compiled."
|
||||
|
|
@ -1,324 +0,0 @@
|
|||
### Eclipse Workspace Patch 1.0
|
||||
#P org.eclipse.swt
|
||||
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
|
||||
retrieving revision 1.105.2.3
|
||||
diff -u -r1.105.2.3 Mozilla.java
|
||||
--- Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java 21 Aug 2008 16:02:30 -0000 1.105.2.3
|
||||
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java 2 Apr 2009 19:15:06 -0000
|
||||
@@ -47,6 +47,7 @@
|
||||
Shell tip = null;
|
||||
Listener listener;
|
||||
Vector unhookedDOMWindows = new Vector ();
|
||||
+ byte[] htmlBytes;
|
||||
|
||||
static nsIAppShell AppShell;
|
||||
static AppFileLocProvider LocationProvider;
|
||||
@@ -1168,21 +1169,21 @@
|
||||
* Once the client does a proper navigate with either setUrl() or setText() then resume as
|
||||
* normal. The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
|
||||
*/
|
||||
- awaitingNavigate = true;
|
||||
- rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
|
||||
- if (rc != XPCOM.NS_OK) {
|
||||
- browser.dispose ();
|
||||
- error (rc);
|
||||
- }
|
||||
- if (result[0] == 0) {
|
||||
- browser.dispose ();
|
||||
- error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
- }
|
||||
- nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
|
||||
- char[] uri = new char[ABOUT_BLANK.length () + 1];
|
||||
- ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
|
||||
- rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
|
||||
- webNavigation.Release ();
|
||||
+// awaitingNavigate = true;
|
||||
+// rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
|
||||
+// if (rc != XPCOM.NS_OK) {
|
||||
+// browser.dispose ();
|
||||
+// error (rc);
|
||||
+// }
|
||||
+// if (result[0] == 0) {
|
||||
+// browser.dispose ();
|
||||
+// error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+// }
|
||||
+// nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
|
||||
+// char[] uri = new char[ABOUT_BLANK.length () + 1];
|
||||
+// ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
|
||||
+// rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
|
||||
+// webNavigation.Release ();
|
||||
|
||||
dialogFactory.isPre_1_9 = false;
|
||||
}
|
||||
@@ -1264,6 +1265,7 @@
|
||||
}
|
||||
|
||||
public boolean back () {
|
||||
+ htmlBytes = null;
|
||||
if (awaitingNavigate) return false;
|
||||
|
||||
int /*long*/[] result = new int /*long*/[1];
|
||||
@@ -1466,6 +1468,7 @@
|
||||
}
|
||||
|
||||
public boolean forward () {
|
||||
+ htmlBytes = null;
|
||||
if (awaitingNavigate) return false;
|
||||
|
||||
int /*long*/[] result = new int /*long*/[1];
|
||||
@@ -1676,6 +1679,7 @@
|
||||
webBrowser.Release ();
|
||||
webBrowser = null;
|
||||
webBrowserObject = null;
|
||||
+ htmlBytes = null;
|
||||
|
||||
if (tip != null && !tip.isDisposed ()) tip.dispose ();
|
||||
tip = null;
|
||||
@@ -1737,6 +1741,7 @@
|
||||
}
|
||||
|
||||
public void refresh () {
|
||||
+ htmlBytes = null;
|
||||
if (awaitingNavigate) return;
|
||||
|
||||
int /*long*/[] result = new int /*long*/[1];
|
||||
@@ -1858,11 +1863,45 @@
|
||||
} else {
|
||||
result[0] = 0;
|
||||
rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
|
||||
- if (rc != XPCOM.NS_OK) error (rc);
|
||||
- if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
- nsIDocShell docShell = new nsIDocShell (result[0]);
|
||||
- rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType, aContentCharset, 0);
|
||||
- docShell.Release ();
|
||||
+ if (rc == XPCOM.NS_OK) {
|
||||
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+ nsIDocShell docShell = new nsIDocShell (result[0]);
|
||||
+ rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType, aContentCharset, 0);
|
||||
+ docShell.Release ();
|
||||
+ } else {
|
||||
+ result[0] = 0;
|
||||
+ rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
|
||||
+ if (rc == XPCOM.NS_OK) {
|
||||
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+ /*
|
||||
+ * Setting mozilla's content through nsIWebBrowserStream does not cause a page
|
||||
+ * load to occur, so the events that usually accompany a page change are not
|
||||
+ * fired. To make this behave as expected, navigate to about:blank first and
|
||||
+ * then set the html content once the page has loaded.
|
||||
+ */
|
||||
+ new nsISupports (result[0]).Release ();
|
||||
+ result[0] = 0;
|
||||
+
|
||||
+ /*
|
||||
+ * If htmlBytes is not null then the about:blank page is already being loaded,
|
||||
+ * so no Navigate is required. Just set the html that is to be shown.
|
||||
+ */
|
||||
+ boolean blankLoading = htmlBytes != null;
|
||||
+ htmlBytes = data;
|
||||
+ if (blankLoading) return true;
|
||||
+
|
||||
+ /* navigate to about:blank */
|
||||
+ rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+ nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
|
||||
+ result[0] = 0;
|
||||
+ char[] uriChars = new char[ABOUT_BLANK.length () + 1];
|
||||
+ ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
|
||||
+ rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
|
||||
+ webNavigation.Release ();
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if (rc != XPCOM.NS_OK) error (rc);
|
||||
@@ -1877,6 +1916,7 @@
|
||||
}
|
||||
|
||||
public boolean setUrl (String url) {
|
||||
+ htmlBytes = null;
|
||||
awaitingNavigate = false;
|
||||
|
||||
int /*long*/[] result = new int /*long*/[1];
|
||||
@@ -1893,6 +1933,7 @@
|
||||
}
|
||||
|
||||
public void stop () {
|
||||
+ htmlBytes = null;
|
||||
if (awaitingNavigate) return;
|
||||
|
||||
int /*long*/[] result = new int /*long*/[1];
|
||||
@@ -2215,6 +2256,108 @@
|
||||
unhookedDOMWindows.remove (ptrObject);
|
||||
new nsISupports (ptrObject.value).Release ();
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * If htmlBytes is not null then there is html from a previous setText() call
|
||||
+ * waiting to be set into the about:blank page once it has completed loading.
|
||||
+ */
|
||||
+ if (htmlBytes != null) {
|
||||
+ nsIRequest req = new nsIRequest (aRequest);
|
||||
+ int /*long*/ name = XPCOM.nsEmbedCString_new ();
|
||||
+ rc = req.GetName (name);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ int length = XPCOM.nsEmbedCString_Length (name);
|
||||
+ int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
|
||||
+ byte[] dest = new byte[length];
|
||||
+ XPCOM.memmove (dest, buffer, length);
|
||||
+ String url = new String (dest);
|
||||
+ XPCOM.nsEmbedCString_delete (name);
|
||||
+
|
||||
+ if (url.startsWith (ABOUT_BLANK)) {
|
||||
+ /*
|
||||
+ * Setting mozilla's content with nsIWebBrowserStream invalidates the
|
||||
+ * DOM listeners that were hooked on it (about:blank), so remove them and
|
||||
+ * add new ones after the content has been set.
|
||||
+ */
|
||||
+ unhookDOMListeners ();
|
||||
+
|
||||
+ rc = XPCOM.NS_GetServiceManager (result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
|
||||
+
|
||||
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
|
||||
+ result[0] = 0;
|
||||
+ rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
|
||||
+ serviceManager.Release ();
|
||||
+
|
||||
+ nsIIOService ioService = new nsIIOService (result[0]);
|
||||
+ result[0] = 0;
|
||||
+ /*
|
||||
+ * Note. Mozilla ignores LINK tags used to load CSS stylesheets
|
||||
+ * when the URI protocol for the nsInputStreamChannel
|
||||
+ * is about:blank. The fix is to specify the file protocol.
|
||||
+ */
|
||||
+ byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
|
||||
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
|
||||
+ rc = ioService.NewURI (aSpec, null, 0, result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
|
||||
+ XPCOM.nsEmbedCString_delete (aSpec);
|
||||
+ ioService.Release ();
|
||||
+
|
||||
+ nsIURI uri = new nsIURI (result[0]);
|
||||
+ result[0] = 0;
|
||||
+
|
||||
+ rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
|
||||
+
|
||||
+ nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
|
||||
+ result[0] = 0;
|
||||
+
|
||||
+ byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
|
||||
+ int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
|
||||
+
|
||||
+ rc = stream.OpenStream (uri.getAddress (), aContentType);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ int /*long*/ ptr = C.malloc (htmlBytes.length);
|
||||
+ XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
|
||||
+ int pageSize = 8192;
|
||||
+ int pageCount = htmlBytes.length / pageSize + 1;
|
||||
+ int /*long*/ current = ptr;
|
||||
+ for (int i = 0; i < pageCount; i++) {
|
||||
+ length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
|
||||
+ if (length > 0) {
|
||||
+ rc = stream.AppendToStream (current, length);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ }
|
||||
+ current += pageSize;
|
||||
+ }
|
||||
+ rc = stream.CloseStream ();
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ C.free (ptr);
|
||||
+ XPCOM.nsEmbedCString_delete (aContentType);
|
||||
+ stream.Release ();
|
||||
+ uri.Release ();
|
||||
+ htmlBytes = null;
|
||||
+
|
||||
+ rc = webBrowser.GetContentDOMWindow (result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+ boolean isTop = result[0] == domWindow.getAddress ();
|
||||
+ new nsISupports (result[0]).Release ();
|
||||
+ result[0] = 0;
|
||||
+ rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
|
||||
+ if (rc != XPCOM.NS_OK) error (rc);
|
||||
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
|
||||
+ nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
|
||||
+ result[0] = 0;
|
||||
+ hookDOMListeners (target, isTop);
|
||||
+ target.Release ();
|
||||
+ }
|
||||
+ }
|
||||
domWindow.Release ();
|
||||
|
||||
/*
|
||||
Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
|
||||
===================================================================
|
||||
RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
|
||||
diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 1 Jan 1970 00:00:00 -0000
|
||||
@@ -0,0 +1,55 @@
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1
|
||||
+ *
|
||||
+ * The contents of this file are subject to the Mozilla Public License Version
|
||||
+ * 1.1 (the "License"); you may not use this file except in compliance with
|
||||
+ * the License. You may obtain a copy of the License at
|
||||
+ * http://www.mozilla.org/MPL/
|
||||
+ *
|
||||
+ * Software distributed under the License is distributed on an "AS IS" basis,
|
||||
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
+ * for the specific language governing rights and limitations under the
|
||||
+ * License.
|
||||
+ *
|
||||
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
|
||||
+ *
|
||||
+ * The Initial Developer of the Original Code is
|
||||
+ * Netscape Communications Corporation.
|
||||
+ * Portions created by Netscape are Copyright (C) 1998-1999
|
||||
+ * Netscape Communications Corporation. All Rights Reserved.
|
||||
+ *
|
||||
+ * Contributor(s):
|
||||
+ *
|
||||
+ * IBM
|
||||
+ * - Binding to permit interfacing between Mozilla and SWT
|
||||
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
|
||||
+ *
|
||||
+ * ***** END LICENSE BLOCK ***** */
|
||||
+package org.eclipse.swt.internal.mozilla;
|
||||
+
|
||||
+public class nsIWebBrowserStream extends nsISupports {
|
||||
+
|
||||
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
|
||||
+
|
||||
+ public static final String NS_IWEBBROWSERSTREAM_IID_STR =
|
||||
+ "86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
|
||||
+
|
||||
+ public static final nsID NS_IWEBBROWSERSTREAM_IID =
|
||||
+ new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
|
||||
+
|
||||
+ public nsIWebBrowserStream(int /*long*/ address) {
|
||||
+ super(address);
|
||||
+ }
|
||||
+
|
||||
+ public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
|
||||
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
|
||||
+ }
|
||||
+
|
||||
+ public int AppendToStream(int /*long*/ aData, int aLen) {
|
||||
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
|
||||
+ }
|
||||
+
|
||||
+ public int CloseStream() {
|
||||
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
|
||||
+ }
|
||||
+}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Eclipse
|
||||
Comment=Eclipse Integrated Development Environment
|
||||
Exec=eclipse
|
||||
Icon=eclipse
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=IDE;Development;Java;X-Red-Hat-Base;
|
||||
167
eclipse.spec
167
eclipse.spec
|
|
@ -30,13 +30,12 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
Source0: %{download_url}eclipse-build-R0_3_0.tar.gz
|
||||
Source0: %{download_url}eclipse-build-0_4_RC0.tar.gz
|
||||
Source1: %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
|
||||
Source2: %{name}.desktop
|
||||
Source16: %{name}-copy-platform.sh
|
||||
Source17: efj.sh.in
|
||||
# This file contains the types of files we'd like to extract from the jars
|
||||
|
|
@ -44,8 +43,6 @@ Source17: efj.sh.in
|
|||
Source19: %{name}-filenamepatterns.txt
|
||||
# Script to wrap PDE Build calls for bundle builds
|
||||
Source21: %{name}-pdebuild.sh
|
||||
# config.ini to run the director for provisioning the installation
|
||||
Source22: %{name}-config.ini.director
|
||||
Source24: fetch-ecf.sh
|
||||
# This was fetched using the above script.
|
||||
# We will eventually have an eclipse-ecf package but since the ECF
|
||||
|
|
@ -59,14 +56,6 @@ Source27: ecf-filetransfer-build.properties
|
|||
# This script copies the platform sub-set of the SDK for generating metadata
|
||||
Source28: %{name}-mv-Platform.sh
|
||||
|
||||
# Build swttools.jar before generation on 64-bit platforms.
|
||||
# Build SWT native libraries
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
|
||||
# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
|
||||
Patch4: %{name}-buildswtnatives.patch
|
||||
Patch32: %{name}-compilelibs.patch
|
||||
|
||||
# This does two things:
|
||||
# 1. allows the launcher to be in /usr/bin and
|
||||
# 2. ensures that the OSGi configuration directory
|
||||
|
|
@ -76,70 +65,16 @@ Patch32: %{name}-compilelibs.patch
|
|||
# generic releng plugins that can be used to build plugins
|
||||
# see this thread for details:
|
||||
# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
|
||||
Patch15: %{name}-pde.build-add-package-build.patch
|
||||
Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
|
||||
Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
|
||||
Patch30: %{name}-addfragmentsforotherplatforms.patch
|
||||
Patch38: %{name}-addrootfiles.patch
|
||||
#FIXME: file a bug upstream
|
||||
Patch26: %{name}-launcher-fix-java-home.patch
|
||||
# Default max heap size too low for lots of people. Bump to 512 MB.
|
||||
# Max perm size:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=352361
|
||||
# JVM crash:
|
||||
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
|
||||
Patch29: %{name}-memorypermsizeandjvmcrash.patch
|
||||
Patch0: %{name}-pde.build-add-package-build.patch
|
||||
Patch1: %{name}-add-ppc64-sparc64-s390-s390x.patch
|
||||
Patch2: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
|
||||
|
||||
Patch31: %{name}-ia64-packaging.patch
|
||||
|
||||
# Make ECF bundles have the same qualifier as they do upstream
|
||||
Patch35: %{name}-ecf-qualifier.patch
|
||||
|
||||
# Don't pack the icu4j source bundle. Can go away when we re-build
|
||||
# icu4j against a 3.4 SDK.
|
||||
Patch36: %{name}-dontpackicu4jsource.patch
|
||||
|
||||
# Our dependent JARs have different signatures than the ones included
|
||||
# upstream so remove the signatures in the manifests
|
||||
Patch37: %{name}-nojarsignatures.patch
|
||||
|
||||
## Back-port patches from 3.4.x stream. These will be in 3.4.1.
|
||||
## https://bugs.eclipse.org/bugs/show_bug.cgi?id=242632
|
||||
#Patch39: %{name}-profilesync-e.o242632.patch
|
||||
#Patch40: %{name}-profilesync-e.o242632-2.patch
|
||||
|
||||
Patch43: %{name}-osgi-classpath.patch
|
||||
Patch44: %{name}-fix-javahome64.patch
|
||||
|
||||
# TODO fix customBuildCallback
|
||||
Patch47: %{name}-jdt_launch-customBuild.patch
|
||||
|
||||
# Since we're building against XULRunner, build using XR flags
|
||||
# https://bugs.eclipse.org/226356
|
||||
# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
|
||||
# At present, libxul.pc contains -lxpcomglue_s. Chris Aillon and myself think
|
||||
# it should perhaps be -lxpcomglue. This patch uses that instead but will
|
||||
# be replaced with the former when libxul.pc is fixed.
|
||||
# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
|
||||
Patch48: %{name}-swt-buildagainstxulrunner.patch
|
||||
|
||||
Patch49: %{name}-add-ppc64-filesystem.patch
|
||||
Patch5: %{name}-add-ppc64-filesystem.patch
|
||||
|
||||
# Make sure the shipped target platform templates are looking in the
|
||||
# correct location for source bundles (see RHBZ # 521969). This does not
|
||||
# need to go upstream.
|
||||
Patch50: %{name}-target-platform-template.patch
|
||||
|
||||
# Add /usr/share/eclipse/dropins to list of dropins locations
|
||||
# Already applied in eclipse-build upstream rev. #23023
|
||||
Patch51: %{name}-addusrsharedropins.patch
|
||||
|
||||
#Fix for help toolbar jsp compile error.
|
||||
#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064
|
||||
#Already added to eclipse-build.
|
||||
Patch52: %{name}-help-toolbar.patch
|
||||
Patch6: %{name}-target-platform-template.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: ant
|
||||
|
|
@ -284,39 +219,16 @@ Eclipse Plugin Development Environment. This package is required for
|
|||
developing Eclipse plugins.
|
||||
|
||||
%prep
|
||||
%setup -q -n eclipse-build-R0_3_0
|
||||
%setup -q -n eclipse-build-0_4_RC0
|
||||
cp %{SOURCE1} .
|
||||
sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
|
||||
ant -DbuildId=I20090611-1540 applyPatches
|
||||
pushd build/eclipse-I20090611-1540-fetched-src
|
||||
|
||||
# Add /usr/share/eclipse/dropins
|
||||
%patch51 -p3
|
||||
|
||||
#sed --in-place "s/java5.home/java.home/" build.xml
|
||||
#sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
|
||||
# Build swttools.jar and native libraries
|
||||
#%patch4 -p0
|
||||
#%patch32 -p0
|
||||
|
||||
# liblocalfile fixes
|
||||
sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
|
||||
sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
|
||||
|
||||
# launcher patches
|
||||
rm plugins/org.eclipse.platform/launchersrc.zip
|
||||
pushd features/org.eclipse.equinox.executable
|
||||
#%patch12 -p0
|
||||
%patch26 -p0
|
||||
# FIXME: deal with this
|
||||
## put the configuration directory in an arch-specific location
|
||||
#sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
|
||||
## make the eclipse binary relocatable
|
||||
#sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
|
||||
zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
|
||||
popd
|
||||
#-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
|
||||
|
||||
# Use our system-installed javadocs, reference only what we built, and
|
||||
# don't like to osgi.org docs (FIXME: maybe we should package them?)
|
||||
sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
|
||||
|
|
@ -333,27 +245,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
|
|||
plugins/org.eclipse.pde.doc.user/pdeOptions.txt
|
||||
|
||||
pushd plugins/org.eclipse.pde.build
|
||||
%patch15
|
||||
%patch0
|
||||
sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
|
||||
popd
|
||||
|
||||
# TODO check whether it is needed
|
||||
#%patch36
|
||||
# TODO rebase
|
||||
#%patch37
|
||||
|
||||
#pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
|
||||
#%patch39
|
||||
#popd
|
||||
#
|
||||
#pushd plugins/org.eclipse.equinox.p2.touchpoint.eclipse
|
||||
#%patch40
|
||||
#popd
|
||||
|
||||
#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
|
||||
#%patch45 -p3
|
||||
#popd
|
||||
|
||||
# Remove signatures for JARs
|
||||
find -iname \*.sf | xargs rm
|
||||
find -iname \*.rsa | xargs rm
|
||||
|
|
@ -380,13 +275,10 @@ sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.g
|
|||
|
||||
# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
|
||||
%ifarch ppc64
|
||||
%patch24 -p1
|
||||
%patch28
|
||||
%patch49
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch5
|
||||
%endif
|
||||
#%patch30
|
||||
%patch31 -p1
|
||||
%patch38
|
||||
|
||||
# Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
|
||||
# the s390x strings with ppc64, etc.
|
||||
|
|
@ -460,22 +352,6 @@ IFS='
|
|||
|
||||
%endif
|
||||
|
||||
arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
|
||||
features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
|
||||
'{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
|
||||
|
||||
arches=$(echo $arches | sed s/%{eclipse_arch}//)
|
||||
|
||||
# Don't build for arches other than the one on which we're building
|
||||
pushd features
|
||||
for f in */build.xml; do
|
||||
for arch in $arches; do
|
||||
sed -i "/<ant antfile=\"build.xml\" dir=.*$arch\" target=\"/,/<\/ant>/ d" $f
|
||||
sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f
|
||||
done
|
||||
done
|
||||
popd
|
||||
|
||||
# Symlinks
|
||||
rm plugins/org.sat4j*
|
||||
ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
|
||||
|
|
@ -647,17 +523,8 @@ cp -p %{SOURCE27} build.properties
|
|||
popd
|
||||
popd
|
||||
|
||||
%patch43
|
||||
%patch44
|
||||
%patch47
|
||||
|
||||
#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
|
||||
#%patch48 -p3
|
||||
#popd
|
||||
|
||||
# target platform template patch
|
||||
%patch50 -p0
|
||||
%patch52 -p0
|
||||
%patch6 -p0
|
||||
|
||||
popd
|
||||
|
||||
|
|
@ -677,7 +544,6 @@ java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
|
|||
cp org.eclipse.equinox.initializer*.jar $SDK/plugins
|
||||
popd
|
||||
|
||||
#
|
||||
# Build the ECF filetransfer plugins
|
||||
pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
|
||||
mkdir -p build
|
||||
|
|
@ -1000,11 +866,11 @@ sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
|
|||
rm -rf $installDir
|
||||
|
||||
# A sanity check.
|
||||
desktop-file-validate %{SOURCE2}
|
||||
desktop-file-validate %{name}.desktop
|
||||
|
||||
# freedesktop.org menu entry
|
||||
desktop-file-install --vendor="fedora" \
|
||||
--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
|
||||
--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
|
||||
|
||||
# Create a script that can be used to make a symlink tree of the
|
||||
# eclipse platform.
|
||||
|
|
@ -1429,6 +1295,9 @@ fi
|
|||
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
||||
|
||||
%changelog
|
||||
* Tue Sep 29 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-3
|
||||
- Build with eclipse-build 0.4.0 RC0.
|
||||
|
||||
* Wed Sep 23 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.0-2
|
||||
- Move jakarta-commons-codec requirement from jdt to platform.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,3 +1,3 @@
|
|||
72a590190a4fea7a4f8885bfe26a3e18 eclipse-I20090611-1540-fetched-src.tar.bz2
|
||||
a3504fedff088a6e58a39d43fff4d47e eclipse-build-R0_3_0.tar.gz
|
||||
d9b5bdc848ded1c2f1f62da94b9c70a0 ecf-filetransfer-v20090604-1131.tar.bz2
|
||||
0c08b2d3cbdec806afeddf10ab7d7bb0 eclipse-build-0_4_RC0.tar.gz
|
||||
|
|
|
|||
Loading…
Reference in New Issue