diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2011-04-04 08:56:08 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2011-04-04 08:56:08 +0000 |
| commit | 9c9c3b0248e01418ef2ccc3b04108427bb437eea (patch) | |
| tree | 4ebd0005706e0eb4448e17778d9214f30757cddc /dev-util/eclipse-sdk | |
| parent | Revision bump to fix doc file installation (diff) | |
| download | gentoo-2-9c9c3b0248e01418ef2ccc3b04108427bb437eea.tar.gz gentoo-2-9c9c3b0248e01418ef2ccc3b04108427bb437eea.tar.bz2 gentoo-2-9c9c3b0248e01418ef2ccc3b04108427bb437eea.zip | |
Cleanup eclipse-sdk.
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/eclipse-sdk')
16 files changed, 13 insertions, 1850 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index 50848005541d..a386188939bc 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-util/eclipse-sdk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.159 2011/04/03 07:58:50 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.160 2011/04/04 08:56:07 ali_bush Exp $ + + 04 Apr 2011; Alistair Bush <ali_bush@gentoo.org> + -files/3.3/ant-osgi-manifest.mf, -files/3.3/eclipse-3.3-r1, + -files/3.3/disable-jdt-tool.diff, -files/3.3/eclipse-3.3, + -eclipse-sdk-3.5.1.ebuild, -files/3.3/disable-jdk6.diff, + -files/3.3/disable-swt.diff, -files/3.3/eclipse-jsch-api-update.patch, + -files/3.3/eclipse-workbench-miscompile-workaround.diff, + -files/3.3/eclipserc, -files/3.3/fedora/eclipse-fileinitializer.patch, + -files/3.3/fedora/eclipse-libupdatebuild2.patch, + -files/3.3/fedora/eclipse-pde.build-add-package-build.patch, + -files/3.3/launcher_double-free.diff, -files/3.3/set-java-home.diff: + Cleanup eclipse-sdk. 03 Apr 2011; Alistair Bush <ali_bush@gentoo.org> files/3.4/eclipse-3.4: Fix for #274545. Thanks to Christoph Brill diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1.ebuild deleted file mode 100644 index 8a39d390842d..000000000000 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1.ebuild,v 1.2 2010/02/09 10:57:02 ali_bush Exp $ - -EAPI="2" -WANT_ANT_TASKS="ant-nodeps" - -# eclipse-build is too complicated for automatic fixing -# if there are any fixes we should create patches -# and push them upstream -JAVA_PKG_BSFIX="off" - -inherit java-pkg-2 java-ant-2 check-reqs - -BUILD_ID="R3_5_1" -ECLIPSE_BUILD_VER="R0_4_0" -S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}" - -DESCRIPTION="Eclipse SDK" -HOMEPAGE="http://www.eclipse.org/eclipse/" -SRC_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-${BUILD_ID}-fetched-src.tar.bz2 - http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="3.5" -KEYWORDS="~amd64 ~x86" -IUSE="doc gnome source" - -CDEPEND=">=dev-java/swt-${PV}:${SLOT} - >=dev-java/ant-1.7.1 - >=dev-java/ant-core-1.7.1 - >=dev-java/asm-3.1:3 - >=dev-java/commons-codec-1.3 - >=dev-java/commons-el-1.0 - >=dev-java/commons-httpclient-3.1:3 - >=dev-java/commons-logging-1.0.4 - >=dev-java/hamcrest-core-1.1 - >=dev-java/icu4j-4.0.1:4 - >=dev-java/jsch-0.1.41 - >=dev-java/junit-3.8.2:0 - >=dev-java/junit-4.5:4 - >=dev-java/lucene-1.9.1:1.9 - >=dev-java/lucene-analyzers-1.9.1:1.9 - >=dev-java/sat4j-core-2.1:2 - >=dev-java/sat4j-pseudo-2.1:2 - dev-java/tomcat-servlet-api:2.5 - x86? ( gnome? ( gnome-base/gconf ) ) - dev-java/ant-nodeps" -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" -DEPEND="${CDEPEND} - app-arch/unzip - app-arch/zip - >=virtual/jdk-1.6" - -ALL_OS='aix hpux linux macosx qnx solaris win32' -ALL_WS='carbon cocoa gtk motif photon win32 wpf' -ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64' - -buildDir="${S}/build/eclipse-${BUILD_ID}-fetched-src" - -pkg_setup() { - ws='gtk' - if use x86 ; then os='linux' ; arch='x86' - elif use amd64 ; then os='linux' ; arch='x86_64' - fi - - java-pkg-2_pkg_setup - - if use doc ; then - ewarn "Having the 'doc' USE flag enabled greatly increases the build time." - ewarn "You might want to disable it for ${PN} if you don't need it." - fi -} - -src_unpack() { - CHECKREQS_MEMORY="1536" - if use doc || use source ; then - CHECKREQS_DISK_BUILD="3072" - else - CHECKREQS_DISK_BUILD="1536" - fi - check_reqs - - unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz" - mv "${WORKDIR}/eclipse-build-0_4_RC6" "${S}" || die - ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die - - cd "${S}" - eant unpack -} - -src_prepare() { - epatch "${FILESDIR}/3.5/jvmarg.patch" || die - - # apply patches before we start cleaning junk out - eant applyPatches - - # fix up hardcoded runtime class paths - sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \ - -i {,pde}build.properties || die - - # fix up arch specifications if we're x86_64 - if use amd64 ; then - sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die - fi - - # disable building of libgnomeproxy on x86 if USE=-gnome - if ! use gnome ; then - sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die - fi - - # skip compilation of SWT native libraries (we use the system-installed copies) - sed_xml_element 'ant' -e '/swt/d' -i build.xml || die - - ebegin 'Removing plugins of irrelevant platforms' - local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / } - remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'} - local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / } - remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'} - local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / } - remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'} - sed_xml_element 'includes\|plugin' \ - -e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \ - -e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \ - -i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \ - || die 'remove irrelevant platforms failed' - eend - - if ! use doc ; then - ebegin 'Removing documentation plugins' - rm -rf "${buildDir}"/plugins/*.doc{,.*} - eclipse_delete-plugins '.*\.doc\(\..*\|\)' - eend - fi - - if ! use source ; then - ebegin 'Removing source plugins' - rm -rf "${buildDir}"/plugins/*.source{,_*} - eclipse_delete-plugins '.*\.source' - eend - fi -} - -src_compile() { - ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch} -} - -src_install() { - local destDir="/usr/$(get_libdir)/eclipse-${SLOT}" - - insinto "${destDir}" - shopt -s dotglob - doins -r "${buildDir}"/installation/* || die - shopt -u dotglob - chmod +x "${D}${destDir}"/eclipse - rm -f "${D}${destDir}"/libcairo-swt.so # use the system-installed SWT libraries - - ebegin 'Unbundling dependencies' - pushd "${D}${destDir}" > /dev/null || die - eclipse_unbundle-dir plugins/org.apache.ant_* ant-core,ant-nodeps lib - eclipse_unbundle-dir plugins/org.junit_* junit - eclipse_unbundle-dir plugins/org.junit4_* junit-4 - eclipse_unbundle-jar plugins/com.ibm.icu_*.jar icu4j-4 - eclipse_unbundle-jar plugins/com.jcraft.jsch_*.jar jsch - eclipse_unbundle-jar plugins/javax.servlet_*.jar tomcat-servlet-api-2.5 servlet-api - eclipse_unbundle-jar plugins/javax.servlet.jsp_*.jar tomcat-servlet-api-2.5 jsp-api - eclipse_unbundle-jar plugins/org.apache.commons.codec_*.jar commons-codec - eclipse_unbundle-jar plugins/org.apache.commons.el_*.jar commons-el - eclipse_unbundle-jar plugins/org.apache.commons.httpclient_*.jar commons-httpclient-3 - eclipse_unbundle-jar plugins/org.apache.commons.logging_*.jar commons-logging - #eclipse_unbundle-jar plugins/org.apache.jasper_*.jar tomcat-jasper - eclipse_unbundle-jar plugins/org.apache.lucene_*.jar lucene-1.9 - eclipse_unbundle-jar plugins/org.apache.lucene.analysis_*.jar lucene-analyzers-1.9 - eclipse_unbundle-jar plugins/org.eclipse.swt."${ws}.${os}.${arch}"_*.jar swt-${SLOT} - eclipse_unbundle-jar plugins/org.hamcrest.core_*.jar hamcrest-core - #eclipse_unbundle-jar plugins/org.mortbay.jetty_*.jar jetty - eclipse_unbundle-jar plugins/org.objectweb.asm_*.jar asm-3 - eclipse_unbundle-jar plugins/org.sat4j.core_*.jar sat4j-core-2 - eclipse_unbundle-jar plugins/org.sat4j.pb_*.jar sat4j-pseudo-2 - popd > /dev/null - eend - - # Install Gentoo wrapper and config - dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die - insinto /etc - doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die - - # Create desktop entry - make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die -} - -# Replaces the bundled jars in plugin dir ${1} with links to the jars from -# java-config package ${2}. If ${3} is given, the jars are linked in ${1}/${3}. -eclipse_unbundle-dir() { - local bundle=${1} package=${2} into=${3} - local basename=$(basename "${bundle}") - local barename=${basename%_*} - - if [[ -d "${bundle}" ]] ; then - einfo " ${barename} => ${package}" - - pushd "${bundle}" > /dev/null || die - local classpath=$(manifest_get META-INF/MANIFEST.MF 'Bundle-ClassPath') - manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest' - rm -f ${classpath//,/ } META-INF/ECLIPSEF.{RSA,SF} - java-pkg_jar-from ${into:+--into "${into}"} "${package}" - popd > /dev/null - fi -} - -# Converts plugin jar ${1} into a plugin dir, creates symbolic links to the -# jars of java-config package ${2} in that dir, and updates artifacts.xml and -# bundles.info to reflect the fact that the plugin is now a dir. -eclipse_unbundle-jar() { - local bundle=${1} package=${2} jar=${3} - local basename=$(basename "${bundle}" .jar) - local barename=${basename%_*} - - if [[ -f "${bundle}" ]] ; then - einfo " ${barename} => ${package}" - - mkdir "${bundle%.jar}" - pushd "${bundle%.jar}" > /dev/null || die - "$(java-config --jar)" -xf "../${basename}.jar" plugin.properties META-INF/MANIFEST.MF || die - java-pkg_jar-from "${package}" ${jar:+"${jar}.jar"} - local classpath=$(find . -type l -name '*.jar' -print0 | tr '\0' ',') - classpath=${classpath%,} ; classpath=${classpath//.\/} - manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest' - manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "${classpath}" - popd > /dev/null || die - rm "${bundle}" - - sed_xml_element 'artifact' \ - -e '/id='\'"${barename//./\.}"\''/s|</artifact>| <repositoryProperties size='\'1\''>\n <property name='\'artifact.folder\'' value='\'true\''/>\n </repositoryProperties>\n \0|' \ - -i artifacts.xml || die - sed -e 's|'"${bundle//./\.}"'|'"${bundle%.jar}"'/|' \ - -i configuration/org.eclipse.equinox.simpleconfigurator/bundles.info || die - fi -} - -# Removes feature.xml references to plugins matching ${1}. -eclipse_delete-plugins() { - sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \ - -i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \ - || die 'eclipse_delete-plugins failed' -} - -# Prints the first value from manifest file ${1} whose key matches regex ${2}, -# unfolding as necessary. -manifest_get() { - sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \ - || die 'manifest_get failed' -} - -# Deletes values from manifest file ${1} whose keys match regex ${2}, taking -# into account folding. -manifest_delete() { - sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \ - || die 'manifest_delete failed' -} - -# Replaces the value for key ${2} in the first section of manifest file ${1} -# with ${3}, or adds the key-value pair to that section if the key was absent. -manifest_replace() { - LC_ALL='C' awk -v key="${2}" -v val="${3}" ' -function fold(s, o, l, r) { - o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1) - while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 } - return r substr(s, o) -} -BEGIN { FS = ": " } -f { print ; next } -i { if ($0 !~ "^ ") { f = 1 ; print } ; next } -$1 == key { print fold(key FS val) ; i = 1 ; next } -/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next } -{ print } -END { if (!f) { print fold(key FS val) } } -' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed' -} - -# Executes sed over each XML element with a name matching ${1}, rather than -# over each line. The entire element (and its children) may be removed with the -# 'd' command, or they may be edited using all the usual sed foo. Basically, -# the script argument will be executed only for elements matching ${1}, and the -# sed pattern space will consist of the entire element, including any nested -# elements. Note that this is not perfect and requires no more than one XML -# element per line to be reliable. -sed_xml_element() { - local elem="${1}" ; shift - sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \ - -e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}" -} diff --git a/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf b/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf deleted file mode 100644 index deb8a6aa87a8..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Apache Ant -Bundle-Vendor: Gentoo -Bundle-SymbolicName: org.apache.ant -Bundle-Version: 1.7.0 -Bundle-ClassPath: lib/ant.jar,lib/ant-launcher.jar,lib/ant-nodeps.jar -Export-Package: images,org.apache.tools.ant,org.apache.tools.ant.dispatch,org.apache.tools.ant.filters,org.apache.tools.ant.filters.util, - org.apache.tools.ant.helper,org.apache.tools.ant.input,org.apache.tools.ant.listener,org.apache.tools.ant.loader, - org.apache.tools.ant.taskdefs,org.apache.tools.ant.taskdefs.compilers,org.apache.tools.ant.taskdefs.condition, - org.apache.tools.ant.taskdefs.cvslib,org.apache.tools.ant.taskdefs.email,org.apache.tools.ant.taskdefs.optional, - org.apache.tools.ant.taskdefs.optional.ccm,org.apache.tools.ant.taskdefs.optional.clearcase,org.apache.tools.ant.taskdefs.optional.depend, - org.apache.tools.ant.taskdefs.optional.depend.constantpool,org.apache.tools.ant.taskdefs.optional.dotnet, - org.apache.tools.ant.taskdefs.optional.ejb,org.apache.tools.ant.taskdefs.optional.extension,org.apache.tools.ant.launch, - org.apache.tools.ant.taskdefs.optional.extension.resolvers,org.apache.tools.ant.taskdefs.optional.i18n, - org.apache.tools.ant.taskdefs.optional.image,org.apache.tools.ant.taskdefs.optional.j2ee,org.apache.tools.ant.taskdefs.optional.javacc, - org.apache.tools.ant.taskdefs.optional.javah,org.apache.tools.ant.taskdefs.optional.jdepend,org.apache.tools.ant.taskdefs.optional.jlink, - org.apache.tools.ant.taskdefs.optional.jsp,org.apache.tools.ant.taskdefs.optional.jsp.compilers,org.apache.tools.ant.taskdefs.optional.junit, - org.apache.tools.ant.taskdefs.optional.junit.xsl,org.apache.tools.ant.taskdefs.optional.native2ascii,org.apache.tools.ant.taskdefs.optional.net, - org.apache.tools.ant.taskdefs.optional.perforce,org.apache.tools.ant.taskdefs.optional.pvcs,org.apache.tools.ant.taskdefs.optional.scm, - org.apache.tools.ant.taskdefs.optional.script,org.apache.tools.ant.taskdefs.optional.sos,org.apache.tools.ant.taskdefs.optional.sound, - org.apache.tools.ant.taskdefs.optional.splash,org.apache.tools.ant.taskdefs.optional.ssh,org.apache.tools.ant.taskdefs.optional.starteam, - org.apache.tools.ant.taskdefs.optional.unix,org.apache.tools.ant.taskdefs.optional.vss,org.apache.tools.ant.taskdefs.optional.windows, - org.apache.tools.ant.taskdefs.rmic,org.apache.tools.ant.types,org.apache.tools.ant.types.conditions,org.apache.tools.ant.types.mappers, - org.apache.tools.ant.types.optional,org.apache.tools.ant.types.optional.depend,org.apache.tools.ant.types.optional.image, - org.apache.tools.ant.types.resolver,org.apache.tools.ant.types.resources,org.apache.tools.ant.types.resources.comparators, - org.apache.tools.ant.types.resources.selectors,org.apache.tools.ant.types.selectors,org.apache.tools.ant.types.selectors.modifiedselector, - org.apache.tools.ant.types.spi,org.apache.tools.ant.util,org.apache.tools.ant.util.depend,org.apache.tools.ant.util.depend.bcel, - org.apache.tools.ant.util.facade,org.apache.tools.ant.util.java15,org.apache.tools.ant.util.optional,org.apache.tools.ant.util.regexp, - org.apache.tools.bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
\ No newline at end of file diff --git a/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff b/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff deleted file mode 100644 index 8a2c3504025c..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff +++ /dev/null @@ -1,160 +0,0 @@ -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-11-05 18:19:38.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-11-06 11:39:09.000000000 +0100 -@@ -269,9 +269,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -293,9 +290,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.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -708,10 +702,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/> - </antcall> - <antcall target="jarUp"> -@@ -740,10 +730,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-11-05 18:19:53.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-11-06 11:40:02.000000000 +0100 -@@ -266,9 +266,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -290,9 +287,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.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -704,10 +698,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/> - </antcall> - <antcall target="jarUp"> -@@ -736,10 +726,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-11-05 18:20:07.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-11-06 11:40:34.000000000 +0100 -@@ -266,9 +266,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -293,9 +290,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.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -704,10 +698,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/> - </antcall> - <antcall target="jarUp"> -@@ -740,10 +730,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/features/org.eclipse.jdt/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/features/org.eclipse.jdt/build.xml 2007-11-05 18:20:50.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml 2007-11-06 11:37:20.000000000 +0100 -@@ -32,21 +32,11 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" 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.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.pluggable.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.debug" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> diff --git a/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff b/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff deleted file mode 100644 index 636e830e1a32..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff +++ /dev/null @@ -1,104 +0,0 @@ -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-11-05 17:29:09.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-11-05 18:19:38.000000000 +0100 -@@ -98,9 +98,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -531,10 +528,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-11-05 17:30:35.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-11-05 18:19:53.000000000 +0100 -@@ -98,9 +98,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -527,10 +524,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-11-05 17:30:20.000000000 +0100 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-11-05 18:20:07.000000000 +0100 -@@ -98,9 +98,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -527,10 +524,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/build.xml 2007-10-23 23:31:15.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml 2007-11-05 18:20:50.000000000 +0100 -@@ -32,11 +32,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" 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.compiler.apt" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/feature.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/feature.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/feature.xml 2007-10-23 23:48:30.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/feature.xml 2007-11-05 18:21:00.000000000 +0100 -@@ -66,13 +66,6 @@ - fragment="true" - unpack="false"/> - -- <plugin -- id="org.eclipse.jdt.compiler.tool" -- download-size="0" -- install-size="0" -- version="0.0.0" -- fragment="true" -- unpack="false"/> - - <plugin - id="org.eclipse.jdt.core" diff --git a/dev-util/eclipse-sdk/files/3.3/disable-swt.diff b/dev-util/eclipse-sdk/files/3.3/disable-swt.diff deleted file mode 100644 index 88120037469c..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/disable-swt.diff +++ /dev/null @@ -1,331 +0,0 @@ -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-10-23 23:31:15.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2007-11-05 17:29:09.000000000 +0100 -@@ -239,9 +239,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.ppc" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.scheduler" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -570,10 +567,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.swt_3.3.2.v3347"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-10-23 23:31:15.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2007-11-05 17:30:35.000000000 +0100 -@@ -257,9 +257,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.x86_64" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -566,10 +563,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.swt_3.3.2.v3347"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-10-23 23:31:15.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2007-11-05 17:30:20.000000000 +0100 -@@ -68,9 +68,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.x86" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide.application" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -494,10 +491,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.swt.gtk.linux.x86_3.3.2.v3347"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.ui.ide.application_1.0.0.I20070530-0100"/> - </antcall> - <antcall target="jarUp"> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/build.xml 2007-10-23 23:49:43.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/build.xml 2007-11-05 17:23:39.000000000 +0100 -@@ -72,26 +72,6 @@ - </target> - - <target name="compilelibs" depends="init,clean,compile" if="libsconfig"> -- <property name="swtlibs" value="${buildDirectory}/swttmp" /> -- <mkdir dir="${swtlibs}" /> -- -- <!-- unzip swt zips --> -- <unzip dest="${swtlibs}"> -- <fileset dir="${buildDirectory}/plugins/org.eclipse.rcp.source.${installOs}.${installWs}.${installArch}/src/"> -- <include name="org.eclipse.swt.${installWs}.${installOs}.${installArch}_*/*.zip" /> -- </fileset> -- </unzip> -- <exec dir="${swtlibs}/" executable="sh" failonerror="true"> -- <arg line="build.sh" /> -- </exec> -- <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" /> -- <mkdir dir="${swtdir}" /> -- <move todir="${swtdir}/"> -- <fileset dir="${swtlibs}"> -- <include name="**/*.so" /> -- </fileset> -- </move> -- - <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" /> - <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true"> - <arg line="build.sh" /> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.platform/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.platform/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.platform/build.xml 2007-10-23 23:31:14.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.platform/build.xml 2007-11-05 17:21:53.000000000 +0100 -@@ -292,11 +292,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.win32" 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.ui.workbench.texteditor" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp/build.xml 2007-10-23 23:31:15.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp/build.xml 2007-11-05 17:25:38.000000000 +0100 -@@ -77,86 +77,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt" 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.swt.motif.hpux.ia64_32" target="${target}"> -- <property name="arch" value="ia64_32"/> -- <property name="os" value="hpux"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="qnx"/> -- <property name="ws" value="photon"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> -- <property name="arch" value="sparc"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}"> -- <property name="arch" value="ia64"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="linux"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}"> -- <property name="arch" value="PA_RISC"/> -- <property name="os" value="hpux"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="aix"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="macosx"/> -- <property name="ws" value="carbon"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}"> -- <property name="arch" value="sparc"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}"> -- <property name="arch" value="s390x"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390" target="${target}"> -- <property name="arch" value="s390"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="wpf"/> -- </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -232,16 +152,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" 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.swt.gtk.linux.x86_64" target="${target}"> -- <property name="arch" value="x86_64"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -262,11 +172,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="macosx"/> -- <property name="ws" value="carbon"/> -- </ant> - </target> - <target name="all.features" depends="init"> - </target> -diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp.source/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp.source/build.xml ---- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp.source/build.xml 2007-10-23 23:31:14.000000000 +0200 -+++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp.source/build.xml 2007-11-06 17:06:52.000000000 +0100 -@@ -12,91 +12,6 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.motif.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="linux"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.s390" target="${target}"> -- <property name="arch" value="s390"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.motif.sparc" target="${target}"> -- <property name="arch" value="sparc"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.win32.win32.x86" 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.rcp.source.linux.gtk.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.aix.motif.ppc" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="aix"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="macosx"/> -- <property name="ws" value="carbon"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.sparc" target="${target}"> -- <property name="arch" value="sparc"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="solaris"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86_64" target="${target}"> -- <property name="arch" value="x86_64"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.win32.wpf.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="wpf"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.PA_RISC" target="${target}"> -- <property name="arch" value="PA_RISC"/> -- <property name="os" value="hpux"/> -- <property name="ws" value="motif"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ppc" target="${target}"> -- <property name="arch" value="ppc"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.qnx.photon.x86" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="qnx"/> -- <property name="ws" value="photon"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.s390x" target="${target}"> -- <property name="arch" value="s390x"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ia64" target="${target}"> -- <property name="arch" value="ia64"/> -- <property name="os" value="linux"/> -- <property name="ws" value="gtk"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.ia64_32" target="${target}"> -- <property name="arch" value="ia64_32"/> -- <property name="os" value="hpux"/> -- <property name="ws" value="motif"/> -- </ant> - </target> - <target name="all.features" depends="init"> - </target> diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3 b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3 deleted file mode 100644 index e7e584fcc60d..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Tiny startup wrapper for Eclipse-3.3 -# -# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org> -# Copyright (c) 2004-2008, Gentoo Foundation -# -# Licensed under the GNU General Public License, version 2 -# - -[[ -f "/etc/eclipserc" ]] && source "/etc/eclipserc" -[[ -f "$HOME/.gentoo/eclipserc" ]] && source "$HOME/.gentoo/eclipserc" - -ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.3"} -ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" - -if [[ ! -x "${ECLIPSE_BIN}" ]] ; then - echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit -1 -fi - -if ((EUID==0)); then - echo "!!! You are running Eclipse as root." - echo "!!! This is not recommended, nor needed." -fi - -# get MOZILLA_FIVE_HOME from swt's package.env -# a bit hackish way but works, bug #214785 -eval $(gjl --package swt-3 --get-args) - -if [[ "${ECLIPSE_XMS}" ]]; then VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"; fi -if [[ "${ECLIPSE_XMX}" ]]; then VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"; fi -if [[ "${ECLIPSE_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"; fi -if [[ "${ECLIPSE_MAX_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"; fi - -exec "${ECLIPSE_BIN}" "$@" -vmargs ${VM_ARGS} -Djava.library.path=/usr/lib diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1 b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1 deleted file mode 100644 index 5f8c89fbdf1b..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1 +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Tiny startup wrapper for Eclipse-3.3 -# -# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org> -# Copyright (c) 2004-2008, Gentoo Foundation -# -# Licensed under the GNU General Public License, version 2 -# - -[[ -f "/etc/eclipserc" ]] && source "/etc/eclipserc" -[[ -f "$HOME/.gentoo/eclipserc" ]] && source "$HOME/.gentoo/eclipserc" - -ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.3"} -ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" - -if [[ ! -x "${ECLIPSE_BIN}" ]] ; then - echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit -1 -fi - -if ((EUID==0)); then - echo "!!! You are running Eclipse as root." - echo "!!! This is not recommended, nor needed." -fi - -# get MOZILLA_FIVE_HOME from swt's package.env -# a bit hackish way but works, bug #214785 -eval $(gjl --package swt-3 --get-args) - -if [[ "${ECLIPSE_XMS}" ]]; then VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"; fi -if [[ "${ECLIPSE_XMX}" ]]; then VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"; fi -if [[ "${ECLIPSE_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"; fi -if [[ "${ECLIPSE_MAX_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"; fi - -# workaround for bug #215150 -if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then - if [[ $(java-config -g VERSION) == *1.6.0.06 || $(java-config -g VERSION) == *1.6.0.05 || $(java-config -g VERSION) == *1.6.0.04 ]]; then - echo "Performing workaround for bug #215150" - VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" - fi -fi - -exec "${ECLIPSE_BIN}" "$@" -vmargs ${VM_ARGS} -Djava.library.path=/usr/lib diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch b/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch deleted file mode 100644 index d829d3ec8081..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java.orig 2007-12-16 14:36:48.000000000 +1300 -+++ src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java 2007-12-16 15:05:08.000000000 +1300 -@@ -886,10 +886,10 @@ - channel.connect(); - ChannelSftp c=(ChannelSftp)channel; - -- /* String pwd= */c.pwd(); // Read off the channel - SftpATTRS attr=null; - - try{ -+ c.pwd(); // Read off the channel - attr=c.stat(".ssh");} //$NON-NLS-1$ - catch(SftpException ee){ - // Ignore diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff b/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff deleted file mode 100644 index 77a4d0b3c30c..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.ui.workbench/build.xml.orig 2007-04-11 21:13:58.000000000 +0200 -+++ plugins/org.eclipse.ui.workbench/build.xml 2007-04-11 21:00:49.000000000 +0200 -@@ -51,8 +51,8 @@ - <condition property="bundleJavacTarget" value="1.1"> - <isset property="J2SE-1.3"/> - </condition> -- <property name="bundleJavacSource" value="${javacSource}"/> -- <property name="bundleJavacTarget" value="${javacTarget}"/> -+ <property name="bundleJavacSource" value="1.4"/> -+ <property name="bundleJavacTarget" value="1.4"/> - <property name="bundleBootClasspath" value="${bootclasspath}"/> - - <target name="init" depends="properties"> diff --git a/dev-util/eclipse-sdk/files/3.3/eclipserc b/dev-util/eclipse-sdk/files/3.3/eclipserc deleted file mode 100644 index 703b6491c463..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/eclipserc +++ /dev/null @@ -1,20 +0,0 @@ -# This file specifies some initial Eclipse settings, like memory allowed -# These settings only affect Eclipse startup and overall configuration -# Main Eclipse configuration should be done within Eclipse (with the GUI) - -# Following variables controls the minimal and maximum amounts of memory -# allocated to Eclipse (respectively). -# Increase those numbers if you get OutOfMemory errors. - -ECLIPSE_XMS=128m -ECLIPSE_XMX=256m - -# Following variables controls the minimal and maximum amounts of memory -# allocated to the permanent generation space. -# This space contains data related to all classes. -# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment -# these variables and even increase it, if you have enough RAM. -# Else you will get crashes related to OutOfMemory in PermGen exceptions. - -#ECLIPSE_PERMSIZE=64m -#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file diff --git a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-fileinitializer.patch b/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-fileinitializer.patch deleted file mode 100644 index 59aa29dfb417..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-fileinitializer.patch +++ /dev/null @@ -1,497 +0,0 @@ -Index: plugin.xml -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/plugin.xml,v -retrieving revision 1.68 -diff -u -r1.68 plugin.xml ---- plugin.xml 4 Mar 2005 22:18:54 -0000 1.68 -+++ plugin.xml 7 Nov 2005 20:22:09 -0000 -@@ -6,4 +6,22 @@ - <extension-point id="adapters" name="%adaptersName" schema="schema/adapters.exsd"/> - <extension-point id="preferences" name="%preferencesName" schema="schema/preferences.exsd"/> - <extension-point id="contentTypes" name="%contentTypesName" schema="schema/contentTypes.exsd"/> -+ <extension-point id="initializers" name="%initializersName" schema="schema/initializers.exsd"/> -+ -+ -+ <extension -+ id="initializer" -+ name="%initializerApp" -+ point="org.eclipse.core.runtime.applications"> -+ <application> -+ <run class="org.eclipse.core.internal.runtime.Initializer"/> -+ </application> -+ </extension> -+ <extension id="fileInitializer" -+ point="org.eclipse.core.runtime.initializers"> -+ <initializer> -+ <initialize class="org.eclipse.core.internal.runtime.FileInitializer"/> -+ </initializer> -+ </extension> -+ - </plugin> -Index: src/org/eclipse/core/internal/runtime/Messages.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java,v -retrieving revision 1.18 -diff -u -r1.18 Messages.java ---- src/org/eclipse/core/internal/runtime/Messages.java 20 Oct 2005 18:31:04 -0000 1.18 -+++ src/org/eclipse/core/internal/runtime/Messages.java 7 Nov 2005 20:22:09 -0000 -@@ -106,6 +106,14 @@ - public static String plugin_instantiateClassError; - public static String plugin_loadClassError; - -+ // initializer -+ public static String initializer_error; -+ -+ // file initializer -+ public static String fileInitializer_fileNotFound; -+ public static String fileInitializer_IOError; -+ public static String fileInitializer_missingFileName; -+ - static { - // load message values from bundle file - reloadMessages(); -@@ -114,4 +122,4 @@ - public static void reloadMessages() { - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } --} -\ No newline at end of file -+} -Index: src/org/eclipse/core/internal/runtime/messages.properties -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties,v -retrieving revision 1.106 -diff -u -r1.106 messages.properties ---- src/org/eclipse/core/internal/runtime/messages.properties 20 Oct 2005 18:31:04 -0000 1.106 -+++ src/org/eclipse/core/internal/runtime/messages.properties 7 Nov 2005 20:22:09 -0000 -@@ -54,6 +54,13 @@ - provider_invalid = Problem creating the provider registered by {0}. - product_notFound = Product {0} could not be found. - -+### Initializer -+initializer_error=There was a problem running the application {0}. -+ -+### File Initiializer -+fileInitializer_fileNotFound={0}: The file {1} was not found. -+fileInitializer_IOError={0}: There was an error reading {1}. -+ - ### Compatibility - parsing/resolving - parse_badPrereqOnFrag = Fragment \"{0}\" requires non-existent plug-in \"{1}\". Fragment ignored. - parse_duplicateFragment = Duplicate fragment found with id \"{0}\" and version \"{1}\". -Index: src/org/eclipse/core/runtime/Platform.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java,v -retrieving revision 1.90 -diff -u -r1.90 Platform.java ---- src/org/eclipse/core/runtime/Platform.java 26 Aug 2005 19:39:21 -0000 1.90 -+++ src/org/eclipse/core/runtime/Platform.java 7 Nov 2005 20:22:09 -0000 -@@ -95,6 +95,15 @@ - public static final String OPTION_STARTTIME = PI_RUNTIME + "/starttime"; //$NON-NLS-1$ - - /** -+ * The simple identifier constant (value "<code>initializers</code>") of -+ * the extension point of the Core Runtime plug-in where plug-ins declare -+ * their the existence of initialization code. -+ * -+ * @since 3.1 -+ */ -+ -+ public static final String PT_INITIALIZERS = "initializers"; //$NON-NLS-1$ -+ /** - * Name of a preference for configuring the performance level for this system. - * - * <p> -Index: schema/initializers.exsd -=================================================================== -RCS file: schema/initializers.exsd -diff -N schema/initializers.exsd ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ schema/initializers.exsd 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,138 @@ -+<?xml version='1.0' encoding='UTF-8'?> -+<!-- Schema file written by PDE --> -+<schema targetNamespace="org.eclipse.core.runtime"> -+<annotation> -+ <appInfo> -+ <meta.schema plugin="org.eclipse.core.runtime" id="initializers" name="Plug-in Initializers"/> -+ </appInfo> -+ <documentation> -+ Platform runtime supports plug-ins which would like to -+be initialized. That is, plug-ins that needs to be initialized when -+the initialization application is being run should provide an extension -+to this extension-point. -+The initializers are run when the org.eclipse.core.runtime.initializer application -+is being run. The initializers are run in any order. -+ </documentation> -+ </annotation> -+ -+ <element name="extension"> -+ <complexType> -+ <sequence> -+ <element ref="initializer"/> -+ </sequence> -+ <attribute name="point" type="string" use="required"> -+ <annotation> -+ <documentation> -+ -+ </documentation> -+ </annotation> -+ </attribute> -+ <attribute name="id" type="string" use="required"> -+ <annotation> -+ <documentation> -+ -+ </documentation> -+ </annotation> -+ </attribute> -+ <attribute name="name" type="string"> -+ <annotation> -+ <documentation> -+ -+ </documentation> -+ <appInfo> -+ <meta.attribute translatable="true"/> -+ </appInfo> -+ </annotation> -+ </attribute> -+ </complexType> -+ </element> -+ -+ <element name="initializer"> -+ <complexType> -+ <sequence> -+ <element ref="initialize"/> -+ </sequence> -+ </complexType> -+ </element> -+ -+ <element name="initialize"> -+ <complexType> -+ <sequence> -+ <element ref="initialize"/> -+ </sequence> -+ <attribute name="class" type="string" use="required"> -+ <annotation> -+ <documentation> -+ -+ </documentation> -+ <appInfo> -+ <meta.attribute kind="java" basedOn="org.eclipse.core.runtime.IPlatformRunnable"/> -+ </appInfo> -+ </annotation> -+ </attribute> -+ </complexType> -+ </element> -+ -+ <annotation> -+ <appInfo> -+ <meta.section type="since"/> -+ </appInfo> -+ <documentation> -+ 3.1 -+ </documentation> -+ </annotation> -+ -+ <annotation> -+ <appInfo> -+ <meta.section type="examples"/> -+ </appInfo> -+ <documentation> -+ Following is an example of initializer declaration: -+<p> -+<pre> -+ <extension id="myInitializer" point="org.eclipse.core.runtime.initializers"> -+ <initializer> -+ <initialize class="myInitializer.Doit"/> -+ </initializer> -+ </extension> -+</pre> -+</p> -+ </documentation> -+ </annotation> -+ -+ <annotation> -+ <appInfo> -+ <meta.section type="apiInfo"/> -+ </appInfo> -+ <documentation> -+ The value of the class attribute must represent an -+implementor of -+<samp>org.eclipse.core.runtime.IPlatformRunnable</samp>. -+ </documentation> -+ </annotation> -+ -+ <annotation> -+ <appInfo> -+ <meta.section type="implementation"/> -+ </appInfo> -+ <documentation> -+ [Enter information about supplied implementation of this extension point.] -+ </documentation> -+ </annotation> -+ -+ <annotation> -+ <appInfo> -+ <meta.section type="copyright"/> -+ </appInfo> -+ <documentation> -+ Copyright (c) 2005 IBM Corporation and others.<br> -+All rights reserved. This program and the accompanying materials are made -+available under the terms of the Eclipse Public License v1.0 which -+accompanies -+this distribution, and is available at -+<a -+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> -+ </documentation> -+ </annotation> -+ -+</schema> -Index: src/org/eclipse/core/internal/runtime/FileInitializer.java -=================================================================== -RCS file: src/org/eclipse/core/internal/runtime/FileInitializer.java -diff -N src/org/eclipse/core/internal/runtime/FileInitializer.java ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ src/org/eclipse/core/internal/runtime/FileInitializer.java 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,186 @@ -+package org.eclipse.core.internal.runtime; -+ -+import java.io.FileInputStream; -+import java.io.FileNotFoundException; -+import java.io.IOException; -+import java.net.URL; -+import java.util.Collections; -+import java.util.Enumeration; -+import java.util.Iterator; -+import java.util.LinkedList; -+import java.util.Properties; -+import java.util.Set; -+import java.util.regex.Pattern; -+ -+import org.eclipse.core.runtime.IPlatformRunnable; -+import org.eclipse.core.runtime.IStatus; -+import org.eclipse.core.runtime.Path; -+import org.eclipse.core.runtime.Platform; -+import org.eclipse.core.runtime.Status; -+import org.eclipse.osgi.util.NLS; -+import org.osgi.framework.Bundle; -+ -+/** -+ * <p> -+ * This application extracts files to their "localURL". The file patterns that you -+ * want to extract should be specified in a file in a properties format like this: -+ * -+ * <pre> -+ * .* = *.so,about.html -+ * org.eclipse.team.core.cvs = *.html -+ * </pre> -+ * -+ * This application should be run through the generic initializer mechanism and -+ * not run directly. -+ * </p> -+ * -+ * <p> -+ * To run this application, do something like: -+ * </p> -+ * -+ * <p> -+ * <code> -+ * java -cp startup.jar org.eclipse.core.launcher.Main -application org.eclipse.core.runtime.initializer [-justThisArchOSWS] -fileInitializer <fileWithFilePatternsToExtract> -+ * </code> -+ * </p> -+ * -+ * <p> -+ * <ul> -+ * <li> -+ * Note: Only the files that are extracted will be printed to the console. If you -+ * want to debug things, use the -consolelog option in -+ * org.eclipse.core.launcher.Main -+ * </li> -+ * </ul> -+ * </p> -+ * -+ * @see Initializer -+ * @see Platform#asLocalURL(URL) -+ * @since 3.1 -+ */ -+public class FileInitializer implements IPlatformRunnable { -+ -+ private LinkedList extractedFiles; -+ private boolean justThisArchOSWS; -+ -+ public Object run(Object args) throws Exception { -+ Properties bundleAndFilePatterns = getBundleAndFileNamePatterns((String[]) args); -+ Set bundlePatterns = bundleAndFilePatterns.keySet(); -+ -+ // don't do anything if bundleAndFilePatterns is empty -+ if (bundleAndFilePatterns == null || bundleAndFilePatterns.size() == 0) { -+ return IPlatformRunnable.EXIT_OK; -+ } -+ -+ justThisArchOSWS = getJustThisArchOSWS((String[]) args); -+ -+ Bundle[] installedBundles = InternalPlatform.getDefault().getBundleContext().getBundles(); -+ extractedFiles = new LinkedList(); -+ -+ // foreach(bundle pattern) -+ for (Iterator bundlePatternIter = bundlePatterns.iterator(); bundlePatternIter.hasNext();) { -+ Object bundlePattern = bundlePatternIter.next(); -+ Object fileNamePattern = bundleAndFilePatterns.get(bundlePattern); -+ // foreach(filename pattern) -+ String[] fileNamePatterns = ((String) fileNamePattern).split(","); //$NON-NLS-1$ -+ for (int i = 0; i < fileNamePatterns.length; i++) { -+ fileNamePatterns[i] = fileNamePatterns[i].trim(); -+ } -+ // foreach(bundle) -+ for (int i = 0; i < installedBundles.length; i++) { -+ String bundleName = installedBundles[i].getSymbolicName(); -+ // if(bundle matches pattern) check fileNamePattern(s) -+ if(Pattern.matches((String) bundlePattern, bundleName)) { -+ for (int j = 0; j < fileNamePatterns.length; j++) { -+ extractMatchingFilesFromBundle(fileNamePatterns[j], installedBundles[i]); -+ } -+ } -+ } -+ } // end for -+ return IPlatformRunnable.EXIT_OK; -+ } -+ -+ private void extractMatchingFilesFromBundle(String fileNamePattern, Bundle bundle) throws IOException { -+ Enumeration e = bundle.findEntries("/", fileNamePattern, true); //$NON-NLS-1$ -+ -+ while(e != null && e.hasMoreElements()) { -+ URL fileURL = (URL) e.nextElement(); -+ if (justThisArchOSWS) { -+ Path filePath = new Path(fileURL.getPath()); -+ -+ String[] path = filePath.segments(); -+ // check to see if the file should be extracted to the current os/arch -+ if (path.length == 4 && path[0].equals("os") && !(path[1].equals(Platform.getOS()) && path[2].equals(Platform.getOSArch()))) { //$NON-NLS-1$ -+ continue; -+ } -+ // check to see if the file is should be extracted to the current ws -+ if (path.length == 3 && path[0].equals("ws") && !path[1].equals(Platform.getWS())) { //$NON-NLS-1$ -+ continue; -+ } -+ } -+ -+ // the call to Platform.asLocalURL(URL) does the actual extraction -+ URL localURL = Platform.asLocalURL(fileURL); -+ if (localURL != null) { -+ String localURLPath = localURL.getPath(); -+ -+ // only print the path if it hasn't been printed yet -+ int index = Collections.binarySearch(extractedFiles, localURLPath); -+ if (index < 0) { -+ extractedFiles.add(-(index + 1), localURLPath); -+ System.out.println("FileInitializer: " + localURLPath); //$NON-NLS-1$ -+ } -+ } -+ } -+ } -+ -+ private final String ARG_FILE = "-fileInitializer"; //$NON-NLS-1$ -+ -+ private Properties getBundleAndFileNamePatterns(String[] argsArray) { -+ -+ for (int i = 0; i < argsArray.length; i++) { -+ if (argsArray[i].equalsIgnoreCase(ARG_FILE)) { -+ -+ // the "file patterns" file was not specified -+ if (argsArray.length < i + 2) { -+ String msg = NLS.bind(Messages.fileInitializer_missingFileName, this.getClass().getName()); -+ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null); -+ InternalPlatform.getDefault().log(status); -+ return null; -+ } -+ -+ try { -+ FileInputStream fin = new FileInputStream(argsArray[i + 1]); -+ Properties bundleAndFileNameProperties = new Properties(); -+ bundleAndFileNameProperties.load(fin); -+ fin.close(); -+ return bundleAndFileNameProperties; -+ } catch (FileNotFoundException e1) { -+ String msg = NLS.bind(Messages.fileInitializer_fileNotFound, this.getClass().getName(), argsArray[i + 1]); -+ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null); -+ InternalPlatform.getDefault().log(status); -+ return null; -+ } catch (IOException e) { -+ String msg = NLS.bind(Messages.fileInitializer_IOError, this.getClass().getName(), argsArray[i + 1]); -+ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, e); -+ InternalPlatform.getDefault().log(status); -+ return null; -+ } -+ } -+ } -+ -+ // ARG_FILE wasn't found -+ return null; -+ } -+ -+ private final String ARG_JUSTTHISARCHOSWS = "-justThisArchOSWS"; //$NON-NLS-1$ -+ -+ private boolean getJustThisArchOSWS(String[] argsArray) { -+ for (int i = 0; i < argsArray.length; i++) { -+ if (argsArray[i].equalsIgnoreCase(ARG_JUSTTHISARCHOSWS)) { -+ return true; -+ } -+ } -+ return false; -+ } -+} -Index: src/org/eclipse/core/internal/runtime/Initializer.java -=================================================================== -RCS file: src/org/eclipse/core/internal/runtime/Initializer.java -diff -N src/org/eclipse/core/internal/runtime/Initializer.java ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ src/org/eclipse/core/internal/runtime/Initializer.java 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,49 @@ -+/******************************************************************************* -+* Copyright (c) 2005 Red Hat, Inc. and others. -+* All rights reserved. This program and the accompanying materials -+* are made available under the terms of the Eclipse Public License v1.0 -+* which accompanies this distribution, and is available at -+* http://www.eclipse.org/legal/epl-v10.html -+* -+* Contributors: -+* IBM - Initial implementation -+*******************************************************************************/ -+package org.eclipse.core.internal.runtime; -+ -+import org.eclipse.core.runtime.CoreException; -+import org.eclipse.core.runtime.IConfigurationElement; -+import org.eclipse.core.runtime.IExtension; -+import org.eclipse.core.runtime.IExtensionPoint; -+import org.eclipse.core.runtime.IPlatformRunnable; -+import org.eclipse.core.runtime.IStatus; -+import org.eclipse.core.runtime.Platform; -+import org.eclipse.core.runtime.Status; -+import org.eclipse.osgi.util.NLS; -+ -+public class Initializer implements IPlatformRunnable { -+ -+ public Object run(Object args) throws Exception { -+ IExtensionPoint xpt = Platform.getExtensionRegistry().getExtensionPoint(Platform.PI_RUNTIME, Platform.PT_INITIALIZERS); -+ if (xpt == null) -+ return IPlatformRunnable.EXIT_OK; -+ -+ IExtension[] exts = xpt.getExtensions(); -+ for (int i = 0; i < exts.length; i++) { -+ IConfigurationElement[] configs = exts[i].getConfigurationElements(); -+ IPlatformRunnable initializer = null; -+ if (configs.length != 0) { -+ try { -+ initializer = (IPlatformRunnable) configs[0].createExecutableExtension("initialize"); //$NON-NLS-1$ -+ initializer.run(args); -+ } catch(CoreException e) { -+ String msg = NLS.bind(Messages.initializer_error, exts[i].getExtensionPointUniqueIdentifier()); -+ IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, e); -+ InternalPlatform.getDefault().log(status); -+ return null; -+ } -+ } -+ } -+ return IPlatformRunnable.EXIT_OK; -+ } -+ -+} diff --git a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-libupdatebuild2.patch b/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-libupdatebuild2.patch deleted file mode 100644 index b570a024a1c1..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-libupdatebuild2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.update.core.linux/src/build.xml.orig 2006-01-27 15:35:35.000000000 -0500 -+++ plugins/org.eclipse.update.core.linux/src/build.xml 2006-01-27 15:36:07.000000000 -0500 -@@ -5,7 +5,7 @@ - <!-- Set a meaningful default value for when it is not. --> - <property name="eclipse-home" value="${basedir}/../.."/> - <property name="jdk-path" value="${java.home}"/> -- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/> -+ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${installArch}/"/> - <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/> - <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/> - diff --git a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-pde.build-add-package-build.patch b/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-pde.build-add-package-build.patch deleted file mode 100644 index 77f347d6a73a..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/fedora/eclipse-pde.build-add-package-build.patch +++ /dev/null @@ -1,273 +0,0 @@ -Index: templates/package-build/build.properties -=================================================================== -RCS file: templates/package-build/build.properties -diff -N templates/package-build/build.properties ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,12 @@ -+buildDirectory=${sourceDirectory}/build -+buildLabel=rpmBuild -+archivePrefix=eclipse -+skipFetch=true -+javacFailOnError=true -+collectingFolder=eclipse -+archivesFormat=*,*,*-zip -+zipargs=-y -+javacDebugInfo=true -+archiveName=${id}.zip -+runPackager=false -+baseLocation=/usr/share/eclipse -Index: templates/package-build/customTargets-assemble-target.xml -=================================================================== -RCS file: templates/package-build/customTargets-assemble-target.xml -diff -N templates/package-build/customTargets-assemble-target.xml ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/customTargets-assemble-target.xml 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,12 @@ -+<project> -+ <!-- ===================================================================== --> -+ <!-- Targets to assemble the built elements for particular configurations --> -+ <!-- These generally call the generated assemble scripts (named in --> -+ <!-- ${assembleScriptName}) but may also add pre and post processing --> -+ <!-- Add one target for each root element and each configuration --> -+ <!-- ===================================================================== --> -+ -+ <target name="assemble.@id@"> -+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> -+ </target> -+</project> -Index: templates/package-build/customTargets.xml -=================================================================== -RCS file: templates/package-build/customTargets.xml -diff -N templates/package-build/customTargets.xml ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/customTargets.xml 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,144 @@ -+<project name="Build specific targets and properties" default="noDefault"> -+ -+ <fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." /> -+ <fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." /> -+ <fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." /> -+ -+ <!-- we need to do this because you can't expand variables in target names --> -+ <copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" /> -+ <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" /> -+ <import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" /> -+ -+ <!-- ===================================================================== --> -+ <!-- Run a given ${target} on all elements being built --> -+ <!-- Add on <ant> task for each top level element being built. --> -+ <!-- ===================================================================== --> -+ <target name="allElements"> -+ <ant antfile="${genericTargets}" target="${target}"> -+ <property name="type" value="${type}" /> -+ <property name="id" value="${id}" /> -+ </ant> -+ </target> -+ -+ -+ <!-- ===================================================================== --> -+ <!-- Check out map files from correct repository --> -+ <!-- ===================================================================== --> -+ <target name="getMapFiles"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ -+ <target name="clean" unless="noclean"> -+ <antcall target="allElements"> -+ <param name="target" value="cleanElement" /> -+ </antcall> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before setup --> -+ <!-- ===================================================================== --> -+ <target name="preSetup"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after setup but before starting the build proper --> -+ <!-- ===================================================================== --> -+ <target name="postSetup"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before fetching the build elements --> -+ <!-- ===================================================================== --> -+ <target name="preFetch"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after fetching the build elements --> -+ <!-- ===================================================================== --> -+ <target name="postFetch"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before generating the build scripts. --> -+ <!-- ===================================================================== --> -+ <target name="preGenerate"> -+ <!-- Eclipse expects the feature projects to be in the 'features' directory and -+ plugin projects to be in the 'plugins' directory. The build infrastructure -+ normally arranges the projects during the fetch stage. Since we aren't doing -+ the fetch stage, we have to manually arrange the files --> -+ <exec dir="${builder}" executable="/bin/sh"> -+ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory}" /> -+ </exec> -+ -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after generating the build scripts. --> -+ <!-- ===================================================================== --> -+ <target name="postGenerate"> -+ <antcall target="clean" /> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before running the build.xmls for the elements being built. --> -+ <!-- ===================================================================== --> -+ <target name="preProcess"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after running the build.xmls for the elements being built. --> -+ <!-- ===================================================================== --> -+ <target name="postProcess"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before running assemble. --> -+ <!-- ===================================================================== --> -+ <target name="preAssemble"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after running assemble. --> -+ <!-- ===================================================================== --> -+ <target name="postAssemble"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before running package. --> -+ <!-- ===================================================================== --> -+ <target name="prePackage"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after running package. --> -+ <!-- ===================================================================== --> -+ <target name="postPackage"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the build is done. --> -+ <!-- ===================================================================== --> -+ <target name="postBuild"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do to test the build results --> -+ <!-- ===================================================================== --> -+ <target name="test"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do to publish the build results --> -+ <!-- ===================================================================== --> -+ <target name="publish"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Default target --> -+ <!-- ===================================================================== --> -+ <target name="noDefault"> -+ <echo message="You must specify a target when invoking this file" /> -+ </target> -+ -+</project> -Index: templates/package-build/prepare-build-dir.sh -=================================================================== -RCS file: templates/package-build/prepare-build-dir.sh -diff -N templates/package-build/prepare-build-dir.sh ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,77 @@ -+#!/bin/sh -+ -+if [ $# -ne 2 ]; then -+ echo "usage: $0 <path to source dir> <path to build dir>" -+ exit 1 -+fi -+ -+if [ ! -d $1 ]; then -+ echo "usage: $0 <path to source dir> <path to build dir>" -+ exit 1 -+fi -+ -+SOURCEDIR=$1 -+BUILDDIR=$2 -+ -+echo "preparing files in $1 for buildfile generation ..." -+mkdir -p $BUILDDIR -+ -+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml -+mkdir -p $BUILDDIR/tmp -+BUILDFILE=$BUILDDIR/tmp/build.xml -+ -+echo "<project default=\"main\"> -+ <target name=\"main\"> -+ <xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/> -+ <fail unless=\"@type@.id\" message=\"feature.id not set\"/> -+ <echo message=\"\${@type@.id}\" /> -+ </target> -+</project>" > $BUILDFILE -+ -+for type in feature plugin fragment; do -+ CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml -+ cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE -+done -+ -+# make the directories eclipse is expecting -+echo " making the 'features' and 'plugins' directories" -+mkdir -p $BUILDDIR/features $BUILDDIR/plugins -+ -+# make symlinks for the features -+FEATURES=$(find $SOURCEDIR -name feature.xml) -+for f in $FEATURES; do -+ PROJECTDIR=$(dirname $f) -+ PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ if [ -z $PROJECTNAME ]; then -+ echo "ERROR: could not determine the feature id for $PROJECTDIR" -+ exit 1 -+ fi -+ -+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" -+ ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME -+done -+ -+# make symlinks for plugins and fragments -+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq) -+for dir in $PLUGINDIRS; do -+ PROJECTNAME="" -+ if [ -e $dir/META-INF/MANIFEST.MF ]; then -+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) -+ elif [ -e $dir/plugin.xml ]; then -+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ elif [ -e $dir/fragment.xml ]; then -+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) -+ fi -+ -+ if [ -z $PROJECTNAME ]; then -+ echo "ERROR: could not determine the plugin or fragment id for $dir" -+ exit 1 -+ fi -+ -+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir" -+ ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME -+ -+done -+ -+rm -rf $BUILDDIR/tmp -+echo done diff --git a/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff b/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff deleted file mode 100644 index b0c11b08b639..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- library/eclipse.c.orig 2007-07-28 17:46:20.000000000 +0200 -+++ library/eclipse.c 2007-07-28 17:46:39.000000000 +0200 -@@ -529,6 +530,7 @@ - } - displayMessage( title, errorMsg ); - free( errorMsg ); -+ errorMsg = NULL; - } - free( title ); - break; diff --git a/dev-util/eclipse-sdk/files/3.3/set-java-home.diff b/dev-util/eclipse-sdk/files/3.3/set-java-home.diff deleted file mode 100644 index 469fa00624de..000000000000 --- a/dev-util/eclipse-sdk/files/3.3/set-java-home.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2007-02-12 19:56:26.000000000 +0100 -+++ build.xml 2007-02-12 19:58:08.000000000 +0100 -@@ -73,7 +73,7 @@ - </fileset> - </unzip> - <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true"> -- <arg line="build.sh" /> -+ <arg line="build.sh -java ${java5.home}" /> - </exec> - <move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" /> - |