rpms/eclipse/devel eclipse-icu4j-build-files.patch, NONE, 1.1 eclipse-swt-add-gecko-paths-profile-libs.patch, NONE, 1.1 eclipse-xpcom-profile.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 eclipse-disable-junit4-apt.patch, 1.4, 1.5 eclipse-swt-firefox.patch, 1.3, 1.4 eclipse-updatehomedir.patch, 1.6, 1.7 eclipse.spec, 1.328, 1.329 sources, 1.35, 1.36
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 26 04:45:38 UTC 2006
Author: bkonrath
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22180
Modified Files:
.cvsignore eclipse-disable-junit4-apt.patch
eclipse-swt-firefox.patch eclipse-updatehomedir.patch
eclipse.spec sources
Added Files:
eclipse-icu4j-build-files.patch
eclipse-swt-add-gecko-paths-profile-libs.patch
eclipse-xpcom-profile.patch
Log Message:
- M20060921-0945 (3.2.1 pre-release).
- Upadate patches to 3.2.1.
- Add icu4j 3.4.5 sources.
- Add Fedora version to platform about.mappings as well as sdk.
eclipse-icu4j-build-files.patch:
com.ibm.icu.base/build.xml | 172 +++++++++++++++++++++++++++++++++++++++++++++
com.ibm.icu/build.xml | 172 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 344 insertions(+)
--- NEW FILE eclipse-icu4j-build-files.patch ---
diff -ruN icu4j-eclipse-plugins.orig/com.ibm.icu/build.xml icu4j-eclipse-plugins/com.ibm.icu/build.xml
--- icu4j-eclipse-plugins.orig/com.ibm.icu/build.xml 1969-12-31 19:00:00.000000000 -0500
+++ icu4j-eclipse-plugins/com.ibm.icu/build.xml 2006-09-23 19:14:54.000000000 -0400
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.ibm.icu" default="build.jars" basedir=".">
+
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
+ <property name="basearch" value="${arch}"/>
+ <property name="basenl" value="${nl}"/>
+
+ <!-- Compiler settings. -->
+ <property name="javacFailOnError" value="false"/>
+ <property name="javacDebugInfo" value="on"/>
+ <property name="javacVerbose" value="false"/>
+ <property name="logExtension" value=".log"/>
+ <property name="compilerArg" value=""/>
+ <property name="javacSource" value="1.3"/>
+ <property name="javacTarget" value="1.2"/>
+ <path id="path_bootclasspath">
+ <fileset dir="${java.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath"/>
+ <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleJavacSource" value="1.3">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.1">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleBootClasspath" value="${J2SE-1.3}">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <condition property="bundleJavacSource" value="1.3">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.1">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <property name="bundleJavacSource" value="${javacSource}"/>
+ <property name="bundleJavacTarget" value="${javacTarget}"/>
+ <property name="bundleBootClasspath" value="${bootclasspath}"/>
+
+ <target name="init" depends="properties">
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="pluginTemp" value="${basedir}"/>
+ <condition property="build.result.folder" value="${pluginTemp}/com.ibm.icu">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="build.result.folder" value="${basedir}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
+ </target>
+
+ <target name="properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+
+ </target>
+
+ <target name="build.update.jar" depends="init" description="Build the plug-in: com.ibm.icu for an update site.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <zip destfile="${plugin.destination}/com.ibm.icu_3.4.5.jar" basedir="${temp.folder}/com.ibm.icu_3.4.5" filesonly="false" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.icu @dot.">
+ <delete dir="${temp.folder}/@dot.bin"/>
+ <mkdir dir="${temp.folder}/@dot.bin"/>
+ <path id="@dot.classpath">
+ </path>
+ <!-- compile the source code -->
+ <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
+ <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
+ <classpath refid="@dot.classpath" />
+ <src path="src/" />
+ <compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </javac>
+ <!-- Copy necessary resources -->
+ <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
+ <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
+ </copy>
+ <mkdir dir="${build.result.folder}"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${temp.folder}/@dot.bin" />
+ </copy>
+ <delete dir="${temp.folder}/@dot.bin"/>
+ </target>
+
+ <target name="src.zip" depends="init" unless="src.zip">
+ <mkdir dir="${build.result.folder}"/>
+ <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
+ <fileset dir="src/" includes="**/*.java" />
+ </zip>
+ </target>
+
+ <target name="build.jars" depends="init" description="Build all the jars for the plug-in: com.ibm.icu.">
+ <available property="@dot" file="${build.result.folder}/@dot"/>
+ <antcall target="@dot"/>
+ </target>
+
+ <target name="build.sources" depends="init">
+ <available property="src.zip" file="${build.result.folder}/src.zip"/>
+ <antcall target="src.zip"/>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
+ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**" />
+ </copy>
+ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="about_files/,about.html,plugin.properties,META-INF/" />
+ </copy>
+ <!-- <eclipse.versionReplacer path="${destination.temp.folder}/com.ibm.icu_3.4.5" version="3.4.5"/> -->
+ </target>
+
+ <target name="build.zips" depends="init">
+ </target>
+
+ <target name="gather.sources" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
+ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="false" overwrite="false"/>
+ <copy todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="false" overwrite="false">
+ <fileset dir="${basedir}" includes="about.html,about_files/" />
+ </copy>
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu_3.4.5"/>
+ <copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/com.ibm.icu_3.4.5" failonerror="false" overwrite="false"/>
+ </target>
+
+ <target name="clean" depends="init" description="Clean the plug-in: com.ibm.icu of all the zips, jars and logs created.">
+ <delete dir="${build.result.folder}/@dot"/>
+ <delete file="${build.result.folder}/src.zip"/>
+ <delete file="${plugin.destination}/com.ibm.icu_3.4.5.jar"/>
+ <delete file="${plugin.destination}/com.ibm.icu_3.4.5.zip"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+ <eclipse.convertPath fileSystemPath="/home/ben/test/build/plugins/com.ibm.icu" property="resourcePath"/>
+ <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+ </target>
+
+ <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.icu.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="build.sources"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <antcall target="gather.sources">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <delete>
+ <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
+ </delete>
+ <zip destfile="${plugin.destination}/com.ibm.icu_3.4.5.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+</project>
diff -ruN icu4j-eclipse-plugins.orig/com.ibm.icu.base/build.xml icu4j-eclipse-plugins/com.ibm.icu.base/build.xml
--- icu4j-eclipse-plugins.orig/com.ibm.icu.base/build.xml 1969-12-31 19:00:00.000000000 -0500
+++ icu4j-eclipse-plugins/com.ibm.icu.base/build.xml 2006-09-23 19:23:47.000000000 -0400
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.ibm.icu.base" default="build.jars" basedir=".">
+
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
+ <property name="basearch" value="${arch}"/>
+ <property name="basenl" value="${nl}"/>
+
+ <!-- Compiler settings. -->
+ <property name="javacFailOnError" value="false"/>
+ <property name="javacDebugInfo" value="on"/>
+ <property name="javacVerbose" value="false"/>
+ <property name="logExtension" value=".log"/>
+ <property name="compilerArg" value=""/>
+ <property name="javacSource" value="1.3"/>
+ <property name="javacTarget" value="1.2"/>
+ <path id="path_bootclasspath">
+ <fileset dir="${java.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath"/>
+ <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleJavacSource" value="1.3">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.1">
+ <isset property="CDC-1.0/Foundation-1.0"/>
+ </condition>
+ <condition property="bundleBootClasspath" value="${J2SE-1.3}">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <condition property="bundleJavacSource" value="1.3">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.1">
+ <isset property="J2SE-1.3"/>
+ </condition>
+ <property name="bundleJavacSource" value="${javacSource}"/>
+ <property name="bundleJavacTarget" value="${javacTarget}"/>
+ <property name="bundleBootClasspath" value="${bootclasspath}"/>
+
+ <target name="init" depends="properties">
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="pluginTemp" value="${basedir}"/>
+ <condition property="build.result.folder" value="${pluginTemp}/com.ibm.icu.base">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="build.result.folder" value="${basedir}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
+ </target>
+
+ <target name="properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+
+ </target>
+
+ <target name="build.update.jar" depends="init" description="Build the plug-in: com.ibm.icu.base for an update site.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <zip destfile="${plugin.destination}/com.ibm.icu.base_3.4.5.jar" basedir="${temp.folder}/com.ibm.icu.base_3.4.5" filesonly="false" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.icu.base @dot.">
+ <delete dir="${temp.folder}/@dot.bin"/>
+ <mkdir dir="${temp.folder}/@dot.bin"/>
+ <path id="@dot.classpath">
+ </path>
+ <!-- compile the source code -->
+ <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
+ <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
+ <classpath refid="@dot.classpath" />
+ <src path="src/" />
+ <compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </javac>
+ <!-- Copy necessary resources -->
+ <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
+ <fileset dir="src/" excludes="**/*.java, **/package.htm*" />
+ </copy>
+ <mkdir dir="${build.result.folder}"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${temp.folder}/@dot.bin" />
+ </copy>
+ <delete dir="${temp.folder}/@dot.bin"/>
+ </target>
+
+ <target name="src.zip" depends="init" unless="src.zip">
+ <mkdir dir="${build.result.folder}"/>
+ <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
+ <fileset dir="src/" includes="**/*.java" />
+ </zip>
+ </target>
+
+ <target name="build.jars" depends="init" description="Build all the jars for the plug-in: com.ibm.icu.base.">
+ <available property="@dot" file="${build.result.folder}/@dot"/>
+ <antcall target="@dot"/>
+ </target>
+
+ <target name="build.sources" depends="init">
+ <available property="src.zip" file="${build.result.folder}/src.zip"/>
+ <antcall target="src.zip"/>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
+ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**" />
+ </copy>
+ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="about_files/,about.html,plugin.properties,META-INF/" />
+ </copy>
+ <!-- <eclipse.versionReplacer path="${destination.temp.folder}/com.ibm.icu.base_3.4.5" version="3.4.5"/> -->
+ </target>
+
+ <target name="build.zips" depends="init">
+ </target>
+
+ <target name="gather.sources" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
+ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="false" overwrite="false"/>
+ <copy todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="false" overwrite="false">
+ <fileset dir="${basedir}" includes="about.html,about_files/" />
+ </copy>
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/com.ibm.icu.base_3.4.5"/>
+ <copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/com.ibm.icu.base_3.4.5" failonerror="false" overwrite="false"/>
+ </target>
+
+ <target name="clean" depends="init" description="Clean the plug-in: com.ibm.icu.base of all the zips, jars and logs created.">
+ <delete dir="${build.result.folder}/@dot"/>
+ <delete file="${build.result.folder}/src.zip"/>
+ <delete file="${plugin.destination}/com.ibm.icu.base_3.4.5.jar"/>
+ <delete file="${plugin.destination}/com.ibm.icu.base_3.4.5.zip"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+ <eclipse.convertPath fileSystemPath="/home/ben/icu4j-eclipse-plugins/build/plugins/com.ibm.icu.base" property="resourcePath"/>
+ <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+ </target>
+
+ <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.icu.base.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="build.sources"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <antcall target="gather.sources">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <delete>
+ <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
+ </delete>
+ <zip destfile="${plugin.destination}/com.ibm.icu.base_3.4.5.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+</project>
eclipse-swt-add-gecko-paths-profile-libs.patch:
PI/gtk/library/make_linux.mak | 0
make_linux.mak | 12 ++++++------
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE eclipse-swt-add-gecko-paths-profile-libs.patch ---
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
--- make_linux.mak 26 Jul 2006 16:33:23 -0000 1.33.2.1
+++ make_linux.mak 25 Sep 2006 23:48:20 -0000
@@ -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
eclipse-xpcom-profile.patch:
xpcom_profile.h | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE eclipse-xpcom-profile.patch ---
--- xpcom_profile.h.orig 2006-09-22 17:36:36.000000000 -0400
+++ xpcom_profile.h 2006-09-22 17:39:07.000000000 -0400
@@ -31,8 +31,8 @@
#define NDEBUG
#include "nsCOMPtr.h"
-#include "nsProfileDirServiceProvider.h"
+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
#include "xpcom_stats.h"
#endif /* INC_xpcom_profile_H */
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 4 Jul 2006 21:27:47 -0000 1.22
+++ .cvsignore 26 Sep 2006 04:45:35 -0000 1.23
@@ -1,2 +1,3 @@
-eclipse-sourceBuild-srcIncluded-3.2.zip
eclipse-fedora-splash-3.2.png
+icu4jsrc_3_4_5.jar
+eclipse-sourceBuild-srcIncluded-M20060921-0945.zip
eclipse-disable-junit4-apt.patch:
assemble.org.eclipse.sdk.linux.gtk.ia64.xml | 24 ----------------------
assemble.org.eclipse.sdk.linux.gtk.ppc.xml | 24 ----------------------
assemble.org.eclipse.sdk.linux.gtk.ppc64.xml | 24 ----------------------
assemble.org.eclipse.sdk.linux.gtk.x86.xml | 24 ----------------------
assemble.org.eclipse.sdk.linux.gtk.x86_64.xml | 24 ----------------------
features/org.eclipse.jdt/build.xml | 22 --------------------
features/org.eclipse.jdt/feature.xml | 27 -------------------------
plugins/org.eclipse.jdt.doc.isv/buildDoc.xml | 2 -
plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt | 4 ---
9 files changed, 3 insertions(+), 172 deletions(-)
Index: eclipse-disable-junit4-apt.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-disable-junit4-apt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-disable-junit4-apt.patch 4 Jul 2006 21:27:47 -0000 1.4
+++ eclipse-disable-junit4-apt.patch 26 Sep 2006 04:45:35 -0000 1.5
@@ -1,513 +1,509 @@
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-07-04 13:33:17.000000000 -0400
-@@ -106,9 +106,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
+diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
+--- features/org.eclipse.jdt/build.xml 2006-09-19 10:58:38.000000000 -0400
++++ features/org.eclipse.jdt/build.xml 2006-09-21 18:31:13.000000000 -0400
+@@ -12,11 +12,6 @@
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
+- <ant antfile="build.xml" dir="../../plugins/org.junit4" target="${target}">
+- <property name="arch" value="x86"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+ <ant antfile="build.xml" dir="../../plugins/org.junit" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+@@ -27,11 +22,6 @@
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
+- <property name="arch" value="x86"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.core" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+@@ -77,16 +67,6 @@
+ <property name="os" value="win32"/>
+ <property name="ws" value="win32"/>
+ </ant>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
+- <property name="arch" value="x86"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
+- <property name="arch" value="x86"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="win32"/>
+@@ -150,7 +130,7 @@
+ <copy todir="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html" />
+ </copy>
+- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml" selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.apt.core,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.apt.ui,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.core,3.2.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,org.eclipse.jdt.junit4.runtime,1.0.1.r321_v20060905,org.eclipse.jdt.launching,3.2.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,org.junit,3.8.1,org.junit4,4.1.0.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml" selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.core,3.2.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,org.eclipse.jdt.launching,3.2.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
+ <antcall target="rootFiles${os}_${ws}_${arch}"/>
+ </target>
+ <target name="rootFileswin32_win32_x86">
+diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
+--- features/org.eclipse.jdt/feature.xml 2006-07-04 13:40:47.000000000 -0400
++++ features/org.eclipse.jdt/feature.xml 2006-07-04 12:05:17.000000000 -0400
+@@ -38,20 +38,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jdt.apt.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.jdt.apt.ui"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.jdt.core"
+ download-size="0"
+ install-size="0"
+@@ -91,13 +77,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.eclipse.jdt.junit4.runtime"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.jdt.launching"
+ download-size="0"
+ install-size="0"
+@@ -118,12 +97,6 @@
+ version="3.8.1"/>
+
+ <plugin
+- id="org.junit4"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+ id="org.eclipse.jdt.doc.user"
+ download-size="0"
+ install-size="0"
+diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
+--- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2006-07-04 13:40:47.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2006-07-04 13:30:48.000000000 -0400
+@@ -75,7 +75,7 @@
+ <exec dir="." executable="${javadoc}" output="doc.bin.log">
+ <arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
+ </exec>
+- <antcall target="generateJdtAptJavadoc" />
++ <!-- <antcall target="generateJdtAptJavadoc" /> -->
+ </target>
+
+ <target name="generateJdtAptJavadoc">
+diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+--- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2006-07-04 13:40:47.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2006-07-04 13:42:37.000000000 -0400
+@@ -22,12 +22,10 @@
+ ;../org.eclipse.jdt.ui/ui refactoring
+ ;../org.eclipse.jdt.ui/core extension
+ ;../org.eclipse.jdt.core.manipulation/refactoring
+-;../org.eclipse.jdt.core.manipulation/common
+-;../org.eclipse.jdt.apt.core/src"
++;../org.eclipse.jdt.core.manipulation/common"
+ -d reference/api
+ -classpath @rt@
+ ;../../baseLocation/plugins/com.ibm.icu_3.4.5.jar
+-;../org.eclipse.jdt.apt.core/mirrorapi.jar
+ ;../org.apache.ant/lib/ant.jar
+ ;../org.eclipse.compare/@dot
+ ;../org.eclipse.core.commands/@dot
+diff -ruN assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-09-21 10:55:43.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-09-23 05:08:48.000000000 -0400
+@@ -97,9 +97,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp.source.linux.gtk.ia64" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -130,9 +127,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+@@ -109,9 +106,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -295,9 +289,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
+@@ -139,9 +133,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -325,9 +316,6 @@
- <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+@@ -157,9 +148,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -471,10 +459,6 @@
+@@ -451,10 +439,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
+ <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -495,10 +479,6 @@
+@@ -491,10 +475,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -675,10 +655,6 @@
+@@ -515,10 +495,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
+ <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
</antcall>
<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
---- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-07-04 13:33:54.000000000 -0400
-@@ -106,9 +106,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
+diff -ruN assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-09-21 10:55:43.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-09-23 05:23:13.000000000 -0400
+@@ -94,18 +94,12 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -130,9 +127,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -292,9 +286,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
+@@ -133,9 +127,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -322,9 +313,6 @@
- <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+@@ -151,9 +142,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -462,10 +450,6 @@
+@@ -442,10 +430,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
+ <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -486,10 +470,6 @@
+@@ -482,10 +466,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -662,10 +642,6 @@
+@@ -506,10 +486,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
+ <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
</antcall>
<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
---- assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-07-04 13:34:22.000000000 -0400
-@@ -109,9 +109,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
+diff -ruN assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-09-21 10:55:42.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-09-23 05:22:28.000000000 -0400
+@@ -94,18 +94,12 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -133,9 +130,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -298,9 +292,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
+@@ -136,9 +130,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -328,9 +319,6 @@
- <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+@@ -154,9 +145,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -471,10 +459,6 @@
+@@ -451,10 +439,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
+ <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
@@ -495,10 +479,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -675,10 +655,6 @@
+@@ -519,10 +499,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
+ <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
</antcall>
<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
---- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-07-04 13:34:53.000000000 -0400
-@@ -106,9 +106,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
+diff -ruN assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-09-21 10:55:43.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-09-23 05:24:32.000000000 -0400
+@@ -97,18 +97,12 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -130,9 +127,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -298,9 +292,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
+@@ -139,9 +133,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -331,9 +322,6 @@
- <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+@@ -157,9 +148,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -474,10 +462,6 @@
+@@ -454,10 +442,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
+ <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -498,10 +482,6 @@
+@@ -494,10 +478,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -678,10 +658,6 @@
+@@ -518,10 +498,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
+ <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
</antcall>
<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
---- assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-07-04 13:35:31.000000000 -0400
-@@ -112,9 +112,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
+diff -ruN assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-09-21 10:55:42.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-09-23 05:23:56.000000000 -0400
+@@ -97,18 +97,12 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -136,9 +133,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -298,9 +292,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
+@@ -136,9 +130,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -331,9 +322,6 @@
- <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+@@ -157,9 +148,6 @@
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.x86" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -474,10 +462,6 @@
+@@ -454,10 +442,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
+ <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -498,10 +482,6 @@
+@@ -494,10 +478,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -678,10 +658,6 @@
+@@ -522,10 +502,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
+- <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
+ <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
</antcall>
<antcall target="jarUp">
-diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
---- features/org.eclipse.jdt/build.xml 2006-07-04 13:40:47.000000000 -0400
-+++ features/org.eclipse.jdt/build.xml 2006-07-04 13:38:22.000000000 -0400
-@@ -12,11 +12,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.junit4" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.junit" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -27,11 +22,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.core" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -77,16 +67,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -150,7 +130,7 @@
- <copy todir="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html" />
- </copy>
-- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml" selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.apt.core,3.2.0.v20060602-1740,org.eclipse.jdt.apt.ui,3.2.0.v20060602-1740,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.junit4.runtime,1.0.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.junit4,4.1.0,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
-+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml" selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFileswin32_win32_x86">
-diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
---- features/org.eclipse.jdt/feature.xml 2006-07-04 13:40:47.000000000 -0400
-+++ features/org.eclipse.jdt/feature.xml 2006-07-04 12:05:17.000000000 -0400
-@@ -38,20 +38,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jdt.apt.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.apt.ui"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jdt.core"
- download-size="0"
- install-size="0"
-@@ -91,13 +77,6 @@
- version="0.0.0"/>
-
- <plugin
-- id="org.eclipse.jdt.junit4.runtime"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jdt.launching"
- download-size="0"
- install-size="0"
-@@ -118,12 +97,6 @@
- version="3.8.1"/>
-
- <plugin
-- id="org.junit4"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"/>
--
-- <plugin
- id="org.eclipse.jdt.doc.user"
- download-size="0"
- install-size="0"
-diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2006-07-04 13:40:47.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2006-07-04 13:30:48.000000000 -0400
-@@ -75,7 +75,7 @@
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
- <arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
- </exec>
-- <antcall target="generateJdtAptJavadoc" />
-+ <!-- <antcall target="generateJdtAptJavadoc" /> -->
- </target>
-
- <target name="generateJdtAptJavadoc">
-diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
---- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2006-07-04 13:40:47.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2006-07-04 13:42:37.000000000 -0400
-@@ -22,12 +22,10 @@
- ;../org.eclipse.jdt.ui/ui refactoring
- ;../org.eclipse.jdt.ui/core extension
- ;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.jdt.apt.core/src"
-+;../org.eclipse.jdt.core.manipulation/common"
- -d reference/api
- -classpath @rt@
- ;../../baseLocation/plugins/com.ibm.icu_3.4.4.1.jar
--;../org.eclipse.jdt.apt.core/mirrorapi.jar
- ;../org.apache.ant/lib/ant.jar
- ;../org.eclipse.compare/@dot
- ;../org.eclipse.core.commands/@dot
eclipse-swt-firefox.patch:
Eclipse_SWT_Mozilla/common/library/xpcom.cpp | 0
Eclipse_SWT_Mozilla/common/library/xpcom.h | 0
Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp | 0
Eclipse_SWT_Mozilla/common/library/xpcom_stats.h | 0
Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 0
Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java | 0
JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties | 0
plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties | 11 ++--
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp | 26 +++-------
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h | 1
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp | 7 +-
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h | 3 -
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 3 -
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java | 25 ---------
14 files changed, 21 insertions(+), 55 deletions(-)
Index: eclipse-swt-firefox.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-swt-firefox.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-swt-firefox.patch 18 Sep 2006 22:20:30 -0000 1.3
+++ eclipse-swt-firefox.patch 26 Sep 2006 04:45:35 -0000 1.4
@@ -9,10 +9,10 @@
#ifdef NATIVE_STATS
--int XPCOM_nativeFunctionCount = 131;
--int XPCOM_nativeFunctionCallCount[131];
-+int XPCOM_nativeFunctionCount = 130;
-+int XPCOM_nativeFunctionCallCount[130];
+-int XPCOM_nativeFunctionCount = 132;
+-int XPCOM_nativeFunctionCallCount[132];
++int XPCOM_nativeFunctionCount = 131;
++int XPCOM_nativeFunctionCallCount[131];
char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
eclipse-updatehomedir.patch:
plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java | 5 -
plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java | 7 +
plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java | 8 +
plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java | 4
plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java | 9 +
plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java | 4
plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java | 2
plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java | 48 ++++++++--
src/org/eclipse/update/internal/core/ConfiguredSite.java | 0
src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java | 0
src/org/eclipse/update/internal/search/SiteSearchCategory.java | 0
src/org/eclipse/update/internal/search/UpdatesSearchCategory.java | 0
src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java | 0
src/org/eclipse/update/internal/ui/wizards/TargetPage.java | 0
src/org/eclipse/update/search/IUpdateSearchQuery.java | 0
src/org/eclipse/update/search/UpdateSearchRequest.java | 0
16 files changed, 80 insertions(+), 7 deletions(-)
Index: eclipse-updatehomedir.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-updatehomedir.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-updatehomedir.patch 2 Jun 2006 21:46:07 -0000 1.6
+++ eclipse-updatehomedir.patch 26 Sep 2006 04:45:35 -0000 1.7
@@ -1,32 +1,134 @@
-Index: src/org/eclipse/update/search/UpdateSearchRequest.java
+Index: src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
===================================================================
-RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java,v
-retrieving revision 1.27
-diff -u -r1.27 UpdateSearchRequest.java
---- plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 29 Mar 2006 23:37:07 -0000 1.27
-+++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java 30 Mar 2006 06:02:10 -0000
-@@ -10,6 +10,7 @@
- *******************************************************************************/
- package org.eclipse.update.search;
-
-+import java.io.File;
- import java.net.URL;
- import java.util.ArrayList;
-
-@@ -140,11 +141,11 @@
- this.category = category;
- this.scope = scope;
+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 @@
/**
- * Returns the search catagory used in this request.
- * @return the search category
+ * Constructor for ReviewPage2
*/
--
- public IUpdateSearchCategory getCategory() {
- return category;
+- 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;
}
-@@ -251,6 +252,10 @@
+
+ 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) {
@@ -39,11 +141,11 @@
// when there is no mapped site the feature is not updatable
Index: src/org/eclipse/update/search/IUpdateSearchQuery.java
===================================================================
-RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java,v
+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 30 Mar 2006 06:02:10 -0000
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java 25 Sep 2006 22:38:05 -0000
@@ -7,6 +7,7 @@
*
* Contributors:
@@ -63,74 +165,76 @@
+ * @return the IFeature that is associated with the IUpdateSearchQuery
+ * @since 3.2
+ */
-+ public IFeature getFeature();
++ public IFeature getFeature();
}
Index: src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
===================================================================
-RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java,v
-retrieving revision 1.8
-diff -u -r1.8 OptionalFeatureSearchCategory.java
---- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 1 Mar 2005 20:29:16 -0000 1.8
-+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java 30 Mar 2006 06:02:10 -0000
+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;
++ return null;
+ }
}
public void addVersionedIdentifier(VersionedIdentifier vid) {
Index: src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
===================================================================
-RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java,v
-retrieving revision 1.26
-diff -u -r1.26 UpdatesSearchCategory.java
---- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 23 May 2005 17:59:41 -0000 1.26
-+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java 30 Mar 2006 06:02:10 -0000
+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: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java,v
-retrieving revision 1.12
-diff -u -r1.12 SiteSearchCategory.java
---- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 29 Mar 2006 23:37:08 -0000 1.12
-+++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java 30 Mar 2006 06:02:10 -0000
-@@ -114,6 +114,12 @@
+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;
++ return null;
+ }
++
}
public SiteSearchCategory() {
Index: src/org/eclipse/update/internal/core/ConfiguredSite.java
===================================================================
-RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java,v
+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 30 Mar 2006 06:02:10 -0000
++++ 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;
@@ -150,123 +254,3 @@
verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null);
return verifyStatus;
}
-Index: src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java,v
-retrieving revision 1.8
-diff -u -r1.8 InstallWizard2.java
---- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 17 Mar 2006 06:02:44 -0000 1.8
-+++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java 30 Mar 2006 06:02:11 -0000
-@@ -148,7 +148,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: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java,v
-retrieving revision 1.74
-diff -u -r1.74 TargetPage.java
---- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 21 Nov 2005 21:39:24 -0000 1.74
-+++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java 30 Mar 2006 06:02:11 -0000
-@@ -13,6 +13,9 @@
- import java.io.*;
- import java.util.*;
-
-+import org.eclipse.core.runtime.Platform;
-+import org.eclipse.core.runtime.CoreException;
-+import org.eclipse.core.runtime.IStatus;
- import org.eclipse.jface.dialogs.Dialog;
- import org.eclipse.jface.resource.*;
- import org.eclipse.jface.viewers.*;
-@@ -41,6 +44,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
-@@ -113,13 +117,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) {
-@@ -150,7 +155,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);
-
-@@ -360,17 +365,51 @@
- 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$
-+ 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 getFirstTargetSite(IInstallFeatureOperation job) {
- 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: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- eclipse.spec 25 Sep 2006 15:31:26 -0000 1.328
+++ eclipse.spec 26 Sep 2006 04:45:35 -0000 1.329
@@ -18,7 +18,7 @@
%define eclipse_major 3
%define eclipse_minor 2
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 0
+%define eclipse_micro 1
%define libname libswt3
# All arches line up except i386 -> x86
@@ -31,13 +31,15 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 8%{?dist}
+Release: 0.RC.1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/eclipse-sourceBuild-srcIncluded-3.2.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/M20060921-0945/eclipse-sourceBuild-srcIncluded-M20060921-0945.zip
Source2: %{name}.desktop
Source5: %{name}-48.png
+# FIXME: this should be in its own package
+Source7: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
%if %{fedora}
Source11: %{name}-fedora-splash-3.2.png
%endif
@@ -60,8 +62,11 @@
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
# GNU XML issue identified by Michael Koch
Patch2: %{name}-build.patch
+Patch3: %{name}-icu4j-build-files.patch
Patch4: %{name}-libupdatebuild.patch
Patch5: %{name}-libupdatebuild2.patch
+Patch6: %{name}-xpcom-profile.patch
+Patch7: %{name}-swt-add-gecko-paths-profile-libs.patch
# Build swttools.jar
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
Patch18: %{name}-swttools.patch
@@ -111,8 +116,6 @@
Patch34: %{name}-bz162177.patch
# Use ecj for gcj
Patch57: %{name}-ecj-gcj.patch
-# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200929
Patch59: %{name}-swt-firefox.patch
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
@@ -370,7 +373,16 @@
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0
%patch52 -p0
+# Only compile the mozilla 1.7 / firefox profile library
+sed --in-place "s/make_mozilla:\$(MOZILLA_LIB).*/make_mozilla:\$(MOZILLA_LIB) \$(PROFILE17_LIB)/" make_linux.mak
+# FIXME: file bug about this upstream
+%patch7 -p0
+popd
+pushd ./plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
+# fix swt profile include
+%patch6 -p0
popd
+
%patch2 -p0
%patch4 -p0
%patch5 -p0
@@ -567,13 +579,6 @@
ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
# END LUCENE ##
-# setup the jsch plugin build
-rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
-# FIXME remove version number
-pushd baseLocation/plugins
-unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
-rm com.jcraft.jsch_*.jar
-popd
## BEGIN TOMCAT ##
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
@@ -694,6 +699,48 @@
done
popd
+# setup the jsch plugin build
+rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
+# FIXME remove version number, file a bug about this
+pushd baseLocation/plugins
+# get the Manifest file
+unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
+rm com.jcraft.jsch_*.jar
+popd
+
+# setup with the icu4j plugins for building
+pushd baseLocation/plugins
+rm com.ibm.icu.base_3.4.5.jar \
+ com.ibm.icu_3.4.5.jar \
+ com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip \
+ com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip
+mkdir -p icu4j-build-temp
+
+pushd icu4j-build-temp
+unzip -qq %{SOURCE7}
+sed --in-place "s/ .*bootclasspath=.*//g" build.xml
+ant eclipseProjects
+popd
+
+mkdir -p icu4j-build
+mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build
+mv icu4j-build-temp/eclipseProjects/com.ibm.icu.base icu4j-build
+rm -r icu4j-build-temp
+
+# add build.xml patches
+pushd icu4j-build
+%patch3 -p1
+popd
+
+popd
+
+# delete included jars
+# FIXME: file a bug about these
+rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
+ plugins/org.eclipse.swt/extra_jars/exceptions.jar \
+ plugins/org.eclipse.swt.tools/swttools.jar \
+ features/org.eclipse.platform.launchers/bin/startup.jar
+
# make sure there are no jars left
JARS=""
for j in $(find -name \*.jar); do
@@ -718,8 +765,36 @@
sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
jar -Mcf ../com.jcraft.jsch_0.1.28.jar *
popd
+# FXIME don't delete this, do what icu4j does
rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
+# finish the icu4j build
+pushd baseLocation/plugins
+
+# build the icu.base plugin
+zipfile=$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip
+pushd icu4j-build/com.ibm.icu.base/src
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
+popd
+pushd icu4j-build/com.ibm.icu.base
+ant build.update.jar
+popd
+mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar .
+
+# build the icu plugin
+zipfile=$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip
+pushd icu4j-build/com.ibm.icu/src
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
+popd
+pushd icu4j-build/com.ibm.icu
+ant build.update.jar
+popd
+mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar .
+
+popd
+
# Bootstrapping is 3 parts:
# 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
# 2. Build ecj with gcj-built ecj ("javac")
@@ -947,14 +1022,19 @@
$RPM_BUILD_ROOT%{_datadir}/%{name}/configuration/config.ini
%if %{fedora}
-# Put Fedora Core version into about.mappings of org.eclipse.sdk to show it in
-# Eclipse about dialog. (courtesy Debian Eclipse packagers)
+# Put Fedora Core version into about.mappings of org.eclipse.sdk and
+# org.eclipse.platform to show it in # Eclipse about dialog. (courtesy Debian
+# Eclipse packagers)
# FIXME use the third id
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.%{eclipse_micro}.*
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.*
FEDORA_VERSION=`cat /etc/fedora-release`
sed -e "s/\(0=.*\)/\1 ($FEDORA_VERSION)/" < about.mappings > about.mappings.tmp
mv about.mappings.tmp about.mappings
popd
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.*
+sed -e "s/\(0=.*\)/\1 ($FEDORA_VERSION)/" < about.mappings > about.mappings.tmp
+mv about.mappings.tmp about.mappings
+popd
%endif
# Create a script that can be used to make a symlink tree of the
@@ -1085,10 +1165,9 @@
# Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
# %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$JDTCOREVERSION.jar \
- $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
-ln -s %{_datadir}/java/eclipse-ecj.jar \
- $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
+JDTCORESUFFIX=$(ls %{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
+ln -s %{_datadir}/java/eclipse-ecj.jar $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
# FIXME: due to aot-compile-rpm smarts, the required resource bundles aren't
# being compiled so this truly native ecj binary isn't possible
@@ -1126,8 +1205,10 @@
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
+if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then
sed --in-place "s/#eclipse.product=/eclipse.product=org.eclipse.platform.ide/" \
%{_datadir}/%{name}/configuration/config.ini
+fi
%postun platform
%if %{gcj_support}
@@ -1137,22 +1218,28 @@
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
+if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then
sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \
%{_datadir}/%{name}/configuration/config.ini
+fi
%post sdk
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%endif
+if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then
sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \
%{_datadir}/%{name}/configuration/config.ini
+fi
%postun sdk
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%endif
+if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then
sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
%{_datadir}/%{name}/configuration/config.ini
+fi
%if %{gcj_support}
%post ecj -p %{_bindir}/rebuild-gcj-db
@@ -1497,6 +1584,12 @@
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Mon Sep 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.1-0.RC.1
+- M20060921-0945 (3.2.1 pre-release).
+- Upadate patches to 3.2.1.
+- Add icu4j 3.4.5 sources.
+- Add Fedora version to platform about.mappings as well as sdk.
+
* Mon Sep 25 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-8
- Remove unused eclipse.conf.
- Remove unused gre64.conf patch (applied upstream).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 20 Jul 2006 23:42:26 -0000 1.35
+++ sources 26 Sep 2006 04:45:35 -0000 1.36
@@ -1,2 +1,3 @@
-67b41802092d4b2f779fb756dcaec85c eclipse-sourceBuild-srcIncluded-3.2.zip
a86209ba94fc9ccdda63a781bd4ea0d8 eclipse-fedora-splash-3.2.png
+c3be75d8af3c31b7a1748247ab3fee95 icu4jsrc_3_4_5.jar
+0fe89e9c7cf07a56c4fe8e2d7f5a394b eclipse-sourceBuild-srcIncluded-M20060921-0945.zip
More information about the fedora-cvs-commits
mailing list