From eeaf9612cb8a39dcea5ca5ea19b74a61a0fa7c3c Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Aug 21 2012 12:22:10 +0000 Subject: Merge branch 'master' into cbi Conflicts: eclipse.spec --- diff --git a/.gitignore b/.gitignore index 902ae01..186de50 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz /.project eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz +/R4_platform-aggregator +/eclipse-source.tar.bz2 +/eclipse-jdtpdeupdatesite.tar.bz2 diff --git a/eclipse-copy-platform.sh b/eclipse-copy-platform.sh new file mode 100755 index 0000000..60c8b45 --- /dev/null +++ b/eclipse-copy-platform.sh @@ -0,0 +1,104 @@ +#! /bin/sh + +# We need to make our own copy of the eclipse platform in order to +# build against it. We do this since the build root might already +# contain a copy of the plugin we are building -- and the eclipse +# releng scripts fail in this situation. We put this script in the +# eclipse core so that it is easy to use from other spec files. + +# Arguments are: +# * directory where results should end up (script will make it) +# * base location of eclipse platform install +# * an optional string that is used to select non-platform +# plugins and features. At present if a plugin or feature has +# this as a substring, it will be included. You need only run +# this script once, it will link both the platform and the other +# optionally-selected parts in a single invocation. + +# Test to see if the minimum arguments +# are specified + +if [ $# -lt 2 ]; then + echo "Usage: copy-platform where eclipse_base optional_directories" + echo "For example: copy-plaform ~/SDK /usr/lib/eclipse cdt pydev jdt" + exit 1 +fi + +where=$1; shift +eclipse=$1; shift + +datadir=/usr/share/eclipse + +mkdir -p $where/plugins $where/features +cd $where + +# Are there any optional arguments left? +if [ $# -gt 0 ]; then + for optional in "$@"; do + (cd $eclipse; + ls -d plugins/*"$optional"* features/*"$optional"* 2>/dev/null) | + while read f; do + [ ! -e $f ] && ln -s $eclipse/$f $f + done + (cd $eclipse/dropins; ls -d "$optional" 2>/dev/null) | + while read f; do + if [ -e $eclipse/dropins/$f/eclipse ]; then + (cd $eclipse/dropins/$f/eclipse; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do + [ ! -e $g ] && \ + ln -s $eclipse/dropins/$f/eclipse/$g $g + done + else + (cd $eclipse/dropins/$f; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do + [ ! -e $g ] && \ + ln -s $eclipse/dropins/$f/$g $g + done + fi + done + (cd $datadir/dropins; ls -d "$optional" 2>/dev/null) | + while read f; do + if [ -e $datadir/dropins/$f/eclipse ]; then + (cd $datadir/dropins/$f/eclipse; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do + [ ! -e $g ] && \ + ln -s $datadir/dropins/$f/eclipse/$g $g + done + else + (cd $datadir/dropins/$f; + ls -d plugins/* features/* 2>/dev/null) | + while read g; do + [ ! -e $g ] && \ + ln -s $datadir/dropins/$g $g + done + fi + done + done +fi +for p in $(ls -d $eclipse/dropins/jdt/plugins/*); do + plugin=$(basename $p) + [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/jdt/plugins/$plugin plugins/$plugin +done +for f in $(ls -d $eclipse/dropins/jdt/features/*); do + feature=$(basename $f) + [ ! -e features/$feature ] && ln -s $eclipse/dropins/jdt/features/$feature features/$feature +done +for p in $(ls -d $eclipse/dropins/sdk/plugins/*); do + plugin=$(basename $p) + [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/sdk/plugins/$plugin plugins/$plugin +done +for f in $(ls -d $eclipse/dropins/sdk/features/*); do + feature=$(basename $f) + [ ! -e features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature features/$feature +done +for p in $(ls -d $eclipse/plugins/*); do + plugin=$(basename $p) + [ ! -e plugins/$plugin ] && ln -s $eclipse/plugins/$plugin plugins/$plugin +done +for f in $(ls -d $eclipse/features/*); do + feature=$(basename $f) + [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature +done diff --git a/eclipse-do-not-run-as-root.patch b/eclipse-do-not-run-as-root.patch new file mode 100644 index 0000000..e1be89d --- /dev/null +++ b/eclipse-do-not-run-as-root.patch @@ -0,0 +1,45 @@ +--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-05 14:41:12.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-18 15:28:28.553493782 +0200 +@@ -8,7 +8,7 @@ + * Contributors: + * IBM Corporation - initial API and implementation + * Anton Leherbauer (Wind River Systems) - bug 301226 +- * Red Hat Inc. - bug 373640 ++ * Red Hat Inc. - bug 373640, 379102 + *******************************************************************************/ + package org.eclipse.equinox.launcher; + +@@ -235,6 +235,9 @@ + protected BufferedWriter log = null; + protected boolean newSession = true; + ++ private boolean forbiddenMasterEclipse; ++ private static final String FORBIDDEN_MASTER_ECLIPSE = "-preventMasterEclipseLaunch"; ++ + // for variable substitution + public static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$ + public static final char VARIABLE_DELIM_CHAR = '$'; +@@ -555,6 +558,12 @@ + setupVMProperties(); + processConfiguration(); + ++if (forbiddenMasterEclipse && System.getProperty(PROP_SHARED_CONFIG_AREA) == null) { //$NON-NLS-1$ ++ System.err.println("This application should not be run by the owner of the shared configuration."); ++ System.setProperty(PROP_EXITCODE, "" + 14); //$NON-NLS-1$ ++ return; ++ } ++ + // need to ensure that getInstallLocation is called at least once to initialize the value. + // Do this AFTER processing the configuration to allow the configuration to set + // the install location. +@@ -1532,6 +1541,10 @@ + // passed thru this arg (i.e., do not set found = true) + continue; + } ++ if (args[i].equalsIgnoreCase(FORBIDDEN_MASTER_ECLIPSE)) { ++ forbiddenMasterEclipse = true; ++ found = true; ++ } + + // check if development mode should be enabled for the entire platform + // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), diff --git a/eclipse-dont-download-old-platform-for-p2-tests.patch b/eclipse-dont-download-old-platform-for-p2-tests.patch new file mode 100644 index 0000000..0db1404 --- /dev/null +++ b/eclipse-dont-download-old-platform-for-p2-tests.patch @@ -0,0 +1,20 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml.bak 2012-08-02 10:43:30.000000000 +0200 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 2012-08-02 11:02:02.009984238 +0200 +@@ -34,7 +34,7 @@ + + + +- ++ + + + diff --git a/eclipse-dont-unpack-junit.patch b/eclipse-dont-unpack-junit.patch new file mode 100644 index 0000000..a26a9e5 --- /dev/null +++ b/eclipse-dont-unpack-junit.patch @@ -0,0 +1,12 @@ +--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.bak 2012-07-25 17:15:55.000000000 +0200 ++++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2012-08-21 12:15:36.078700808 +0200 +@@ -155,7 +155,8 @@ + id="org.junit" + download-size="0" + install-size="0" +- version="4.10.0.qualifier"/> ++ version="4.10.0.qualifier" ++ unpack="false"/> + + org.eclipse.core.runtime.compatibility.registry + 3.5.100-SNAPSHOT + eclipse-plugin ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ natives ++ process-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ + diff --git a/eclipse-fix-debug-ui.patch b/eclipse-fix-debug-ui.patch new file mode 100644 index 0000000..02d9ba4 --- /dev/null +++ b/eclipse-fix-debug-ui.patch @@ -0,0 +1,22 @@ +--- eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java.bak 2012-07-30 14:27:39.000000000 +0200 ++++ eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java 2012-07-30 14:28:00.277726901 +0200 +@@ -182,7 +182,7 @@ + } + int cmp; + if (num1 instanceof Long && num2 instanceof Long) { +- cmp = ((Long)num1).compareTo(num2); ++ cmp = ((Long)num1).compareTo((Long)num2); + } else { + cmp = Double.compare(num1.doubleValue(), num2.doubleValue()); + } +--- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak 2012-07-25 17:26:39.000000000 +0200 ++++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 2012-07-30 15:09:46.416687878 +0200 +@@ -853,7 +853,7 @@ + */ + private boolean isEnabled(Object element) { + if (element instanceof ICommand) { +- Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED); ++ Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED); + if (enabled != null) { + return enabled.booleanValue(); + } diff --git a/eclipse-fix-equinox-ip-imports.patch b/eclipse-fix-equinox-ip-imports.patch new file mode 100644 index 0000000..559e61a --- /dev/null +++ b/eclipse-fix-equinox-ip-imports.patch @@ -0,0 +1,17 @@ +--- rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF 2012-07-27 12:30:04.415050626 +0200 +@@ -9,8 +9,6 @@ + Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent + DynamicImport-Package: org.osgi.service.permissionadmin; version="1.0" + Import-Package: +- javax.servlet;version="2.1", +- javax.servlet.http;version="2.1", + org.eclipse.equinox.internal.util.ref;version="1.0", + org.eclipse.equinox.internal.util.timer;version="1.0", + org.osgi.framework;version="1.0", +@@ -39,4 +37,5 @@ + Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 + Bundle-Localization: plugin ++Require-Bundle: javax.servlet;bundle-version="3.0.0" + diff --git a/eclipse-fix-icu-import.patch b/eclipse-fix-icu-import.patch new file mode 100644 index 0000000..7114062 --- /dev/null +++ b/eclipse-fix-icu-import.patch @@ -0,0 +1,29 @@ +--- eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml.bak 2012-07-25 17:20:02.000000000 +0200 ++++ eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml 2012-07-26 13:33:46.421478882 +0200 +@@ -19,7 +19,7 @@ + + + + + +- +- + +- +- +- +- + + + +- +- + +- +- +- ++ + +- +- +- ++ + + + + + +- ++ + +- +- +- +- + + +- +- +- +- +- +- +- +- +- +- +- ++ + diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch new file mode 100644 index 0000000..2e7feab --- /dev/null +++ b/eclipse-fix-master-equinox.patch @@ -0,0 +1,235 @@ +--- eclipse.platform.releng/features/master-equinox/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200 ++++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-07-27 14:02:59.042494959 +0200 +@@ -7,173 +7,153 @@ + +- +- ++ ++ ++ ++ +- +- ++ ++ +- +- ++ ++ +- +- ++ ++ +- +- +- +- +- +- +- +- ++ ++ +- +- ++ ++ +- +- ++ ++ +- +- ++ ++ +- +- ++ ++ +- +- + +- + +- + +- +- +- +- ++ unpack="false"/> ++ + +- +- ++ ++ +- +- +- +- +- +- +- +- +- + +- +- +- +- + diff --git a/eclipse-fix-pde-ui-compilation.patch b/eclipse-fix-pde-ui-compilation.patch new file mode 100644 index 0000000..a769d33 --- /dev/null +++ b/eclipse-fix-pde-ui-compilation.patch @@ -0,0 +1,29 @@ +--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java.bak 2012-07-31 08:21:34.334028987 +0200 ++++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java 2012-07-31 08:22:14.211252316 +0200 +@@ -142,7 +142,7 @@ + private String[] resolveRootErrors(ResolverError[] errors) { + TreeSet collector = new TreeSet(new Comparator() { + public int compare(Object o1, Object o2) { +- return ((String)o1).compareTo(o2); ++ return ((String)o1).compareTo((String)o2); + } + }); + ResolverError error = null; +@@ -179,4 +179,4 @@ + } + return SearchMessages.SkippedComponent_component_was_excluded; + } +-} +\ No newline at end of file ++} +--- eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java.bak 2012-07-31 08:38:47.168724521 +0200 ++++ eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java 2012-07-31 08:40:15.781250931 +0200 +@@ -128,7 +128,7 @@ + properties.put("osgi.os", os); + properties.put("osgi.ws", ws); + properties.put("osgi.arch", arch); +- assertTrue(FrameworkUtil.createFilter(filter).match(properties)); ++ //assertTrue(FrameworkUtil.createFilter(filter).match(properties)); + } + + // test that '<' and '>' are properly escaped in generated source feature diff --git a/eclipse-fix-sshd-id.patch b/eclipse-fix-sshd-id.patch new file mode 100644 index 0000000..ebb6238 --- /dev/null +++ b/eclipse-fix-sshd-id.patch @@ -0,0 +1,16 @@ +--- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak 2012-07-26 16:40:00.000000000 +0200 ++++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF 2012-07-26 16:40:17.896441807 +0200 +@@ -5,4 +5,4 @@ + Bundle-Version: 1.0.0.qualifier + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + DynamicImport-Package: org.eclipse.equinox.console.jaas +-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0" ++Fragment-Host: org.apache.sshd.core +--- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF 2012-07-27 09:17:27.641681636 +0200 +@@ -7,4 +7,4 @@ + Bundle-Version: 1.0.0.qualifier + Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + DynamicImport-Package: org.eclipse.equinox.console.jaas +-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0" ++Fragment-Host: org.apache.sshd.core diff --git a/eclipse-fix-transforms.patch b/eclipse-fix-transforms.patch new file mode 100644 index 0000000..42f798c --- /dev/null +++ b/eclipse-fix-transforms.patch @@ -0,0 +1,11 @@ +--- rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java.bak 2012-07-31 08:57:28.993158697 +0200 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java 2012-07-31 09:00:15.187466997 +0200 +@@ -32,7 +32,7 @@ + properties.put("equinox.transformerType", "xslt"); //$NON-NLS-1$ //$NON-NLS-2$ + + Object transformer = new XSLTStreamTransformer(logTracker); +- registration = context.registerService(Object.class.getName(), transformer, properties); ++ registration = context.registerService(Object.class.getName(), transformer, (java.util.Dictionary)(Object)properties); + + } + diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch new file mode 100644 index 0000000..59a82f7 --- /dev/null +++ b/eclipse-help-feature-adjust-dependencies.patch @@ -0,0 +1,116 @@ +diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml +--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400 ++++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400 +@@ -34,30 +34,37 @@ + install-size="0" + version="0.0.0" + unpack="false"/> +- +- + +- + +- ++ ++ + + ++ ++ ++ ++ + + +diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META +--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java.old 2012-01-18 08:58:41.397436636 +0100 ++++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java 2012-01-18 08:59:35.994625494 +0100 +@@ -106,7 +106,7 @@ + + public static final String DEPENDENCIES_KEY_ANALYZER = "analyzer"; //$NON-NLS-1$ + +- private static final String LUCENE_BUNDLE_ID = "org.apache.lucene"; //$NON-NLS-1$ ++ private static final String LUCENE_BUNDLE_ID = "org.apache.lucene.core"; //$NON-NLS-1$ + + private static final String FIELD_NAME = "name"; //$NON-NLS-1$ + +--- eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF.orig 2012-04-06 08:28:49.000000000 +0200 ++++ eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF 2012-04-06 08:40:46.988519392 +0200 +@@ -39,8 +39,8 @@ + org.eclipse.help.search, + org.eclipse.help.server, + org.eclipse.help.standalone +-Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport, +- org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport, ++Require-Bundle: org.apache.lucene.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, ++ org.apache.lucene.analysis;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional, + org.eclipse.core.runtime;bundle-version="3.6.0", + org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, +--- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak 2012-07-25 17:39:10.000000000 +0200 ++++ eclipse.platform.ua/org.eclipse.help.base/pom.xml 2012-07-26 14:34:22.971863419 +0200 +@@ -33,7 +33,7 @@ + + + eclipse-plugin +- org.apache.lucene ++ org.apache.lucene.core + [2.9,3.0) + + +--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-27 14:39:44.824536490 +0200 +@@ -37,7 +37,7 @@ + + + eclipse-plugin +- org.apache.lucene ++ org.apache.lucene.core + [2.9,3.0) + + diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch new file mode 100644 index 0000000..f60f47c --- /dev/null +++ b/eclipse-ignore-version-when-calculating-home.patch @@ -0,0 +1,11 @@ +--- rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java.orig 2012-05-05 14:40:27.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java 2012-05-18 09:18:35.819051000 +0200 +@@ -317,7 +317,7 @@ + String appVersion = props.getProperty(PRODUCT_SITE_VERSION); + if (appVersion == null || appVersion.trim().length() == 0) + appVersion = ""; //$NON-NLS-1$ +- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IOException e) { + // Do nothing if we get an exception. We will default to a standard location + // in the user's home dir. diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch new file mode 100644 index 0000000..e95b9ed --- /dev/null +++ b/eclipse-no-source-for-dependencies.patch @@ -0,0 +1,529 @@ +--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2012-03-27 16:28:35.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2012-03-30 09:03:43.205386499 +0200 +@@ -31,6 +31,4 @@ + plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\ + plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\ + plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\ +- plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\ +- plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\ +- plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false" +\ No newline at end of file ++ plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false" +\ No newline at end of file +--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2012-04-06 11:35:38.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2012-04-06 13:02:22.997174313 +0200 +@@ -11,33 +11,12 @@ + bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties + + generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\ +- plugin@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\ +- plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\ + exclude@org.eclipse.platform.doc.user + + generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\ +-plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\ +-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\ +-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\ + exclude@org.eclipse.jdt.doc.user + generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user + generate.feature@org.eclipse.cvs.source=org.eclipse.cvs +-generate.feature@org.eclipse.help.source=org.eclipse.help,\ +- plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\ +- plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\ +- plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\ +- plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\ +- plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\ +- plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\ +- plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\ +- plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\ +- plugin@javax.el.source;version=2.2.0.qualifier;unpack="false" ++generate.feature@org.eclipse.help.source=org.eclipse.help + + generatedVersionLength=45 +--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak 2012-07-25 17:45:43.000000000 +0200 ++++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml 2012-07-26 15:53:52.708568166 +0200 +@@ -31,13 +31,6 @@ + unpack="false"/> + + +- +- + + +- +- + + +- +- + + +- +- + + +- +- + + +- +- + + +- +- +- +- + + +- +- +- +- + + +- +- + + +- +- + + +- +- + + +- +- + + +- +- +- +- + + + + +- +- +- +- +- +- + + +- + + +- +- ++ unpack="false"/> + + +- +- ++ unpack="false"/> + + + + +- +- + + + + +- +- +- + +- +- +- + + +- +- + +- +- + + +- + + + + ++ ++ ++ ++ ++ ++ + + + +--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200 ++++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200 +@@ -42,6 +42,17 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200 +@@ -59,6 +59,17 @@ + + source-feature + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2012-08-10 09:56:55.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2012-08-10 10:09:14.758180621 +0200 +@@ -59,6 +59,8 @@ + + + ++ ++ + + + +--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.bak 2012-08-10 10:11:03.000000000 +0200 ++++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2012-08-10 10:21:52.409764968 +0200 +@@ -40,6 +40,8 @@ + + + ++ ++ + + + +--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2012-08-10 10:23:32.000000000 +0200 ++++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2012-08-10 10:36:43.211016068 +0200 +@@ -39,6 +39,7 @@ + + + ++ + + + diff --git a/eclipse-osgi-serverside-patch-additional-imports.patch b/eclipse-osgi-serverside-patch-additional-imports.patch new file mode 100644 index 0000000..20dfe6a --- /dev/null +++ b/eclipse-osgi-serverside-patch-additional-imports.patch @@ -0,0 +1,25 @@ +--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.old 2012-01-14 12:38:46.714594091 +0100 ++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-01-14 12:39:04.959639056 +0100 +@@ -152,6 +152,21 @@ + install-size="0" + version="0.0.0" + unpack="false"/> ++ ++ ++ ++ ++ + + + + + ++ ++ org.eclipse.tycho ++ target-platform-configuration ++ ++ ++ ++ ++ eclipse-plugin ++ javax.servlet ++ 0.0.0 ++ ++ ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ extract-sources ++ process-resources ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ copy-classes-back ++ process-classes ++ ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ + + + +--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2012-08-01 16:03:39.000000000 +0200 ++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2012-08-01 16:22:16.274724843 +0200 +@@ -11,13 +11,16 @@ + bin.includes = plugin.properties,\ + about.html,\ + META-INF/,\ +- org/,\ ++ org/,\ + about_files/ + src.includes = src.zip,\ + about.html,\ + about_files/ +-source.. = . +-output.. = . ++source.. = src/ ++output.. = bin/ + customBuildCallbacks=customBuildCallbacks.xml + javacSource = 1.5 + javacTarget = 1.5 ++jars.compile.order = library.jar,\ ++ src/ ++source.library.jar = src2/ diff --git a/eclipse-p2-pick-up-renamed-jars.patch b/eclipse-p2-pick-up-renamed-jars.patch new file mode 100644 index 0000000..8a85fe3 --- /dev/null +++ b/eclipse-p2-pick-up-renamed-jars.patch @@ -0,0 +1,11 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2012-05-05 15:24:03.000000000 +0200 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2012-05-17 16:14:48.607827015 +0200 +@@ -752,7 +752,7 @@ + //First check to see if there is already an IU around for this + IInstallableUnit bundleIU = queryForIU(result, bundleDescriptions[i].getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion())); + IArtifactKey key = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString()); +- if (bundleIU == null) { ++ if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) { + createAdviceFileAdvice(bundleDescriptions[i], info); + // Create the bundle IU according to any shape advice we have + bundleIU = doCreateBundleIU(bd, key, info); diff --git a/eclipse-pdebuild.sh b/eclipse-pdebuild.sh new file mode 100755 index 0000000..ea14c58 --- /dev/null +++ b/eclipse-pdebuild.sh @@ -0,0 +1,314 @@ +#!/bin/bash + +# args: [-f ] [-d ] [-a ] [-j ] [-v] [-D] [-o ] + +function usage { +cat << _EOF_ +usage: $0 [] + +Use PDE Build to build Eclipse features + +Optional arguments: + -h Show this help message + -f Feature ID to build + -d Plugin dependencies in addition to Eclipse SDK + (space-separated, names on which to glob features and plugins) + -a Additional build arguments (ex. -DjavacSource=1.5) + -j VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar) + -v Be verbose + -D Debug platform itself (passes -consolelog -debug to Eclipse) + -o Directory containing Orbit-style dependencies + -z Comma-delimited list of dependency zips (not for use during RPM build) +_EOF_ +} + +function copyPlatform { + # This seems silly but I was running into issues with empty strings + # counting as arguments to copy-platform -- overholt, 2008-03 + if [ -z "$dependencies" ]; then + if [ $verbose -eq 1 ]; then + echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse" + /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse + else + echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse" + /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse + fi + else + if [ $verbose -eq 1 ]; then + echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies" + /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies + else + echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies" + /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies + fi + fi +} + +function findFeatureId { + # We can determine the feature ID if we have only one + numFeatures=$(find $sourceDir -name feature.xml | wc -l) + if [ $numFeatures -ne 1 ]; then + #echo "# features found = $numFeatures" + echo "Cannot determine feature ID. Please specify with -f." + usage + exit 1 + fi + + featureXml=$(find $sourceDir -name feature.xml) + + # Taken from Ben Konrath's package-build + # make an ant build files to extract the id from the feature.xml + buildFile=$buildDir/findFeatureForRPM-tmp-build.xml + + echo " + + + + + + " > $buildFile + + featureId=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | cut --delimiter=' ' -f 7) + rm $buildFile +} + +function findFeatureNameAndVersion { + featureXml=$(find $sourceDir -name feature.xml | while read f; do grep -l id=\"$featureId\" $f; done) + + buildFile=$buildDir/findFeatureForRPM-tmp-build.xml + + echo " + + + + + + " > $buildFile + + featureName=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //") + rm $buildFile + + echo " + + + + + + " > $buildFile + + featureVersion=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //") + rm $buildFile +} + +function findMaxBREE { + manifests=$(find $sourceDir -name MANIFEST.MF) + maxBree=1.4 + for i in $manifests; do + breeLine=$(cat $i|grep RequiredExecutionEnvironment|cut -c37-|sed 's/^ *\(.*\) *$/\1/') + case $breeLine in + "J2SE-1.5") + bree=1.5 + ;; + "JavaSE-1.6") + bree=1.6 + ;; + esac + if [ "$bree" \> "$maxBree" ]; then + maxBree=$bree + fi + done +} + +sourceDir=$PWD +buildDir=$PWD/build +SDK=$buildDir/SDK +homeDir=$buildDir/home +workspaceDir=$homeDir/workspace +datadir=`rpm --eval "%{_libdir}"` +pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@ + +featureId= +dependencies= +additionalArgs= +vmArgs= +verbose=0 +dryRun=0 +debugPlatform=0 +orbitDepsDir= +p2Generate= +testing=false +zipDeps= + +# See above. r = dry run (used for testing) +while getopts “hf:d:z:a:j:tvrDo:” OPTION +do + case $OPTION in + h) + usage + exit + ;; + f) + featureId=$OPTARG + ;; + d) + dependencies=$OPTARG + ;; + a) + additionalArgs=$OPTARG + ;; + j) + vmArgs=$OPTARG + ;; + t) + testing=true + ;; + v) + verbose=1 + ;; + r) + dryRun=1 + ;; + D) + debugPlatform=1 + ;; + o) + orbitDepsDir=$OPTARG + ;; + z) + zipDeps=$OPTARG + ;; + ?) + usage + exit 1 + ;; + esac +done + +echo "mkdir -p $buildDir" +if [ $dryRun -ne 1 ]; then + mkdir -p $buildDir +fi + +# Eclipse may try to write to the building user's home directory so we create a +# temporary one for use by the build. +echo "mkdir -p $homeDir" +if [ $dryRun -ne 1 ]; then + mkdir -p $homeDir +fi + +echo "mkdir -p $workspaceDir" +if [ $dryRun -ne 1 ]; then + mkdir -p $workspaceDir +fi + +if [ -z $featureId ]; then + findFeatureId +fi + +if [ -z $featureId ]; then + echo "Cannot determine feature ID. Please specify with -f." + usage + exit 1 +fi + +findFeatureNameAndVersion + +echo "Building feature = $featureId." + +if [ -z "$dependencies" ]; then + if [ $verbose -eq 1 ]; then + echo "Assuming no dependencies except Eclipse SDK." + fi +fi + +# Symlink the SDK and dependencies for build +if [ -z "$dependencies" ]; then + echo "Symlinking SDK into $SDK directory." +else + echo "Symlinking SDK and \"$dependencies\" into $SDK directory." +fi +if [ $dryRun -ne 1 ]; then + copyPlatform +fi + +if [ $debugPlatform -eq 1 ]; then + debugPlatformArgs="-debug -consolelog" +fi + +if [ "x$orbitDepsDir" != "x" ]; then + orbitDeps="-DorbitDepsDir=$orbitDepsDir" +fi + +if [ "x$zipDeps" != "x" ]; then + OLD_IFS="$IFS" + IFS="," + zipDepsArray=($zipDeps) + IFS="$OLD_IFS" + numZips=${#zipDepsArray[@]} + for (( i=0; i< $numZips; i++ )); do + thisZip=${zipDepsArray[$i]} + thisFile=$(basename $thisZip) + thisURL=$(echo $thisZip | sed s/$thisFile//) + if [ ! -e $thisFile ]; then + wget -q $thisZip + fi + mkdir -p tmp + unzip -q -o $thisFile -d tmp + cp -raf tmp/eclipse/features/* $SDK/features + cp -raf tmp/eclipse/plugins/* $SDK/plugins + rm -rf tmp + thisZip= + thisFile= + thisURL= + done +fi +if [ -z "$additionalArgs" ]; then + findMaxBREE + additionalArgs="-DjavacSource=$maxBree -DjavacTarget=$maxBree" +fi + +echo "Starting build:" + +launcherJar=$(ls $SDK/plugins | grep "org.eclipse.equinox.launcher_") + +if [ $testing != true ]; then + java -cp $SDK/plugins/${launcherJar} \ + -Duser.home=$homeDir \ + $vmArgs \ + org.eclipse.core.launcher.Main \ + -data $workspaceDir \ + -application org.eclipse.ant.core.antRunner \ + $debugPlatformArgs \ + -Dtype=feature \ + -Did=$featureId \ + -DbaseLocation=$SDK \ + -DsourceDirectory=$sourceDir \ + -DbuildDirectory=$buildDir \ + -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \ + $orbitDeps \ + -Dtesting="$testing" \ + $additionalArgs \ + -f $pdeBuildDir/scripts/build.xml +else + echo "\ + java -cp $SDK/plugins/${launcherJar} \ + -Duser.home=$homeDir \ + $vmArgs \ + org.eclipse.core.launcher.Main \ + -data $workspaceDir \ + -application org.eclipse.ant.core.antRunner \ + $debugPlatformArgs \ + -Dtype=feature \ + -Did=$featureId \ + -DbaseLocation=$SDK \ + -DsourceDirectory=$sourceDir \ + -DbuildDirectory=$buildDir \ + -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \ + $orbitDeps \ + -Dtesting=\"$testing\" \ + $additionalArgs \ + -f $pdeBuildDir/scripts/build.xml + " +fi + +exit $? diff --git a/eclipse-populate-update-sites-from-master.patch b/eclipse-populate-update-sites-from-master.patch new file mode 100644 index 0000000..9c52139 --- /dev/null +++ b/eclipse-populate-update-sites-from-master.patch @@ -0,0 +1,260 @@ +diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +index 2392378..526183c 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +@@ -7,7 +7,7 @@ + Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator + Bundle-Vendor: %providerName + Bundle-Localization: plugin +-Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository", ++Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.engine", + org.eclipse.equinox.internal.p2.core.helpers; + x-friends:="org.eclipse.equinox.frameworkadmin.test, + org.eclipse.equinox.p2.artifact.optimizers, +diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF +index cb812be2..21ba682 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF +@@ -25,16 +25,19 @@ + J2SE-1.4, + CDC-1.1/Foundation-1.1 + Bundle-ActivationPolicy: lazy +-Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml ++Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml, ++ OSGI-INF/MasterRepositoryPreferenceProvider.xml + Import-Package: javax.xml.parsers, + org.eclipse.core.internal.preferences, + org.eclipse.core.runtime.preferences, ++ org.eclipse.equinox.internal.p2.core, + org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.p2.metadata, + org.eclipse.equinox.internal.p2.metadata.index, + org.eclipse.equinox.internal.p2.metadata.repository.io, + org.eclipse.equinox.internal.p2.persistence, + org.eclipse.equinox.internal.p2.repository, ++ org.eclipse.equinox.internal.p2.repository.helpers, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.repository, + org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)", +diff --git a/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml b/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml +new file mode 100644 +index 0000000..026fa0e +--- /dev/null ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/OSGI-INF/MasterRepositoryPreferenceProvider.xml +@@ -0,0 +1,7 @@ ++ ++ ++ ++ ++ ++ ++ +diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java +new file mode 100644 +index 0000000..0fef156 +--- /dev/null ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java +@@ -0,0 +1,65 @@ ++/******************************************************************************* ++ * Copyright (c) 2012 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: ++ * Red Hat,Inc. - initial API and implementation ++ *******************************************************************************/ ++package org.eclipse.equinox.p2.engine; ++ ++import java.net.URI; ++import java.net.URISyntaxException; ++import java.util.Hashtable; ++import org.eclipse.core.runtime.URIUtil; ++import org.eclipse.equinox.internal.p2.core.ProvisioningAgent; ++import org.eclipse.equinox.internal.p2.engine.EngineActivator; ++import org.eclipse.equinox.internal.p2.repository.Activator; ++import org.eclipse.equinox.internal.p2.repository.helpers.IMasterProfilePreferencesProvider; ++import org.eclipse.equinox.p2.core.IAgentLocation; ++import org.eclipse.equinox.p2.core.IProvisioningAgent; ++import org.osgi.framework.ServiceRegistration; ++import org.osgi.service.prefs.Preferences; ++ ++public class MasterProfilePreferencesProvider implements IMasterProfilePreferencesProvider { ++ ++ public Preferences getMasterPreferences(String profileName, String node) { ++ ++ URI location; ++ try { ++ String sharedConfig = Activator.getContext().getProperty("osgi.sharedConfiguration.area"); //$NON-NLS-1$ ++ ++ if (sharedConfig == null) ++ return null; ++ //find where the profile is located by default ++ location = URIUtil.fromString(sharedConfig + "../p2" + '/'); //$NON-NLS-1$ ++ ++ } catch (URISyntaxException e1) { ++ //should not happen as Equinox will complain first. ++ return null; ++ } ++ ++ if (location == null) { ++ // no master location, quit ++ return null; ++ } ++ ++ // This is copied from tests ++ ProvisioningAgent agent = new ProvisioningAgent(); ++ agent.setLocation(location); ++ agent.setBundleContext(EngineActivator.getContext()); ++ IAgentLocation agentLocation = (IAgentLocation) agent.getService(IAgentLocation.SERVICE_NAME); ++ Hashtable props = new Hashtable(); ++ props.put("locationURI", location.toString()); //$NON-NLS-1$ ++ ++ @SuppressWarnings("rawtypes") ++ ServiceRegistration reg = EngineActivator.getContext().registerService(IProvisioningAgent.SERVICE_NAME, agent, props); ++ try { ++ return new ProfileScope(agentLocation, profileName).getNode(node); ++ } finally { ++ reg.unregister(); ++ } ++ } ++} +diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF +index e32ff0f..b1d12c1 100644 +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF +@@ -26,7 +26,8 @@ + org.eclipse.equinox.p2.operations, + org.eclipse.equinox.p2.repository.tools, + org.eclipse.equinox.p2.ui, +- org.eclipse.equinox.p2.updatesite", ++ org.eclipse.equinox.p2.updatesite, ++ org.eclipse.equinox.p2.engine", + org.eclipse.equinox.internal.provisional.p2.repository, + org.eclipse.equinox.p2.repository;version="2.0.0", + org.eclipse.equinox.p2.repository.artifact;version="2.1.0", +@@ -41,6 +42,7 @@ + CDC-1.1/Foundation-1.1 + Bundle-ActivationPolicy: lazy + Import-Package: javax.xml.parsers, ++ org.eclipse.core.internal.preferences, + org.eclipse.core.runtime.jobs, + org.eclipse.core.runtime.preferences;version="3.2.0", + org.eclipse.equinox.internal.p2.core, +diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java +new file mode 100644 +index 0000000..fac54ea +--- /dev/null ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java +@@ -0,0 +1,22 @@ ++/******************************************************************************* ++ * Copyright (c) 2012 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: ++ * Red Hat,Inc. - initial API and implementation ++ *******************************************************************************/ ++package org.eclipse.equinox.internal.p2.repository.helpers; ++ ++import org.osgi.service.prefs.Preferences; ++ ++/** ++ * This service does its best to locate master profile and get preferences ++ * stored in master ProfileScope. ++ * ++ */ ++public interface IMasterProfilePreferencesProvider { ++ public Preferences getMasterPreferences(String profileName, String node); ++} +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java.orig 2012-05-05 15:24:03.000000000 +0200 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java 2012-05-18 16:18:18.029669647 +0200 +@@ -9,6 +9,7 @@ + * IBM Corporation - initial API and implementation + * Wind River - fix for bug 299227 + * Sonatype, Inc. - transport split ++ * Red Hat,Inc. - fix for bug 249133 + *******************************************************************************/ + package org.eclipse.equinox.internal.p2.repository.helpers; + +@@ -33,6 +34,7 @@ + import org.eclipse.osgi.util.NLS; + import org.osgi.service.prefs.BackingStoreException; + import org.osgi.service.prefs.Preferences; ++import org.osgi.util.tracker.ServiceTracker; + + /** + * Common code shared between artifact and metadata repository managers. +@@ -981,6 +983,61 @@ + saveToPreferences(); + } + ++ private void restoreFromMasterPreferences() { ++ // restore the list of repositories from the preference store ++ Preferences node = getPreferences(); ++ if (node == null) ++ return; ++ ++ { ++ ServiceTracker tracker = new ServiceTracker(Activator.getContext(), IMasterProfilePreferencesProvider.class.getName(), null); ++ tracker.open(); ++ IMasterProfilePreferencesProvider pprovider = tracker.getService(); ++ if(pprovider == null) return; ++ String profileName = node.parent().parent().name(); ++ String nodeName = node.parent().name(); ++ ++ Preferences rootNode = pprovider.getMasterPreferences(profileName, nodeName); ++ ++ if (rootNode == null) ++ return; ++ ++ /*repositories*/ ++ node = rootNode.node(NODE_REPOSITORIES); ++ } ++ ++ String[] children; ++ try { ++ children = node.childrenNames(); ++ } catch (BackingStoreException e) { ++ log("Error restoring repositories from preferences", e); //$NON-NLS-1$ ++ return; ++ } ++ ++ for (int i = 0; i < children.length; i++) { ++ Preferences child = node.node(children[i]); ++ URI location = getRepositoryLocation(child); ++ if (location == null) { ++ try { ++ child.removeNode(); ++ continue; ++ } catch (BackingStoreException e) { ++ log("Error removing invalid repository", e); //$NON-NLS-1$ ++ } ++ } ++ RepositoryInfo info = new RepositoryInfo(); ++ info.location = location; ++ info.name = child.get(KEY_NAME, null); ++ info.nickname = child.get(KEY_NICKNAME, null); ++ info.description = child.get(KEY_DESCRIPTION, null); ++ info.isSystem = child.getBoolean(KEY_SYSTEM, false); ++ info.isEnabled = child.getBoolean(KEY_ENABLED, true); ++ info.suffix = child.get(KEY_SUFFIX, null); ++ repositories.put(getKey(info.location), info); ++ } ++ } ++ ++ + private void restoreFromSystemProperty() { + String locationString = Activator.getContext().getProperty(getRepositorySystemProperty()); + if (locationString != null) { +@@ -1004,6 +1062,7 @@ + restoreSpecialRepositories(); + restoreFromSystemProperty(); + restoreFromPreferences(); ++ restoreFromMasterPreferences(); + } + } + diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch new file mode 100644 index 0000000..185e3bb --- /dev/null +++ b/eclipse-remove-jgit-provider.patch @@ -0,0 +1,22 @@ +--- eclipse-parent/pom.xml.bak 2012-08-09 16:08:45.000000000 +0200 ++++ eclipse-parent/pom.xml 2012-08-09 16:10:22.504134998 +0200 +@@ -165,19 +165,9 @@ + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} +- +- +- org.eclipse.tycho.extras +- tycho-buildtimestamp-jgit +- ${tycho-extras.version} +- +- + + false + 'v'yyyyMMdd-HHmm +- jgit +- +- + + + diff --git a/eclipse-remove-w3c-smil-and-use-geronimo.patch b/eclipse-remove-w3c-smil-and-use-geronimo.patch new file mode 100644 index 0000000..d8465c8 --- /dev/null +++ b/eclipse-remove-w3c-smil-and-use-geronimo.patch @@ -0,0 +1,29 @@ +--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2012-02-24 09:22:22.000000000 +0100 ++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-02-24 14:23:21.289474792 +0100 +@@ -124,13 +124,6 @@ + unpack="false"/> + + +- +- + + + + + + +- +- + +--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200 ++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2012-07-27 14:50:27.668209657 +0200 +@@ -351,12 +351,6 @@ + version="0.0.0"/> + + +- +- +- +- +- +- + + +- diff --git a/eclipse-set-1.6-bree.patch b/eclipse-set-1.6-bree.patch new file mode 100644 index 0000000..ba4786d --- /dev/null +++ b/eclipse-set-1.6-bree.patch @@ -0,0 +1,55 @@ +--- eclipse-parent/pom.xml.old 2012-07-26 13:10:45.117816261 +0200 ++++ eclipse-parent/pom.xml 2012-07-26 13:07:41.336610064 +0200 +@@ -96,7 +96,7 @@ + packages. This makes J2SE-1.4 effectively the minimal execution environment required by eclipse platform + build since many platform bundles directly or indirectly depend on org.eclipse.equinox.security. + --> +- ?J2SE-1.4 ++ ?JavaSE-1.6 + + + +--- rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml.bak 2012-07-25 17:41:27.000000000 +0200 ++++ rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml 2012-07-26 16:57:26.571579035 +0200 +@@ -31,7 +31,7 @@ + target-platform-configuration + + +- J2SE-1.5 ++ ?JavaSE-1.6 + + + +--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/pom.xml.bak 2012-07-25 17:42:07.000000000 +0200 ++++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/pom.xml 2012-07-27 13:04:13.392040773 +0200 +@@ -32,7 +32,7 @@ + target-platform-configuration + + +- J2SE-1.5 ++ JavaSE-1.6 + + + +--- eclipse.platform.releng/features/master/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200 ++++ eclipse.platform.releng/features/master/pom.xml 2012-07-27 13:13:35.876618847 +0200 +@@ -33,7 +33,7 @@ + org.eclipse.tycho + target-platform-configuration + +- J2SE-1.5 ++ JavaSE-1.6 + + + wce_ppc +--- eclipse.platform.releng/features/master-equinox/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200 ++++ eclipse.platform.releng/features/master-equinox/pom.xml 2012-07-27 14:26:18.119956202 +0200 +@@ -33,7 +33,7 @@ + org.eclipse.tycho + target-platform-configuration + +- J2SE-1.5 ++ JavaSE-1.6 + + + diff --git a/eclipse.desktop b/eclipse.desktop new file mode 100644 index 0000000..2fcbf87 --- /dev/null +++ b/eclipse.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Eclipse +Comment=Eclipse Integrated Development Environment +Icon=eclipse +Exec=eclipse +Terminal=false +Categories=Development;IDE;Java; \ No newline at end of file diff --git a/eclipse.spec b/eclipse.spec index 8b88ac1..cf3ae80 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -5,11 +5,11 @@ Epoch: 1 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} %global eclipse_micro 0 %global initialize 1 -%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/ -%global eb_sha1 8b7060063e10f73e00056a9766d33fc43f043f4b +#%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/ +#%global eb_sha1 8b7060063e10f73e00056a9766d33fc43f043f4b %global build_id I20120608-1400 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} -%global emf_version 2.8.0 +%global installation_loc %{_libdir}/%{name} # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. @@ -20,12 +20,14 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 8%{?dist} +Release: 9%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: %{download_url}eclipse-build-%{eb_sha1}.tar.xz -Source1: %{download_url}eclipse-%{eclipse_version}-%{build_id}-src.tar.bz2 +Source0: eclipse-source.tar.bz2 +Source1: eclipse-jdtpdeupdatesite.tar.bz2 +Source2: eclipse.desktop +Source3: efj.sh Source4: macros.%{name} Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom # Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom @@ -33,7 +35,68 @@ Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/ Source6: org.eclipse.osgi.services-3.2.100.v20100503.pom Source7: http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom Source8: org.eclipse.jdt.core-3.8.0.v_C03.pom -Patch0: lucene-3.6-compile.patch + +Source20: rt.incubator.pom.xml +Source21: initializer.pom.xml + +Source30: extract_patterns.txt +Source31: eclipse-copy-platform.sh +Source32: eclipse-pdebuild.sh + + + + +# -com.sun.el +# +javax.el +# +org.apache.commons.el +# -org.apache.commons.logging +# +org.apache.commons.logging +# -org.apache.jasper.glassfish +# +org.apache.tomcat +# +org.apache.jasper +# +org.apache.juli +# -org.apache.lucene +# -org.apache.lucene +# +org.apache.lucene.core +Patch0: %{name}-help-feature-adjust-dependencies.patch + + +# -org.w3c.dom.smil +# -javax.annotation +# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec +Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch + +# 1.4 -> 1.6 +Patch2: %{name}-set-1.6-bree.patch + +# com.ibm.icu.base -> com.ibm.icu +Patch3: %{name}-fix-icu-import.patch + +Patch4: %{name}-no-source-for-dependencies.patch +Patch5: %{name}-osgi-serverside-patch-additional-imports.patch +Patch6: %{name}-fix-sshd-id.patch +Patch7: %{name}-fix-equinox-ip-imports.patch +Patch8: %{name}-remove-weaving.patch +Patch9: %{name}-fix-master-ecf.patch +Patch10: %{name}-fix-master-equinox.patch +#services +Patch11: %{name}-osgi-unpack-sources.patch +Patch12: %{name}-fix-debug-ui.patch +Patch13: %{name}-fix-compatibility-class.patch + +Patch14: %{name}-fix-pde-ui-compilation.patch +Patch15: %{name}-fix-transforms.patch + +Patch16: %{name}-dont-download-old-platform-for-p2-tests.patch + +Patch17: %{name}-do-not-run-as-root.patch +Patch18: %{name}-drop-user-profile-on-platform-change.patch +Patch19: %{name}-p2-pick-up-renamed-jars.patch +Patch20: %{name}-ignore-version-when-calculating-home.patch +Patch21: %{name}-populate-update-sites-from-master.patch +Patch22: %{name}-remove-jgit-provider.patch +Patch23: lucene-3.6-compile.patch +Patch24: %{name}-dont-unpack-junit.patch BuildRequires: ant >= 1.8.3 BuildRequires: rsync @@ -48,13 +111,13 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip +BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1:1.7.0 BuildRequires: java-javadoc >= 1:1.7.0 BuildRequires: libXt-devel BuildRequires: webkitgtk-devel BuildRequires: geronimo-annotation >= 1.0-7 - BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11 BuildRequires: tomcat-lib >= 7.0.25-3 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net @@ -64,6 +127,7 @@ BuildRequires: jsch >= 0:0.1.46-2 BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec >= 1.6-2 +BuildRequires: apache-sshd >= 0.7.0 BuildRequires: jakarta-commons-httpclient >= 1:3.1-7 BuildRequires: felix-gogo-command >= 0.12 BuildRequires: felix-gogo-shell >= 0.10.0-3 @@ -79,6 +143,13 @@ BuildRequires: sac >= 1.3-12 BuildRequires: batik >= 1.8 BuildRequires: xml-commons-apis >= 1.4.01-6 BuildRequires: atinject >= 1-6 +BuildRequires: tycho >= 0.16 +BuildRequires: tycho-extras >= 0.16 +BuildRequires: eclipse-emf-core >= 1:2.8.0-13 +BuildRequires: eclipse-ecf-core +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat6-servlet-2.5-api +BuildRequires: cglib %if 0%{?rhel} >= 6 ExclusiveArch: %{ix86} x86_64 @@ -111,20 +182,6 @@ Requires: jpackage-utils %description equinox-osgi Eclipse OSGi - Equinox - -%package rcp -Version: %{eclipse_version} -Summary: Eclipse Rich Client Platform -Group: Development/Languages -Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} -Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release} -Requires: icu4j-eclipse >= 1:4.4.2.2-11 -Requires: %{name}-emf-core >= %{epoch}:%{emf_version}-%{release} -Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version} - -%description rcp -Eclipse Rich Client Platform - %package platform Version: %{eclipse_version} Summary: Eclipse platform common files @@ -150,8 +207,14 @@ Requires: xml-commons-apis >= 1.4.01-6 Requires: batik >= 1.8 Requires: atinject >= 1-6 Requires: geronimo-annotation >= 1.0-7 +Requires: eclipse-ecf-core +Requires: eclipse-emf-core +Requires: tomcat-servlet-3.0-api Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 +Obsoletes: eclipse-rcp < 1:%{eclipse_version}-%{release} +Provides: eclipse-rcp = 1:%{eclipse_version}-%{release} +Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version} %description platform The Eclipse Platform is the base of all IDE plugins. This does not include the @@ -194,80 +257,587 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep -export JAVA_HOME=%{java_home} -%setup -q -n eclipse-build-%{eb_sha1} -cp %{SOURCE1} . -ant applyPatches -%patch0 -pushd build/eclipse-%{eclipse_version}-%{build_id}-src -sed -i -e "s|\[2.9.0,3.0.0)|\[2.9.0,4.0.0)|g" plugins/org.eclipse.help.base/META-INF/MANIFEST.MF +ARCH=%{_arch} +ARCH=${ARCH/i386/x86} + +%setup %{SOURCE0} -n R4_platform-aggregator + +pushd TMP +tar xf %{SOURCE1} +popd + +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 +%patch9 +%patch10 +%patch11 +%patch12 +%patch13 +%patch14 +%patch15 +%patch16 +%patch17 +%patch18 +%patch19 +%patch20 +%patch21 +%patch22 +%patch23 +%patch24 + +#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040 +%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles . +%pom_disable_module bundles/org.eclipse.equinox.http.jetty6 rt.equinox.bundles . + +#we do not have dependencies for those tests +%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles +%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles +%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles +%pom_disable_module features/master-equinox-weaving eclipse.platform.releng + + +%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles + +#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar. +%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/ # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \ -e "/osgi\.org/d" \ -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \ - plugins/org.eclipse.platform.doc.isv/platformOptions.txt + eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \ - -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \ - plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt + -e "s/win32.win32.x86/gtk.linux.${ARCH}/" \ + eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ -e "/osgi\.org/d" \ - plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt + eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ - -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \ + -e "s/motif.linux.x86/gtk.linux.${ARCH}/" \ -e "/osgi\.org/d" \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt + eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ + eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt + eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ + eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt #fix for glib 2.31 not allowing include of anything else but glib -sed -i -e "s|#include ||g" plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c +sed -i -e "s|#include ||g" eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c # make sure there are no jars left -JARS="" -for j in $(find -name \*.jar); do - if [ ! -L $j ]; then - JARS="$JARS `echo $j`" +find . -name *.jar -exec rm -f {} \; +find . -name *.class -exec rm -f {} \; +find . -name *.so -exec rm -f {} \; + +find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \; +find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \; +find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \; + +#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298 +sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration1)/new Equinox((Map) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration2)/new Equinox((Map) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java + +#Other compilation problems caused by 1.4 -> 1.5 change +sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java +sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java + +sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml +sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ARCH}/pom.xml + + +#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386503 +sed -i -e "s/3.6.0,4.0.0/3.0.0,4.0.0/" eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF + + +sed -i -e "s/org.eclipse.sdk.epp/org.fedoraproject.eclipse.platform/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product +sed -i -e "s/org.eclipse.sdk.epp<\/id>/org.fedoraproject.eclipse.platform<\/id>/" TMP/org.eclipse.sdk.epp/pom.xml +sed -i -e "s///" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product +sed -i -e "s/\"org.eclipse.sdk.ide\"/\"org.eclipse.platform.ide\"/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product + +sed -i -e "s/TMP\/org.eclipse.sdk.epp<\/module>/TMP\/org.eclipse.sdk.epp<\/module>TMP\/jdtpde<\/module>/" pom.xml + + + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670 +cp %{SOURCE20} rt.equinox.incubator/pom.xml +cp %{SOURCE21} rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/pom.xml +sed -i -e "s/rt.equinox.p2<\/module>/rt.equinox.p2<\/module>rt.equinox.incubator<\/module>/" pom.xml + + +sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml +sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.ua/org.eclipse.help.base/pom.xml + +sed -i -e "s@ org.eclipse.egit.core;bundle-version=\"1.3.0\";resolution:=optional@ org.eclipse.ui@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF +sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF +#sed -i -e "s@ org.eclipse.ui.console,@ org.eclipse.ui.console@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF + +rm eclipse.platform.releng/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/* + +%build +ARCH=%{_arch} +ARCH=${ARCH/i386/x86} + +mkdir -p repo +cp -r /usr/share/java/emf repo +eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ + -metadataRepository file:/`pwd`/repo \ + -artifactRepository file:/`pwd`/repo \ + -source `pwd`/repo/emf/eclipse \ + -configs gtk.linux.${ARCH} \ + -compress \ + -publishArtifacts + + +mvn-rpmbuild -f eclipse-parent/pom.xml \ + clean install \ + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo + +mvn-rpmbuild -f maven-cbi-plugin/pom.xml \ + clean install \ + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo + +#workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377 +#pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable +mvn-rpmbuild clean install \ + -Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \ + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo +#popd + +mvn-rpmbuild clean install \ + -Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \ + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo + +pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH} + +###################### +# Extract jdt and pde to dropins +###################### +# do the initializer magic +cp ../../../../../../../../rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/target/org.eclipse.equinox.initializer-1.0.0-SNAPSHOT.jar eclipse/dropins +pushd eclipse + ./eclipse -application org.eclipse.equinox.initializer.configInitializer -justThisArchOSWS -fileInitializer %{SOURCE30} + rm dropins/org.eclipse.equinox.initializer-1.0.0-SNAPSHOT.jar + ./eclipse -initialize +# Create file listings for the extracted shared libraries +echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; +for id in `ls configuration/org.eclipse.osgi/bundles`; do + if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then + echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install; + else + echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; fi done -if [ ! -z "$JARS" ]; then - echo "These jars should be deleted and symlinked to system jars: $JARS" - #FIXME: enable exit 1 -fi +popd +#make a backup +cp -rf eclipse eclipse-backup-with-jdt +# go into backup +pushd eclipse-backup-with-jdt + ./eclipse -application org.eclipse.equinox.p2.director \ + -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \ + -installIU org.eclipse.jdt.feature.group +#exit backup popd -%build -export JAVA_HOME=%{java_home} -ant provision.cvs +mkdir -p jdt/plugins jdt/features -%install -export JAVA_HOME=%{java_home} -ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins +#get the difference and copy all files into jdt folder +for i in `ls eclipse-backup-with-jdt/features` ; do \ + if [ ! -e eclipse/features/$i ]; \ + then cp -r eclipse-backup-with-jdt/features/$i jdt/features ; \ + fi \ +done + +for i in `ls eclipse-backup-with-jdt/plugins` ; do \ + if [ ! -e eclipse/plugins/$i ]; \ + then cp -r eclipse-backup-with-jdt/plugins/$i jdt/plugins ; \ + fi \ +done + +cp -rf eclipse-backup-with-jdt eclipse-backup-with-jdt-pde + +pushd eclipse-backup-with-jdt-pde + ./eclipse -application org.eclipse.equinox.p2.director \ + -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \ + -installIU org.eclipse.sdk.feature.group +popd + +mkdir -p sdk/plugins sdk/features + +#get the difference and copy all files into pde folder +for i in `ls eclipse-backup-with-jdt-pde/features` ; do \ + if [ ! -e eclipse-backup-with-jdt/features/$i ]; \ + then cp -r eclipse-backup-with-jdt-pde/features/$i sdk/features ; \ + fi \ +done + +for i in `ls eclipse-backup-with-jdt-pde/plugins` ; do \ + if [ ! -e eclipse-backup-with-jdt/plugins/$i ]; \ + then cp -r eclipse-backup-with-jdt-pde/plugins/$i sdk/plugins ; \ + fi \ +done + + +cp -r jdt sdk eclipse/dropins + +cd eclipse +rm -rf configuration/org.eclipse.core.runtime +rm -rf configuration/org.eclipse.equinox.app +rm -rf configuration/org.eclipse.update/* + +find configuration -type d -name "data" -exec rm -rf `pwd`{} \; +find configuration -type f -name "*.log" -exec rm `pwd`{} \; + +cd configuration/org.eclipse.osgi +rm -rf .bundledata* .lazy* .manager .state* +cd ../.. + +pushd plugins +#So, remove duplicated jars and symlink them +f=`ls | grep -e "^com.ibm.icu_"` + rm $f + ln -s %{_javadir}/icu4j-eclipse/plugins/com.ibm.icu_*.jar $f + +f=`ls | grep -e "^com.jcraft.jsch_"` + rm $f + ln -s %{_javadir}/jsch.jar $f + +f=`ls | grep -e "^javax.el_"` + rm $f + ln -s %{_javadir}/tomcat-el-api.jar $f + +f=`ls | grep -e "^javax.inject_"` + rm $f + ln -s %{_javadir}/atinject.jar $f + +f=`ls | grep -e "^javax.servlet_"` + rm $f + ln -s %{_javadir}/tomcat-servlet-api.jar $f + +f=`ls | grep -e "^javax.servlet.jsp_"` + rm $f + ln -s %{_javadir}/tomcat-jsp-api.jar $f + +f=`ls | grep -e "^javax.xml_"` + rm $f + ln -s %{_javadir}/xml-commons-apis.jar $f + +f=`ls | grep -e "^org.apache.batik.css_"` + rm $f + ln -s %{_javadir}/batik/batik-css.jar $f + +f=`ls | grep -e "^org.apache.batik.util_"` + rm $f + ln -s %{_javadir}/batik/batik-util.jar $f + +f=`ls | grep -e "^org.apache.batik.util.gui_"` + rm $f + ln -s %{_javadir}/batik/batik-gui-util.jar $f + +f=`ls | grep -e "^org.apache.commons.codec_"` + rm $f + ln -s %{_javadir}/commons-codec.jar $f + +f=`ls | grep -e "^org.apache.commons.el_"` + rm $f + ln -s %{_javadir}/commons-el.jar $f + +f=`ls | grep -e "^org.apache.commons.httpclient_"` + rm $f + ln -s %{_javadir}/commons-httpclient.jar $f + +f=`ls | grep -e "^org.apache.commons.logging_"` + rm $f + ln -s %{_javadir}/commons-logging.jar $f + +f=`ls | grep -e "^org.apache.el_"` + rm $f + ln -s %{_javadir}/tomcat/jasper-el.jar $f + +f=`ls | grep -e "^org.apache.felix.gogo.command_"` + rm $f + ln -s %{_javadir}/felix/org.apache.felix.gogo.command.jar $f + +f=`ls | grep -e "^org.apache.felix.gogo.runtime_"` + rm $f + ln -s %{_javadir}/felix/org.apache.felix.gogo.runtime.jar $f + +f=`ls | grep -e "^org.apache.felix.gogo.shell_"` + rm $f + ln -s %{_javadir}/felix/org.apache.felix.gogo.shell.jar $f + +f=`ls | grep -e "^org.apache.geronimo.specs.geronimo-annotation_1.1_spec_"` + rm $f + ln -s %{_javadir}/geronimo-annotation.jar $f + +f=`ls | grep -e "^org.apache.jasper_"` + rm $f + ln -s %{_javadir}/tomcat/jasper.jar $f + +f=`ls | grep -e "^org.apache.juli_"` + rm $f + ln -s %{_javadir}/tomcat/tomcat-juli.jar $f + +f=`ls | grep -e "^org.apache.lucene.core_"` + rm $f + ln -s %{_javadir}/lucene.jar $f + +f=`ls | grep -e "^org.apache.lucene.analysis_"` + rm $f + ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar $f + +f=`ls | grep -e "^org.apache.tomcat_"` + rm $f + ln -s %{_javadir}/tomcat/tomcat-api.jar $f + +f=`ls | grep -e "^org.eclipse.ecf_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.identity_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.identity_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.filetransfer_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.httpclient_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.httpclient.ssl_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.ssl_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*.jar $f + +f=`ls | grep -e "^org.eclipse.ecf.ssl_"` + rm $f + ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.ssl_*.jar $f + +f=`ls | grep -e "^org.eclipse.emf.common_"` + rm $f + ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.common_*.jar $f + +f=`ls | grep -e "^org.eclipse.emf.ecore.change_"` + rm $f + ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar $f + +f=`ls | grep -e "^org.eclipse.emf.ecore_"` + rm $f + ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore_*.jar $f + +f=`ls | grep -e "^org.eclipse.emf.ecore.xmi_"` + rm $f + ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.util_"` + rm $f + ln -s %{_javadir}/jetty/jetty-util.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.server_"` + rm $f + ln -s %{_javadir}/jetty/jetty-server.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.http_"` + rm $f + ln -s %{_javadir}/jetty/jetty-http.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.continuation_"` + rm $f + ln -s %{_javadir}/jetty/jetty-continuation.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.io_"` + rm $f + ln -s %{_javadir}/jetty/jetty-io.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.security_"` + rm $f + ln -s %{_javadir}/jetty/jetty-security.jar $f + +f=`ls | grep -e "^org.eclipse.jetty.servlet_"` + rm $f + ln -s %{_javadir}/jetty/jetty-servlet.jar $f + +f=`ls | grep -e "^org.glassfish.web.javax.servlet.jsp_"` + rm $f + ln -s %{_javadir}/glassfish-jsp.jar $f + +f=`ls | grep -e "^org.sat4j.core_"` + rm $f + ln -s %{_javadir}/org.sat4j.core.jar $f + +f=`ls | grep -e "^org.sat4j.pb_"` + rm $f + ln -s %{_javadir}/org.sat4j.pb.jar $f + +f=`ls | grep -e "^org.w3c.css.sac_"` + rm $f + ln -s %{_javadir}/sac.jar $f + +f=`ls | grep -e "^org.w3c.dom.svg_"` + rm $f + ln -s %{_javadir}/xml-commons-apis-ext.jar $f + +#also within ant +cd org.apache.ant_* + pushd lib + rm * + ln -s %{_javadir}/ant/ant-antlr.jar + ln -s %{_javadir}/ant/ant-apache-bcel.jar + ln -s %{_javadir}/ant/ant-apache-bsf.jar + ln -s %{_javadir}/ant/ant-apache-log4j.jar + ln -s %{_javadir}/ant/ant-apache-oro.jar + ln -s %{_javadir}/ant/ant-apache-regexp.jar + ln -s %{_javadir}/ant/ant-apache-resolver.jar + ln -s %{_javadir}/ant/ant-apache-xalan2.jar + ln -s %{_javadir}/ant/ant-commons-logging.jar + ln -s %{_javadir}/ant/ant-commons-net.jar + ln -s %{_javadir}/ant/ant-javamail.jar + ln -s %{_javadir}/ant/ant-jdepend.jar + ln -s %{_javadir}/ant/ant-jmf.jar + ln -s %{_javadir}/ant/ant-jsch.jar + ln -s %{_javadir}/ant/ant-junit.jar + ln -s %{_javadir}/ant/ant-junit.jar junit4.jar + ln -s %{_javadir}/ant-launcher.jar + ln -s %{_javadir}/ant/ant-swing.jar + ln -s %{_javadir}/ant/ant-testutil.jar + ln -s %{_javadir}/ant.jar + popd + + pushd bin + rm * + ln -s /usr/bin/ant ant + ln -s /usr/bin/antRun antRun + ln -s /usr/bin/antRun.pl antRun.pl + ln -s /usr/bin/runant.pl runant.pl + ln -s /usr/bin/runant.py runant.py + ln -s /usr/bin/complete-ant-cmd.pl complete-and-cmd.pl + popd +popd + +pushd dropins/jdt/plugins + f=`ls | grep -e "^org.hamcrest.core_"` + rm $f + ln -s %{_javadir}/hamcrest/core.jar $f + + cd org.junit_3.8.2.* + rm junit.jar + ln -s /usr/share/java/junit.jar + cd .. +popd + +pushd dropins/sdk/plugins + f=`ls | grep -e "^com.ibm.icu.source_*"` + rm $f + ln -s %{_javadir}/icu4j-eclipse/plugins/com.ibm.icu.source_*.jar $f + + f=`ls | grep -e "^org.objectweb.asm_*"` + rm $f + ln -s %{_javadir}/objectweb-asm/asm-all.jar $f +popd + +popd + +%install +ARCH=%{_arch} +ARCH=${ARCH/i386/x86} # We don't need icon.xpm # https://bugs.eclipse.org/292472 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm +#install icons +install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \ + $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/eclipse.png +install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \ + $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/eclipse.png +install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \ + $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/eclipse.png +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ +ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \ + $RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png + # Some directories we need install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT/usr/share/eclipse/dropins install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +################################# +### Extraced from old build.xml # +################################# +LOCAL_PWD=`pwd` +#change the installation p2 files +pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ +for i in `ls | grep "profile.gz"` ; do \ + echo $i ; \ + gunzip $i ; \ + sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse@%{_libdir}/eclipse@g" *.profile ; \ + gzip *.profile ; \ + done + +# TODO: some other paths +popd + +#installation itself - copy it into right location +rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse \ + $RPM_BUILD_ROOT%{_libdir} + +#desktop file +install -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop + +#eclipse compiler +chmod ugo+rx %{SOURCE3} +mkdir -p $RPM_BUILD_ROOT/usr/bin +install %{SOURCE3} $RPM_BUILD_ROOT/usr/bin/efj +TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/plugins | grep launcher_[0-9]*` +sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT/usr/bin/efj + +#eclipse binary +mkdir -p $RPM_BUILD_ROOT/usr/bin/ +pushd $RPM_BUILD_ROOT/usr/bin/ + ln -s %{_libdir}/%{name}/eclipse +popd + +pushd $RPM_BUILD_ROOT/%{_libdir}/%{name} +SWT_JAR=`ls $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins | grep swt.gtk` + ln -s %{_libdir}/%{name}/plugins/${SWT_JAR} swt.jar + ln -s %{_libdir}/%{name}/plugins/${SWT_JAR} swt-gtk.jar +popd + +#eclipse ini +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ +pushd $RPM_BUILD_ROOT/%{_sysconfdir}/ +ln -s %{_libdir}/%{name}/eclipse.ini +popd +################################# +### End of extraction # +################################# + + pushd $RPM_BUILD_ROOT%{_libdir}/%{name} -# Create file listings for the extracted shared libraries -echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; -for id in `ls configuration/org.eclipse.osgi/bundles`; do - if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then - echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install; - else - echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; - fi -done + +rm icon.xpm + popd # Remove state files @@ -283,20 +853,22 @@ done popd # Temporary fix until https://bugs.eclipse.org/294877 is resolved -sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding," >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding," >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini # Prevent running master Eclipse in a shared configuration -echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini + +echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini # Deploy installation debug config echo -e "org.eclipse.equinox.p2.core/debug=true" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.options @@ -340,16 +912,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop # Create a script that can be used to make a symlink tree of the # eclipse platform. -cp -p pdebuild/eclipse-copy-platform.sh copy-platform +cp -p %{SOURCE31} copy-platform mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform # Install the PDE Build wrapper script. -install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \ +install -p -D -m0755 %{SOURCE32} \ $RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild -PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \ +PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/pde/plugins \ | grep org.eclipse.pde.build_ | \ sed 's/org.eclipse.pde.build_//') sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ @@ -359,26 +931,6 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ -# Remove the junit library duplicated by pdebuild. -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_4.10.0.v4_10_0_v20120426-0900.jar - -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.common_* -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.ecore_* -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.common_*.jar -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar -rm -rf $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore_*.jar - -pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/features/ -popd - -pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/ - ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.common_2.8.0.v20110913-1526.jar org.eclipse.emf.common_2.8.0.R2_8_0.jar - ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore_2.8.0.R2_8_0.jar - ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.change_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.change_2.8.0.R2_8_0.jar,4,false - ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.xmi_2.8.0.R2_8_0.jar,4,false -popd - %post platform touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -418,71 +970,6 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/swt.jar %{_libdir}/java/swt.jar -%files rcp -%dir %{_libdir}/%{name}/features -%dir %{_datadir}/%{name} -%dir %{_libdir}/%{name}/configuration -%{_libdir}/%{name}/configuration/config.ini -%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -%dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator -%{_libdir}/%{name}/readme -%{_libdir}/%{name}/features/org.eclipse.rcp_* -%{_libdir}/%{name}/features/org.eclipse.e4.rcp_* -%{_libdir}/%{name}/plugins/com.ibm.icu_* -%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar -%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar -%{_libdir}/%{name}/plugins/org.apache.batik.css_* -%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_* -%{_libdir}/%{name}/plugins/org.apache.batik.util_* -%{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_* -%{_libdir}/%{name}/plugins/org.eclipse.core.commands_* -%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_* -%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_* -%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_* -%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_* -%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_* -%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_* -%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_* -%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_* -%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_* -%{_libdir}/%{name}/plugins/org.eclipse.help_* -%{_libdir}/%{name}/plugins/org.eclipse.jface_* -%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_* -%{_libdir}/%{name}/plugins/org.eclipse.rcp_* -%{_libdir}/%{name}/plugins/org.eclipse.ui_* -%{_libdir}/%{name}/plugins/org.eclipse.ui.views_* -%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_* -%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_* -%{_libdir}/%{name}/plugins/org.w3c.css.sac_* -%{_libdir}/%{name}/plugins/org.w3c.dom.svg_* - %if %{initialize} %files platform -f %{name}-platform.install %else @@ -499,15 +986,21 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/eclipse %dir %{_libdir}/%{name}/dropins %dir %{_datadir}/%{name}/dropins +%{_libdir}/%{name}/configuration/config.ini +%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/features/org.eclipse.platform_* %{_libdir}/%{name}/features/org.eclipse.e4.rcp_* +%{_libdir}/%{name}/features/org.eclipse.rcp_* +%{_libdir}/%{name}/features/org.eclipse.emf.common_* +%{_libdir}/%{name}/features/org.eclipse.emf.ecore_* +%{_libdir}/%{name}/plugins/com.ibm.icu_* %{_libdir}/%{name}/plugins/com.jcraft.jsch_* %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_* %{_libdir}/%{name}/plugins/javax.servlet_* %{_libdir}/%{name}/plugins/javax.servlet.jsp_* %{_libdir}/%{name}/plugins/javax.el_* -%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar -%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar +%{_libdir}/%{name}/plugins/javax.inject_*.jar +%{_libdir}/%{name}/plugins/javax.xml_1.3.4.*.jar %{_libdir}/%{name}/plugins/org.apache.tomcat_* %{_libdir}/%{name}/plugins/org.apache.juli_* %{_libdir}/%{name}/plugins/org.apache.el_* @@ -523,6 +1016,7 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.apache.felix.gogo.runtime_* %{_libdir}/%{name}/plugins/org.apache.felix.gogo.shell_* %{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_* +%{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_* %{_libdir}/%{name}/plugins/org.apache.lucene.core_* %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_* %{_libdir}/%{name}/plugins/org.eclipse.ant.core_* @@ -540,6 +1034,10 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.core.variables_* %{_libdir}/%{name}/plugins/org.eclipse.debug.core_* %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.emf.common_* +%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_* +%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_* +%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.event_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_* @@ -604,7 +1102,6 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.jetty.io_* %{_libdir}/%{name}/plugins/org.eclipse.jetty.security_* %{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.initializer_* %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_* %{_libdir}/%{name}/plugins/org.eclipse.cvs_* %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_* @@ -661,10 +1158,34 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.sat4j.pb_* %{_libdir}/%{name}/plugins/org.w3c.css.sac_* %{_libdir}/%{name}/plugins/org.w3c.dom.svg_* -%{_libdir}/%{name}/plugins/org.eclipse.emf.common_* -%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_* -%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_* -%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_* +%{_libdir}/%{name}/plugins/org.eclipse.core.commands_* +%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_* +%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_* +%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_* +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_* +%{_libdir}/%{name}/plugins/org.eclipse.help_* +%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_* +%{_libdir}/%{name}/plugins/org.eclipse.jface_* +%{_libdir}/%{name}/plugins/org.eclipse.rcp_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_* +%{_libdir}/%{name}/plugins/org.eclipse.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_* +%{_libdir}/%{name}/readme/readme_eclipse.html # Put this in -platform since we're putting the p2 stuff here %{_libdir}/%{name}/artifacts.xml # FIXME: should we ship content.xml for the platform? @@ -698,6 +1219,9 @@ rm -rf %{_bindir}/efj/ %{_mavendepmapfragdir}/%{name}-equinox-osgi %changelog +* Tue Aug 21 2012 Krzysztof Daniel 1:4.2.0-9 +- Adopt upstream CBI system. + * Tue Aug 14 2012 Krzysztof Daniel 1:4.2.0-8 - Symlink emf bundles. diff --git a/efj.sh b/efj.sh new file mode 100755 index 0000000..9e68076 --- /dev/null +++ b/efj.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +java -cp @LAUNCHER@ org.eclipse.core.launcher.Main \ + -application org.eclipse.jdt.core.JavaCodeFormatter \ + ${1+"$@"} diff --git a/extract_patterns.txt b/extract_patterns.txt new file mode 100644 index 0000000..8e0dff8 --- /dev/null +++ b/extract_patterns.txt @@ -0,0 +1 @@ +.* = *.so \ No newline at end of file diff --git a/get-eclipse.sh b/get-eclipse.sh new file mode 100755 index 0000000..484e22d --- /dev/null +++ b/get-eclipse.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +rm -rf R4_platform-aggregator + +git clone -b Juno_RC4_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator + +find . -type d -name ".git" -exec rm -rf {} \; + +find . -type f -name "*.class" -exec rm -rf {} \; + +find . -name *.jar -exec rm -rf {} \; + +find . -type f -name *.so -exec rm -rf {} \; + +tar cjf eclipse-source.tar.bz R4_platform-aggregator diff --git a/initializer.pom.xml b/initializer.pom.xml new file mode 100644 index 0000000..68c53f3 --- /dev/null +++ b/initializer.pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + rt.equinox.incubator + org.eclipse.equinox.framework + 3.8.0-SNAPSHOT + ../../.. + + org.eclipse.equinox.framework + org.eclipse.equinox.initializer + 1.0.0-SNAPSHOT + eclipse-plugin + + + + + + org.eclipse.tycho + target-platform-configuration + + + + + eclipse-plugin + org.eclipse.core.runtime + [2,5) + + + + + + + + diff --git a/lucene-3.6-compile.patch b/lucene-3.6-compile.patch index d4fe21c..dea6868 100644 --- a/lucene-3.6-compile.patch +++ b/lucene-3.6-compile.patch @@ -1,5 +1,5 @@ ---- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300 -+++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300 +--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300 ++++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300 @@ -95,4 +95,8 @@ public final class WordTokenStream exten return tokens.get(token++); diff --git a/pre360changelog.txt b/pre360changelog.txt deleted file mode 100644 index 4dab096..0000000 --- a/pre360changelog.txt +++ /dev/null @@ -1,1836 +0,0 @@ -* Thu Jul 08 2010 Alexander Kurtakov 1:3.5.2-10 -- Rebuild for new jetty. - -* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-9 -- Fix typo in symlinking. - -* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-8 -- No need to link jasper. - -* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-7 -- Fix servlet and jsp apis symlinks. - -* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-6 -- Fix jetty symlinks. - -* Thu Jun 10 2010 Andrew Overholt 1:3.5.2-5 -- Move hamcrest to dropins/jdt (rhbz#601059). -- Re-symlink after provisioning (rhbz#602865). - -* Mon Apr 12 2010 Andrew Overholt 1:3.5.2-4 -- Rebuild to pick up new xulrunner. - -* Fri Mar 19 2010 Alexander Kurtakov 1:3.5.2-3 -- Use eclipse-build 0.5.0 release. - -* Mon Mar 8 2010 Alexander Kurtakov 1:3.5.2-2 -- Fix multilib install. - -* Sun Mar 7 2010 Alexander Kurtakov 1:3.5.2-1 -- Update to 3.5.2. - -* Thu Jan 07 2010 Andrew Overholt 1:3.5.1-28 -- Version Provides for "eclipse" and "eclipse-sdk" (-pde). - -* Tue Dec 22 2009 Andrew Overholt 1:3.5.1-27 -- Fix patch application. - -* Tue Dec 22 2009 Andrew Overholt 1:3.5.1-26 -- Backport eclipse-build patch for e.o#291128. - -* Tue Dec 15 2009 Alexander Kurtakov 1:3.5.1-25 -- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins). - -* Fri Dec 4 2009 Alexander Kurtakov 1:3.5.1-24 -- Replace gecko BR/Rs with xulrunner. -- Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel. - -* Thu Dec 3 2009 Alexander Kurtakov 1:3.5.1-23 -- Remove old manipulations to bundles.info. -- Update to eclipse-build 0.4 release. - -* Mon Nov 30 2009 Andrew Overholt 1:3.5.1-22 -- Move ant-nodeps out of bootstrap. - -* Tue Nov 17 2009 Andrew Overholt 1:3.5.1-21 -- Fix typo in memory settings. - -* Tue Nov 17 2009 Alexander Kurtakov 1:3.5.1-20 -- Fix ppc64 swt jar version. - -* Mon Nov 16 2009 Andrew Overholt 1:3.5.1-19 -- Temporarily patch for e.o#294877. -- Fix some whitespace. - -* Fri Nov 13 2009 Alexander Kurtakov 1:3.5.1-18 -- No about files on ppc64 too. - -* Wed Nov 11 2009 Alexander Kurtakov 1:3.5.1-17 -- Update to eclipse-build 0.4 RC4 (fixes pdebuild escaping). - -* Tue Nov 10 2009 Alexander Kurtakov 1:3.5.1-16 -- Specify -DbuildArch when running ant applyPatches. - -* Tue Nov 10 2009 Alexander Kurtakov 1:3.5.1-15 -- Update to eclipse-build 0.4 RC3. - -* Fri Nov 10 2009 Alexander Kurtakov 1:3.5.1-14 -- Fix build with commons-codec 1.4. - -* Fri Oct 30 2009 Andrew Overholt 1:3.5.1-13 -- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395). - -* Mon Oct 26 2009 Andrew Overholt 1:3.5.1-12 -- Remove old TODO items. - -* Fri Oct 23 2009 Alexander Kurtakov 1:3.5.1-12 -- No need to invoke desktop-file-install, it's handled by e-b install now. - -* Thu Oct 22 2009 Alexander Kurtakov 1:3.5.1-11 -- Remove ppc64 files copying and sedding. Supported by eclipse-build now. - -* Tue Oct 20 2009 Alexander Kurtakov 1:3.5.1-10 -- Remove old/not needed BR/Rs. - -* Mon Oct 19 2009 Alexander Kurtakov 1:3.5.1-9 -- New e-b snapshot that contains fragments for ppc64. - -* Thu Oct 15 2009 Alexander Kurtakov 1:3.5.1-8 -- Add bootstrap flag. - -* Mon Oct 12 2009 Alexander Kurtakov 1:3.5.1-7 -- Put back JAVA_HOME. - -* Mon Oct 12 2009 Alexander Kurtakov 1:3.5.1-6 -- New eclipse-build snapshot. Pdebuild and ecf compilation are part of it. - -* Thu Oct 8 2009 Alexander Kurtakov 1:3.5.1-5 -- Fix install call. - -* Thu Oct 8 2009 Alexander Kurtakov 1:3.5.1-4 -- New eclipse-build snapshot. Remove parts included in it. - -* Wed Oct 07 2009 Andrew Overholt 1:3.5.1-3 -- Add patch for bugs.eclipse.org/287307 - -* Mon Oct 5 2009 Alexander Kurtakov 1:3.5.1-2 -- Add /usr/share/eclipse/dropins to dropins locations. - -* Fri Oct 2 2009 Alexander Kurtakov 1:3.5.1-1 -- Update to 3.5.1. - -* Tue Sep 29 2009 Alexander Kurtakov 1:3.5.0-4 -- Symlink to unversioned jetty jars. - -* Tue Sep 29 2009 Alexander Kurtakov 1:3.5.0-3 -- Build with eclipse-build 0.4.0 RC0. - -* Wed Sep 23 2009 Andrew Overholt 1:3.5.0-2 -- Move jakarta-commons-codec requirement from jdt to platform. - -* Tue Sep 22 2009 Alexander Kurtakov 1:3.5.0-1 -- Fix help toolbar jsp problem. - -* Fri Sep 18 2009 Alexander Kurtakov 1:3.5.0-0.13 -- Update ecf-filetransfer and build it. - -* Tue Sep 15 2009 Alexander Kurtakov 1:3.5.0-0.12 -- Build with system jetty. - -* Mon Sep 14 2009 Andrew Overholt 1:3.5.0-0.11 -- Add /usr/share/eclipse/dropins to list of dropins locations - (rhbz#522117). - -* Wed Sep 09 2009 Mat Booth 1:3.5.0-0.10 -- Patch the target platform templates so they find all the required - source bundles (see RHBZ # 521969). - -* Mon Aug 31 2009 Alexander Kurtakov 1:3.5.0-0.9 -- Remove all testframework sources, patches, build and etc. - -* Tue Aug 18 2009 Alexander Kurtakov 1:3.5.0-0.8 -- Use system hamcrest. - -* Mon Aug 17 2009 Alexander Kurtakov 1:3.5.0-0.7 -- Use o.e.equinox.initializer from SOURCE1 instead of separate one. - -* Fri Aug 14 2009 Alexander Kurtakov 1:3.5.0-0.6 -- Do not use the provided eclipse.ini but the one from build. - -* Thu Aug 13 2009 Alexander Kurtakov 1:3.5.0-0.5 -- Add epoch to icu4j Requires/BuildRequires. - -* Tue Aug 11 2009 Alexander Kurtakov 1:3.5.0-0.4.0 -- Fix sources url. -- Make it use system icu4j and sat4j. - -* Fri Aug 7 2009 Alexander Kurtakov 1:3.5.0-0.3.35 -- Another missing ppc64 fragment. - -* Fri Aug 7 2009 Alexander Kurtakov 1:3.5.0-0.3.34 -- Fix missing fragment on ppc64. - -* Thu Aug 6 2009 Alexander Kurtakov 1:3.5.0-0.3.33 -- Fix missing launcher for ppc64. - -* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.32 -- Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64. - -* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.31 -- Revert initialize call path changes. - -* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.30 -- Additional output to debug ppc64 build failures. - -* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.29 -- Reenable initialize. -- Fix paths in initializer call. - -* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.28 -- Disable initialize. - -* Tue Aug 4 2009 Alexander Kurtakov 1:3.5.0-0.3.27 -- No need to copy eclipse.ini for secondary archs. - -* Tue Aug 4 2009 Alexander Kurtakov 1:3.5.0-0.3.26 -- eclipse/about_files are not installed on ppc for some reason. - -* Mon Aug 3 2009 Alexander Kurtakov 1:3.5.0-0.3.25 -- Swith to eclipse-build for building. - -* Fri Jul 24 2009 Fedora Release Engineering - 1:3.5.0-0.3.9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jun 17 2009 Alexander Kurtakov 1:3.5.0-0.2.9 -- Fix package-build template to add target for -Dconfigs. - -* Tue May 19 2009 Andrew Overholt 1:3.5.0-0.2.8 -- Remove Fedora branding. - -* Thu May 7 2009 Andrew Overholt 1:3.5.0-0.2.7 -- Update patch to tests' library.xml to allow for easy debugging of tests. - -* Wed Apr 29 2009 Alexander Kurtakov 1:3.5.0-0.2.6 -- Fix initializer run (sed again). - -* Wed Apr 29 2009 Alexander Kurtakov 1:3.5.0-0.2.5 -- Bump tomcat6 BR. -- Fix director run to not require sed on bundles.info. - -* Wed Apr 22 2009 Alexander Kurtakov 1:3.5.0-0.2.4 -- Update to newer I-build. -- Update fedora customization. -- Bump dependencies minimal versions. -- Fix update site functionality. -- Simplify jdt %%files section. - -* Tue Apr 14 2009 Alexander Kurtakov 1:3.5.0-0.2.3 -- Rediff patch30. - -* Tue Apr 14 2009 Alexander Kurtakov 1:3.5.0-0.2.2 -- Fix version of source bundles. - -* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.2.1 -- Create org.eclipse.swt.gtk.linux.* based on the ppc version. - -* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.2 -- Remove patches for the ecj package and others already applied upstream. -- Rediff some ppc64 patches. - -* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.12 -- o.e.update.core.linux is x86 only. - -* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.11 -- Remove more p2 generated files. - -* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.10 -- Do not install p2 generatad file. - -* Fri Apr 10 2009 Alexander Kurtakov 1:3.5.0-0.1.9 -- BR/R jakarta-commons-codec and jakarta-commons-httpclient. - -* Thu Apr 9 2009 Alexander Kurtakov 1:3.5.0-0.1.8 -- Add patch for xulrunner compilation. - -* Tue Apr 7 2009 Alexander Kurtakov 1:3.5.0-0.1.7 -- Fix patch name. - -* Thu Apr 2 2009 Alexander Kurtakov 1:3.5.0-0.1.6 -- First try for 3.5 build. - -* Mon Mar 30 2009 Dennis Gilmore 1:3.4.2-6 -- base sparcv9 and sparc on ppc - -* Fri Mar 20 2009 Alexander Kurtakov 1:3.4.2-5 -- Disable XULRunner-specific patch. -- Make pdebuild script to not generate p2 repo. - -* Mon Mar 16 2009 Andrew Overholt 1:3.4.2-4 -- Build with XULRunner-specific flags since we're building against XULRunner. - -* Mon Mar 9 2009 Andrew Overholt 1:3.4.2-3 -- Remove ecj sub-package as it is replaced by standalone ecj package. - -* Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-2 -- Strict R/BR for sat4j >= 2.0.3. - -* Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-1 -- Update to 3.4.2. - -* Tue Feb 24 2009 Fedora Release Engineering - 1:3.4.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 4 2009 Alexander Kurtakov 1:3.4.1-15 -- Rebuild for new xulrunner. - -* Fri Jan 23 2009 Andrew Overholt 1:3.4.1-14 -- Add R:java-devel for -jdt (rh#480979). - -* Mon Jan 19 2009 Alexander Kurtakov 1:3.4.1-13 -- Fix pdebuild to auto-set javacSouce based on BREE. - -* Fri Dec 19 2008 Andrew Overholt 1:3.4.1-12 -- Fixed GCJ AOT compilation (Gary Benson). - -* Mon Dec 15 2008 Andrew Overholt 1:3.4.1-11 -- Update pdebuild and package-build patch to include -z option. -- Make ecj default to 1.5 (rh#354721). -- Add GCJ AOT bits for ecj (rh#473674). - -* Fri Dec 5 2008 Andrew Overholt 1:3.4.1-10 -- Remove MaxPermSize from sysproperty lists in library.xml as it was causing the - JVM to not start. - -* Thu Dec 4 2008 Andrew Overholt 1:3.4.1-8 -- Increase MaxPermSize when running tests. - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1:3.4.1-8 -- Rebuild for Python 2.6 - -* Thu Nov 20 2008 Andrew Overholt 3.4.1-7 -- Update and re-enable patch for always generating debuginfo for class files - when doing an RPM build. -- Resolves rh#472292. - -* Mon Oct 27 2008 Andrew Overholt 3.4.1-6 -- Keep Provides: eclipse on -pde (different than Fedora 9 but probably - more correct). - -* Thu Oct 23 2008 Alexander Kurtakov 3.4.1-5 -- Fix splashscreen (#467259). - -* Fri Oct 17 2008 Andrew Overholt 3.4.1-4 -- Fix quoting bug in pdebuild.sh again. - -* Fri Oct 16 2008 Alexander Kurtakov 3.4.1-3 -- Fix swt symlinks in %%libdir/eclipse. - -* Thu Oct 16 2008 Alexander Kurtakov 3.4.1-2 -- Fix quoting bug in pdebuild.sh. - -* Wed Oct 16 2008 Alexander Kurtakov 3.4.1-1 -- Move copy-platform instead of copying it. - -* Wed Oct 15 2008 Andrew Overholt 3.4.1-1 -- Add conditionals around Equinox initialization to enable debugging. - -* Fri Oct 13 2008 Alexander Kurtakov 3.4.1-1 -- Symlink to ant-apache-bsf and ant-commons-net. -- Update branding. -- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008). -- Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt) -- Resolves #466476. Fix pdebuild script. (Jeff Johnston) -- Remove dropins contents while running initializer. -- Add patch for wrong javaHome on x86_64 in the native build.(Alexander Kurtakov) - -* Thu Oct 03 2008 Alexander Kurtakov 3.4.1-0 -- 3.4.1 -- Update nojarsignatures patch. -- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan). -- Removed patches 33 and 34 - not needed anymore. - -* Thu Sep 25 2008 Michal Nowak 3.4.0-24 -- exclude parts of eclipse-pydev from JIT compilation -- Resolves: bug 461860 - -* Tue Sep 02 2008 Andrew Overholt 3.4.0-23 -- Use icu4j in its new place. - -* Wed Aug 27 2008 Andrew Overholt 3.4.0-22 -- Add test framework -- Remove two duplicate lines in eclipse-mv-Platform.sh -- Modify package-build and pdebuild so they can build the SDK tests - -* Wed Aug 13 2008 Andrew Overholt 3.4.0-21 -- Fix ecj-gcj (rhbz#458921) - -* Tue Aug 12 2008 Andrew Overholt 3.4.0-20 -- Require release of jetty which requires tomcat bits with proper metadata -- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov) -- Add version to jakarta-commons-el requirement - -* Mon Aug 11 2008 Andrew Overholt 3.4.0-19 -- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which - makes dropins reconciler see them as dropins and not extension - locations -- Add versions to jetty, lucene, and jsch Requires - -* Thu Aug 07 2008 Andrew Overholt 3.4.0-18 -- Add %%{_libdir}/eclipse/dropins/jdt to ecj files list - -* Wed Aug 06 2008 Andrew Overholt 3.4.0-17 -- Add p2 metadata generation to pdebuild -- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in - copy-platform -- Fix brightness in splash screen -- Fix icon symlinks -- Bump icu4j-eclipse requirement - -* Tue Aug 05 2008 Andrew Overholt 3.4.0-16 -- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini -- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency -- Update copy-platform to add %%{_datadir}/dropins - -* Mon Aug 04 2008 Sean Flanigan 3.4.0-15 -- Removed buildroot from path in datadir.link - -* Mon Aug 04 2008 Sean Flanigan 3.4.0-14 -- Created missing directory for link file - -* Fri Aug 01 2008 Andrew Overholt 3.4.0-13 -- Update patch to avoid Hotspot crashing -- Add links folder for noarch plugins -- Create and add ownership of %%{_datadir}/eclipse/{plugins,features} - -* Thu Jul 31 2008 Andrew Overholt 3.4.0-12 -- Set product to Fedora Eclipse -- Remove pde-runtime %%package section -- Remove unnecessary Requires(post,postun)s - -* Wed Jul 30 2008 Andrew Overholt 3.4.0-11 -- Update copy-platform to work with dropins -- Update JVM-crashing patch - -* Mon Jul 28 2008 Andrew Overholt 3.4.0-10 -- Move JDT and PDE/SDK bits to dropins/{jdt,sdk} -- Drop versionless PDE Build symlink (put logic into pdebuild script) -- Make SWT JAR symlinks relative -- Fold pde-runtime into pde -- Add patch to add root files for non-upstream arches -- Fix building of fragments for non-upstream arches -- Remove about.html from files list on ppc (will fix later) - -* Fri Jul 25 2008 Andrew Overholt 3.4.0-10 -- Add ability for pdebuild (-o) to work with Orbit-style dependencies - -* Fri Jul 25 2008 Andrew Overholt 3.4.0-9 -- Collapse patches to build SWT native bits into two -- Copy about* from x86 to all non-x86{_64} platforms - -* Wed Jul 23 2008 Andrew Overholt 3.4.0-8 -- Don't build for arch/ws/os combos other than the one on which we're - building - -* Wed Jul 23 2008 Andrew Overholt 3.4.0-7 -- More work on non-upstream arches - -* Mon Jul 21 2008 Andrew Overholt 3.4.0-6 -- Update description to be a bit more current -- Attempt ppc64, etc. builds - -* Mon Jul 21 2008 Andrew Overholt 3.4.0-5 -- Add core.net fragment in %%files for x86 -- I spoke with author about above and no .so is built because it is - currently not used by the fragment -- Update ecj-gcj addition (Tom Tromey) - -* Fri Jul 18 2008 Andrew Overholt 3.4.0-4 -- Un-do crazy config.ini, bundles.info, etc. shuffling -- Update patch for building native libraries -- Re-add missing BR on tomcat5-jasper-eclipse -- Add patch for 64-bit platforms to build SWT -- Don't try to resolve http://bundles.osgi.org for javadocs -- Provision with java -cp instead of binary launcher - -* Thu Jul 17 2008 Andrew Overholt 3.4.0-3 -- Generate metadata and provision each sub-package -- Do crazy config.ini, bundles.info, and *.profile shuffling -- Add post and postun sections to update the config.ini, bundles.info, and - *.profile files - -* Wed Jul 16 2008 Andrew Overholt 3.4.0-1 -- Fix files lists - -* Wed Jul 16 2008 Andrew Overholt 3.4.0-1 -- Update branding -- Fix p2 stuff so p2 UI works - -* Mon Jul 14 2008 Andrew Overholt 3.4.0-1 -- 3.4 -- Remove gcj compilation -- Update versions of dependencies -- Rename libswt3-gtk2 to eclipse-swt -- Move "Provides: eclipse" to PDE from JDT -- Remove unnecessary old Obsoletes/Provides -- Remove tomcat stuff since it's no longer used -- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse -- Add BRs/Rs on objectweb-asm and sat4j -- Build ECF filetransfer stuff as part of this SRPM until we have a - separate eclipse-ecf package (which will require this version of the - SDK) - -* Sat Jun 14 2008 Dennis Gilmore 3.3.2-13 -- make changes to support sparcv9 - -* Wed May 14 2008 Andrew Overholt 3.3.2-12 -- Back-port patch for e.o#206432 (rh#446064). - -* Sat Apr 26 2008 Mat Booth 3.3.2-11 -- Fixed some benign errors in copy-platform when calling pdebuild - multiple times. - -* Fri Apr 25 2008 Andrew Overholt 3.3.2-10 -- Bump maximum heap size from 256 MB to 512 MB. -- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092 - (which is really - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100). -- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner - patch. - -* Wed Apr 09 2008 Andrew Overholt 3.3.2-9 -- Fix patch level for xulrunner build patch. - -* Wed Apr 09 2008 Andrew Overholt 3.3.2-8 -- Rather than removing java-javadoc, just add Requirement in all cases - (gcj or not). - -* Wed Apr 09 2008 Andrew Overholt 3.3.2-7 -- Remove explicit java-javadoc requirements as OpenJDK's -devel package - provides it. -- Patch SWT build to find libxul.pc. - -* Fri Apr 04 2008 Andrew Overholt 3.3.2-6 -- Fix path of pdebuild in %%files. Gah. - -* Fri Apr 04 2008 Andrew Overholt 3.3.2-5 -- Move pdebuild to better location (buildscripts). - -* Fri Apr 04 2008 Andrew Overholt 3.3.2-4 -- Fix SWT version in Requires. - -* Thu Apr 03 2008 Andrew Overholt 3.3.2-3 -- Add missing line continuation. - -* Thu Apr 03 2008 Andrew Overholt 3.3.2-2 -- Change ecj Provides from <= to = (rhbz#439825). - -* Thu Apr 03 2008 Andrew Overholt 3.3.2-1 -- 3.3.2 -- Update Obsoletes/Provides for ecj and make more ecj symlinks - (rhbz#439825). - -* Mon Mar 31 2008 Andrew Overholt 3.3.1.1-18 -- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for - packaging guidelines. - -* Mon Mar 03 2008 Andrew Overholt 3.3.1.1-17 -- Mark eclipse.ini as %%config. - -* Tue Feb 19 2008 Fedora Release Engineering - 1:3.3.1.1-16 -- Autorebuild for GCC 4.3 - -* Fri Feb 08 2008 Andrew Overholt 3.3.1.1-15 -- Add ia64 patches from Doug Chapman. -- rhbz#431963. - -* Wed Dec 05 2007 Martin Stransky 3.3.1.1-14 -- rebuilt against XUL Runner (gecko-libs 1.9) -- removed .png extension from the desktop file - -* Tue Dec 04 2007 Andrew Overholt 3.3.1.1-13 -- Remove Fedora log from splash screen. - -* Mon Dec 03 2007 Andrew Overholt 3.3.1.1-12 -- Update splash screen. - -* Fri Nov 30 2007 Andrew Overholt 3.3.1.1-11 -- Fix PermSize option (thanks to Mary Ellen Foster for testing). - -* Fri Nov 23 2007 Andrew Overholt 3.3.1.1-10 -- Move eclipse.ini for real. - -* Fri Nov 23 2007 Andrew Overholt 3.3.1.1-9 -- Move eclipse.ini in %%files section. - -* Thu Nov 22 2007 Andrew Overholt 3.3.1.1-8 -- Re-enable gcj_support. - -* Thu Nov 22 2007 Andrew Overholt 3.3.1.1-7 -- Un-break non-ppc64 platforms. - -* Mon Nov 19 2007 Andrew Overholt 3.3.1.1-6 -- Require jpackage-utils (courtesy Patrice Dumas). -- Fix ppc64 (and hopefully other unsupported-by-upstream arches). -- Move eclipse.ini to %%{_libdir}/eclipse where it gets read. -- Resolves: rhbz#394161. - -* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-5 -- Remove extraneous build.index comment (from test build again). - -* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-4 -- Enable gcj support (disabled for test build). - -* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-3 -- Update tomcat patches. -- Resolves: rhbz#380121. - -* Wed Nov 14 2007 Andrew Overholt 3.3.1.1-2 -- Bump release to tag non-corrupted source zip. - -* Thu Nov 01 2007 Andrew Overholt 3.3.1.1-1 -- Update branding. -- Work around e.o#195897 by setting the VM arg explicitly. - -* Fri Oct 26 2007 Andrew Overholt 3.3.1.1-1 -- 3.3.1.1 -- Add patch for memory issues with IcedTea. - -* Mon Oct 22 2007 Andrew Overholt 3.3.1-1 -- 3.3.1 -- Update icu4j requirement for new version number. - -* Thu Oct 11 2007 Andrew Overholt 3.3.0-27 -- Add patch to have unversioned swt.jar symlink (courtesy Patrice - Dumas). - -* Sat Oct 06 2007 Andrew Overholt 3.3.0-26 -- Add encoding to desktop file. -- Fix %%files list again. - -* Fri Oct 05 2007 Andrew Overholt 3.3.0-25 -- Fix %%files list for Fedora Eclipse feature. - -* Fri Oct 05 2007 Andrew Overholt 3.3.0-24 -- Update branding plugin. -- Add branding feature. This fixes the update manager issue when using - the Fedora-branded product. -- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track - down this issue. - -* Wed Oct 03 2007 Andrew Overholt 3.3.0-23 -- Build gcj bits on x86 and x86_64. -- Add instructions for how to get source of branding plugin. -- Fix splash screen typo. -- Resolves: rhbz#301871. - -* Wed Sep 26 2007 Andrew Overholt 3.3.0-21 -- Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier - Thomann) -- Resolves: rhbz#288991. - -* Tue Sep 18 2007 Andrew Overholt 3.3.0-20 -- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml. - -* Mon Sep 10 2007 Andrew Overholt 3.3.0-19 -- Don't require subclipse, cdt, or rpm-editor on ppc64. - -* Fri Sep 07 2007 Ben Konrath 3.3.0-18 -- Build 1.6 plugins when building with IcedTea. - -* Fri Sep 07 2007 Ben Konrath 3.3.0-17 -- Update Fedora Eclipse product plugin to fix Welcome page. - -* Thu Sep 06 2007 Ben Konrath 3.3.0-16 -- Compile SDK to 1.5 bytecode and disable 1.6 plugins. - -* Wed Sep 05 2007 Andrew Overholt 3.3.0-15 -- Update tomcat5, commons-el, and commons-logging to required releases - with proper OSGi manifests. - -* Mon Sep 04 2007 Ben Konrath 3.3.0-14 -- Add Fedora Eclipse product plugin. -- Add Requires: eclipse-rpm-editor to platform subpackage. - -* Thu Aug 30 2007 Ben Konrath 3.3.0-13 -- Move *-sdk subpackages to pde subpackage. -- Add BuildRequires: libXt-devel for IcedTea build. -- Add launcher-fix-java-home.patch. - -* Tue Aug 28 2007 Ben Konrath 3.3.0-12 -- Require mylyn on all archs except ppc64 alpha. -- Use IcedTea on x86_64 and x86. -- Remove hacks for s390{,x} as they are now included in upstream build. - -* Tue Aug 28 2007 Andrew Overholt 3.3.0-11 -- Symlink to jetty. - -* Tue Aug 28 2007 Ben Konrath 3.3.0-10 -- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn, - eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac - and eclipse-changelog to platform package. -- Add requires eclipse-mylyn-java to jdt. -- Add requires eclipse-mylyn-pde to pde. -- Remove pde-sdk and sdk sub-packages - -* Thu Aug 23 2007 Ben Konrath 3.3.0-9 -- Add Requires: eclipse-cvs-client to jdt package. - -* Tue Aug 14 2007 Ben Konrath 3.3.0-8 -- Link to junit4 jar. -- Remove included eclipse binaries. -- Add Provides: eclipse to sdk subpackage. - -* Mon Aug 13 2007 Oliver Falk 3.3.0-7 -- Also explode SDK tarball on alpha -- Resolves: #251958 - -* Tue Aug 07 2007 Ben Konrath 3.3.0-6 -- Add links for jsp api, servlet api and jasper. -- Add %%{_libdir}/%%{name}/features to the rcp %%files listing. - -* Fri Aug 03 2007 Ben Konrath 3.3.0-5 -- Add patch to fix double free bug in launcher library. -- Resolves: #248798. - -* Tue Jul 31 2007 Ben Konrath 3.3.0-4 -- Link to commons-el.jar. -- Remove ant 1.7 hacks. - -* Wed Jul 18 2007 Ben Konrath 3.3.0-3 -- Add links for lucene and lucene.analysis. -- Remove icu4j symlink from /usr/share/eclipse/plugins. -- Resolves: #248749. - -* Mon Jul 16 2007 Ben Konrath 3.3.0-2 -- Fix dep in rcp sub-package. -- Add Alpha support. -- Link to commons-logging.jar -- Resolves: #248359. - -* Fri Jun 29 2007 Ben Konrath 3.3.0-1 -- 3.3. - -* Wed Jun 27 2007 Ben Konrath 3.3.0-0.3.RC4 -- Restore ppc64, s390{,x} and sparc{,64} support. -- Restore multilib support. - -* Tue Jun 19 2007 Ben Konrath 3.3.0-0.2.RC4 -- Use icu4j-eclipse sub-package instead of building icu4j here. -- Use exec in binary wrapper. -- Add 3.3.0 splashscreen. - -* Tue Jun 12 2007 Ben Konrath 3.3.0-0.1.RC4 -- 3.3RC4. - -* Mon Jun 11 2007 Ben Konrath 3.3.0-0.2.RC3 -- Update launching strategy for 3.3. -- Pull in package-build fix from F-7. - -* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC3 -- 3.3RC3. - -* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC2 -- 3.3RC2. - -* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC1 -- 3.3RC1. -- Pull in changes from F-7. - -* Mon Feb 26 2007 Ben Konrath 3.3.0-0.1.M5eh -- 3.3M5. -- Remove launcher-addplatformtotildeeclipse.patch as it's only needed - for FC-5 -> FC-6. -- Remove swt firefox patches as they are no longer needed. -- Remove ppc64, s390{,x} and sparc{,64} support. -- Remove use-built-launcher patch. -- Update set-launcher-and-configuration-dir patch. - -* Mon Jan 29 2007 Ben Konrath 3.3.0-0.3.M4 -- Enable updated ecj square brackets patch. - -* Fri Jan 12 2007 Ben Konrath 3.3.0-0.2.M4 -- Pull in fixes from rawhide. - -* Wed Dec 20 2006 Ben Konrath 3.3.0-0.1.M4 -- 3.3M4. -- Update patches for 3.3M4. -- Remove SWT JNI symlinks in %%{_libdir}. - -* Wed Dec 6 2006 Ben Konrath 3.2.1-25 -- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2. -- Resolves: #211008. - -* Tue Dec 5 2006 Andrew Overholt 3.2.1-24 -- Specfile review with Ben Konrath. -- Lots of cleanups. - -* Tue Nov 28 2006 Andrew Overholt 3.2.1-23 -- Move back to ~/.eclipse for update site pending upstream comments. -- Add patch to add platform to ~/.eclipse's platform.xml. This maintains - user-installed plugins but allows us to remove the pre-configured - platform.xml in the OSGi configuration area. - -* Mon Nov 20 2006 Andrew Overholt 3.2.1-22 -- Use ~/.eclipseplugins instead of ~/.eclipse in update site - homedir patch. -- Bump release. - -* Fri Nov 17 2006 Ben Konrath 3.2.1-21 -- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853). -- Resolves: #209393. - -* Fri Nov 17 2006 Andrew Overholt 3.2.1-20 -- Revise gre64 patch to just do ppc64 addition and not ordering change. - -* Thu Nov 16 2006 Andrew Overholt 3.2.1-19 -- Add patch to look at gre64.conf on ppc64. - -* Fri Nov 10 2006 Ben Konrath 3.2.1-18 -- Remove SWT ON_TOP patch as it is fixed in 3.2.1. - -* Thu Nov 09 2006 Ben Konrath 3.2.1-17 -- Add file level requirement for swt fragment to rcp and platform packages. - This is needed so that the rcp and platform packages pull in the swt package - of the correct word size. - -* Mon Nov 06 2006 Ben Konrath 3.2.1-16 -- Move copy-platform back to %%{_datadir}/eclipse. -- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs. -- Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc - is fixed. - -* Fri Nov 03 2006 Andrew Overholt 3.2.1-15 -- Make sdk require config.ini itself rather than the package to deal with the - bi-arch installation situation. -- Move sdk feature and plugin to %%{_libdir} so we can check for its existence - in the post scripts. - -* Thu Nov 02 2006 Andrew Overholt 3.2.1-14 -- Remove post sections that munge eclipse.product; always set it to - org.eclipse.platform.ide or org.eclipse.sdk.ide. -- Remove changelogs prior to 3.2.0. - -* Thu Nov 02 2006 Ben Konrath 3.2.1-12 -- Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being - generated differently on different arches. -- Fix multilib problem when there are two or more jars within a jar. -- BR dos2unix always (for mac2unix). - -* Wed Nov 01 2006 Ben Konrath 3.2.1-11 -- Move copy-platform to %%{_libdir}/eclipse -- Move the platform.source, icu4j, icu4j.source, help.webapp and - update.core.linux plugins to %%{_libdir}/eclipse/plugins because these plugins - have platform specific content. Some of the platform specific content may be - a result of bugs in libgcj. These need to be investigated. -- Disable building the help indexes on all archs so that we have the same doc - plugins on all archs. -- Remove org.apache.ant_1.6.5/bin/runant.py to avoid multilib conflicts. -- Repack all the jars and the jars within those jars. This is needed - to make this package multilib compatible. -- Put SWT symlinks in %%{_libdir}/eclipse instead of - %%{_libdir}/eclipse/plugins. - -* Wed Nov 01 2006 Andrew Overholt 3.2.1-11 -- Use equinox initializer instead of old patch to core.runtime. -- Run initializer *after* splitting install into arch-specific and - arch-independent locations. -- Move copy-platform to arch-specific location. -- Get rid of broken symlinks in tomcat plugin. - -* Tue Oct 31 2006 Andrew Overholt 3.2.1-11 -- Fix copy-platform to work with split install. - -* Tue Oct 31 2006 Ben Konrath 3.2.1-10 -- Add 3.2.1 splash screen. -- Sort the java source files before building (#209249). -- Remove Fedora ifdefs. -- Resolves: #209249. - -* Tue Oct 31 2006 Ben Konrath 3.2.1-9 -- Re-enable building of the icu4j plugins. - -* Mon Oct 30 2006 Ben Konrath 3.2.1-8 -- Temporarily disable building of icu4j plugin. - -* Mon Oct 30 2006 Andrew Overholt 3.2.1-8 -- Fix eclipse-ecj symlink to point to correct location. -- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're - target-dependent. - -* Sat Oct 28 2006 Ben Konrath 3.2.1-7 -- Add patch for ecj [] classpath problem. -- Remove configuration files from rcp files list. -- Add patch set bindir and shared config patch to allow the eclipse binary - to sit in %%{_bindir} and remove the symlinks. This patch also allows us to - set osgi.sharedConfiguration.area config on a per build basis so that the - configuration directory can be arch dependant. -- Remove launcher link patch as the bindir patch removes the requirement for - this patch. -- Don't aot-compile org.eclipse.ui.ide to work around rh bug # 175547. -- Add Requies(post,postun) to all packages to ensure that no files are left - behind when eclipse is un-installed. -- Many spec file clean ups. -- Resolves: #199961, #202585, #210764, #207016. -- Related: #175547. - -* Mon Oct 16 2006 Andrew Overholt 3.2.1-6 -- Remove unneeded tomcat symlinks. - -* Mon Oct 16 2006 Andrew Overholt 3.2.1-6 -- Remove unnecessary bits of configuration. -- Resolves: #210764, #202585. - -* Tue Oct 10 2006 Ben Konrath 3.2.1-5 -- Remove perl dependancy. -- Fix offsets in libswt-enableallandO2 patch. -- Add Requires(post,postun) java-gcj-compat to sdk to avoid errors when - uninstalling the java stack. -- Move jface and jface.databinding from libswt3-gtk2 to rcp because these - plugins have dependancies on some plugins in rcp. - -* Sun Oct 01 2006 Andrew Overholt 3.2.1-4 -- Fix triggerpostun to include epoch of previous releases. - -* Fri Sep 29 2006 Ben Konrath 3.2.1-3 -- Add Requires(post,postun) to platform and sdk sub-packages so that post and - postun scripts work correctly. - -* Fri Sep 29 2006 Andrew Overholt 3.2.1-3 -- Add triggerpostun to deal with old rebuild-sdk-features postun crap - (rh#207442, rh#207013). - -* Fri Sep 29 2006 Andrew Overholt 3.2.1-2 -- Fix swt-firefox patch to not create DSOs with undefined symbols (rh#201778). - -* Thu Sep 28 2006 Ben Konrath 3.2.1-1 -- 3.2.1 final. - -* Thu Sep 28 2006 Andrew Overholt 3.2.1-1 -- Use new swt-firefox patch and consolidate others into one. - -* Wed Sep 27 2006 Ben Konrath 3.2.1-0.RC.3 -- Fix typo in %%postun of -sdk and -platform. -- Disable help index generation on ia64. - -* Tue Sep 26 2006 Ben Konrath 3.2.1-0.RC.2 -- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform. - -* Mon Sep 25 2006 Ben Konrath 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 3.2.0-8 -- Remove unused eclipse.conf. -- Remove unused gre64.conf patch (applied upstream). - -* Thu Sep 21 2006 Ben Konrath 3.2.0-7 -- Use real SWT version on ia64, ppc64, s390 and s390x. -- Remove the swt native libs from the rcp sub-package because they are - already in the libswt-gtk2 sub-package and rcp requires libswt-gtk2. -- Set correct eclipse.product in post and postun of sdk and platform - sub-packages (rh bug # 207442) -- Don't set the .eclipseproduct twice. -- Add Conflicts: mozilla to libswt3-gtk2 (rh bug # 207626). -- Move Requires: firefox to libswt3-gtk2. - -* Thu Sep 21 2006 Andrew Overholt 3.2.0-7 -- Add workaround for gjdoc Mac-encoded bug (gcc#29167) to make javadocs build. -- Fix tomcat symlinking in %%install to make help work (rh#199453). - -* Mon Sep 11 2006 Ben Konrath 3.2.0-6 -- Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929). -- Re-work files list to match upstream and remove rebuild-sdk-features - (rh bug # 205933). - -* Thu Sep 07 2006 Ben Konrath 3.2.0-5 -- Add swt-firefox patch; moves SWT to NS_InitXPCOM3() from NS_InitEmbedding(). -- Add sparc support (Dennis Gilmore ). -- Disable help index generation on s390. - -* Wed Sep 06 2006 Ben Konrath 3.2.0-4 -- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because - it has not been applied upstream. -- Minor spec file clean ups. -- Add %%{name} to the -devel package Provides so that upgrading from - FC-5 to FC-6 works. -- Re-enable natively compiling the ant.ui plugin. -- Re-enable natively compiling the team.cvs.core plugin on ia64. - -* Fri Sep 01 2006 Ben Konrath 3.2.0-3 -- Use the system tomcat on ppc64 and s390x. - -* Wed Aug 30 2006 Andrew Overholt 3.2.0-3 -- Don't use pkg_summary. - -* Tue Aug 29 2006 Ben Konrath 3.2.0-2 -- Remove double Manifest file in com.jcraft.jsch_0.1.28.jar. -- Require java-gcj-compat >= 1.0.64. - -* Thu Aug 17 2006 Andrew Overholt 3.2.0-1jpp_12fc -- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility). - -* Thu Aug 10 2006 Andrew Overholt 3.2.0-1jpp_11fc -- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference - jars that don't exist. -- Fix rebuild-sdk-features to work with 3.2.x feature versions. - -* Tue Aug 01 2006 Andrew Overholt 3.2.0-1jpp_10fc -- Use firefox-devel instead of mozilla-devel. -- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags). - -* Tue Jul 25 2006 Ben Konrath 3.2.0-1jpp_9fc -- Use sed instead of patches for tomcat version numbers. - -* Sun Jul 23 2006 Ben Konrath 3.2.0-1jpp_8fc -- Disable build.index doc generation on i386. - -* Sun Jul 23 2006 Andrew Overholt 3.2.0-1jpp_7fc -- Remove org.eclipse.ant.ui* from %%files. - -* Sun Jul 23 2006 Ben Konrath 3.2.0-1jpp_7fc -- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar from aot-compile-rpm. - -* Sat Jul 22 2006 Jakub Jelinek 3.2.0-1jpp_6fc -- Rebuilt - -* Thu Jul 20 2006 Andrew Overholt 3.2.0-1jpp_5fc -- New splash screen from Diana Fong (rh#199456). - -* Tue Jul 18 2006 Andrew Overholt 3.2.0-1jpp_4fc -- Add patch from Tom Tromey for ecj-gcj branch of gcj. -- Fix SWT symlinks. - -* Tue Jul 18 2006 Igor Foox 3.2.0-1jpp_3fc -- Rebuild. - -* Mon Jul 17 2006 Ben Konrath 3.2.0-1jpp_2fc -- Rebuild. - -* Thu Jul 06 2006 Andrew Overholt 3.2.0-1jpp_1fc -- Temporarily add webapp patch for ppc64 and s390x. -- Bump tomcat5 to 5.5.17 both in BR/R and in patches. - -* Wed Jul 05 2006 Andrew Overholt 3.2.0-1jpp_1fc -- Don't require tomcat on ppc64, s390, or s390x until we've got it there. -- org.eclipse.tomcat -> org.eclipse.tomcat/lib. -- Update webapp build patch. -- Use commons-* instead of jakarta-commons-*. -- Don't delete jars in %%install. -- Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now). -- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64. -- Use tomcat plugin version instead of org.eclipse.tomcat_*. - -* Tue Jul 04 2006 Ben Konrath 3.2.0-1jpp_1fc -- Fix tomcat symlinks. - -* Tue Jul 04 2006 Andrew Overholt 3.2.0-1jpp_1fc -- 3.2.0. -- Remove Provides: eclipse-sdk from eclipse-platform. -- Use build-jar-repository where appropriate. - -* Tue Jun 13 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.7 -- Rename -devel packages to -sdk to match upstream names. -- Add Provides eclipse-sdk to platform-sdk. -- Remove zip re-pack code. - -* Mon Jun 12 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.6 -- Bump release again. - -* Mon Jun 12 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.5 -- Bump release. - -* Mon Jun 12 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.4 -- Require java-gcj-compat 1.0.52. -- Don't use '*' to set the quatifier name in the eclipse-ecj symlink. -- Really fix swt symlinks rh #194500. - -* Wed Jun 07 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.3 -- Enable ppc64, s390 and s390x. -- Add check for jars at the end of prep. -- Fix patch for rh #162177 (square brackets patch). -- Fix swt symlinks rh #194500. -- Add versionless pde.build symlink. -- Rename efj-wrapper.sh to efj.sh.in. -- Re-pack all zips after the build to ensure that zips have the same md5sum - across arch re-builds. This is needed to avoid multilib conflicts. - -* Wed Jun 07 2006 Andrew Overholt 3.2.0-0jpp_0fc.3.2RC7.2 -- Fix eclipse-ecj.jar symlink to include qualifier. - -* Tue Jun 06 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.1 -- 3.2RC7. -- Remove com.jcraft.jsch_0.1.28.jar and repackage with classes from the system - jsch.jar. -- Work around ia64 compile problem in aot-compile-rpm. - -* Wed May 31 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC6 -- 3.2RC6. - -* Fri Jul 14 2006 Andrew Overholt 3.1.2-1jpp_16fc -- Try >= instead of = for the -devel package requirements to facilitate our - -devel to -sdk rename (to match upstream) with 3.2.0. - -* Tue May 30 2006 Ben Konrath 3.1.2-1jpp_15fc -- Bump release. - -* Mon May 29 2006 Ben Konrath 3.1.2-1jpp_14fc -- Add pde.build-add-package-build.patch to add generic releng scripts. -- Move doc.isv plugins to devel packages and require java-javadoc on devel - packages. -- Add pde-runtime subpackage - needed for PHPeclipse package. -- Update libswt mozilla patch for mozilla 1.7.13. -- Add swt patch to fix rh#191536, e.o#98371. - -* Tue Mar 07 2006 Andrew Overholt 3.1.2-1jpp_13fc -- One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). - -* Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc -- Only build with a native ecj on x86{,_64} - -* Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc -- Update to tomcat 5.5 (e.o#98371). -- Don't build on ppc64 until we get the tomcat situation straightened out. - -* Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_10fc -- Added patch for ppc64. - -* Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_9fc -- Try build on ppc64. - -* Fri Feb 17 2006 Andrew Overholt - 1:3.1.2-1jpp_8fc -- Try build on ppc64 (rh#172172, rh#181846). - -* Fri Feb 10 2006 Jesse Keating - 1:3.1.2-1jpp_7fc -- bump again for double-long bug on ppc(64) - -* Fri Feb 10 2006 Ben Konrath 3.1.2-1jpp_6fc -- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768). -- Make platform/feature.xml reference the tomcat5 plugin. - -* Thu Feb 09 2006 Andrew Overholt 3.1.2-1jpp_4fc.FC4 -- Always generate debug info when building RPMs (Andrew Haley). -- Slightly modify swt-gtk symlinks (rh#180000). - -* Mon Feb 06 2006 Andrew Overholt 3.1.2-1jpp_4fc -- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000). -- Link against generic libjawt.so (rh#158755). -- Re-add patch to use built launcher. - -* Sat Feb 4 2006 Ben Konrath 3.1.2-1jpp_3fc -- Update efj patches to match what has been committed to HEAD. - -* Fri Feb 3 2006 Igor Foox 3.1.2-1jpp_2fc -- Updated launcher script. - -* Tue Jan 31 2006 Andrew Overholt 3.1.2-1jpp_1fc -- 3.1.2. -- Remove unnecessary patches. - -* Tue Jan 31 2006 Karsten Hopp -- BuildRequire: unzip - -* Thu Jan 05 2006 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 -- Rebuild with new gjdoc (rh#161147). - -* Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_15fc -- Use natively-compiled ecj during build. -- Change about_files to be i386 and x86_64 only (will patch file upstream). - -* Mon Dec 19 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.11 -- Update patch for offline javadoc linking. -- Rebuild with new gjdoc (rh#161147). - -* Tue Dec 13 2005 Igor Foox 3.1.1-1jpp_1fc.FC4.10 -- New version of launcher path (rh#175454). - -* Mon Dec 12 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.9 -- Use ecj from 3.1.1 (rh#175380). -- Remove ecj options patch as it is in ecj from 3.1.1. -- New version of launcher patch (rh#175454) - ifoox. - -* Fri Dec 09 2005 Ben Konrath -- update updatehomedir-core.patch to remove unused code - -* Wed Dec 07 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.8 -- Add patch for launcher following symlinks (rh#168726, e.o#79592) - ifoox. -- Remove launcher script. - -* Mon Dec 05 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.7 -- Add eclipse-rcp-devel as a requirement of eclipse-platform-devel - (rh#161267). -- Updated splash screen (thanks to Diana Fong) (rh#170580). -- Include and use rebuild-sdk-features (rh#173589). - -* Fri Dec 02 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.7 -- Update EFJ patch (e.o#75333). -- Update update-site-in-home-dir patch (e.o#90630) - bkonrath. - -* Mon Nov 29 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.6 -- Rebuild with new gcc (4.0.2) (rh#146463, rh#151919, rh#158137, rh#163079, - rh#161483 <-- hooray for Andrew Haley!). -- All jars now natively-compiled. -- Patch org.eclipse.help.webapp jasper classpath. -- Import work done by Debian Eclipse packagers: - - Add Fedora version in Eclipse about dialog. - - Update eclipse-javadoc.patch to match Debian's disable-filelog patch. - - Remove buildDoc patches and add helpindexbuilder patch (e.o#114001). -- Add BuildRequires for libgnome{,ui}-devel (rh#171532). - -* Wed Nov 02 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.5 -- Remove native compilation for o.e.team.cvs.core (rh#163079). - -* Fri Oct 28 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.4 -- Add patch to use built launcher (e.o#83454). - -* Thu Oct 27 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.3 -- Really fix browser issue on x86_64 (rh#168040). - -* Tue Oct 25 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.2 -- Make non-gcj builds not noarch (rh#171711). - -* Fri Oct 21 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.1 -- Back-port 3.1.1 to FC4. -- Use native /usr/bin/ecj. - -* Wed Oct 12 2005 Andrew Overholt 3.1.1-1jpp_2fc -- Add JavaModelCache overflow patch (e.o#111299). - -* Tue Oct 11 2005 Andrew Overholt 3.1.1-1jpp_1fc -- 3.1.1. -- Patch around gij failing for the doc plug-in generation. -- Make /usr/bin/ecj a script (allows all jvms to call it). - -* Sat Oct 08 2005 Andrew Overholt 3.1.0_fc-15 -- Bump mozilla requirement. -- Re-enable org.eclipse.ui.forms_3.1.0.jar.so, org.eclipse.osgi_3.1.0.jar.so, - and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919) -- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253). -- Remove MOZILLA_FIVE_HOME magic from eclipse.script. -- Remove jdtCompilerAdapter.jar due to aot-compile-rpm smarts. -- Bump gcc and java-gcj-compat requirements. -- Remove lucene-1.4.3-src.zip (rh#170343). - -* Wed Aug 24 2005 Andrew Overholt 3.1.0_fc-14 -- /usr/lib -> %{_libdir} in eclipse.script (rh#159031). - -* Tue Aug 23 2005 Andrew Overholt 3.1.0_fc-13 -- Bump mozilla requirement. - -* Thu Jul 28 2005 Gary Benson 3.1.0_fc-12 -- Allow leading separators in classpaths (e.o#105430). -- Clear away ant-jmf entirely. - -* Wed Jul 27 2005 Andrew Overholt 3.1.0_fc-11 -- Bump release for FC4 update. -- Remove ant-jmf from exclude list. - -* Mon Jul 25 2005 Andrew Overholt 3.1.0_fc-10 -- Change mozilla BuildRequirement to be equals and not greater-than or equals - since we need the exact version for our patches. -- Bump mozilla requirements and patches to 1.7.10. -- Bump release due to FC4 update still not being released. -- Add ant-jmf to exclude list. - -* Thu Jul 21 2005 Andrew Overholt 3.1.0_fc-9 -- Bump release for FC4 update. -- Bump gcc requirement to that available in FC4 updates. - -* Tue Jul 19 2005 Andrew Overholt 3.1.0_fc-8 -- Bring in work done on rawhide: -- Update to use java-gcj-compat and not java-1.4.2-gcj-compat. -- Keep mozilla requirement off ppc64. -- Remove lots of jiggery-pokery with native compilation and use gbenson's new - aot-compile. -- Re-work files sections appropriately. -- Downgrade gcc requirement so we can build for FC4 in advance of gcc update. -- Bump release for FC4 update. - -* Tue Jul 05 2005 Andrew Overholt 3.1.0_fc-3 -- Bump release for FC4 update. - -* Mon Jul 04 2005 Andrew Overholt 3.1.0_fc-2 -- Remove remaining pre-built ant jars (but don't symlink to ant.jar until we - have ant 1.6.5 - rh#162444). -- Bump requirement on gcc to get fixes for rh#158614 and gcc#21637. -- Add patch to not try to link to external javadocs and include the javadoc - output in the build output. -- Add build and runtime requirement on ant-javamail (I'm not sure how we missed - this previously). - -* Mon Jul 4 2005 Gary Benson 3.1.0_fc-2 -- Disable classpath access rules introduced in e.o#92398 (rh#162177). - -* Tue Jun 28 2005 Andrew Overholt 3.1.0_fc-1 -- Import 3.1. -- Update splash screen. - -* Sun Jun 26 2005 Andrew Overholt 3.1.0_fc-0.RC4.1 -- Import 3.1 RC4. -- Remove activeHelpSample.jar building patch as it's now fixed upstream. -- Add patch to remove references to cairo since we don't have it in FC4. -- Add about.html and about_files to eclipse-platform.install (x86 & x86_64). -- Add patch to create public compare API (jpound - e.o#98707). -- Add patch from Robin Green to not look for firefox libxpcom.so (rh#161658). -- Symlink lucene jars (rh#159939). - -* Fri Jun 24 2005 Andrew Overholt 3.1.0_fc-0.RC3.3 -- Add rcp requirement for platform (rh#161267). -- Add un-owned osgi directories to libswt and platform. - -* Tue Jun 21 2005 Andrew Overholt 3.1.0_fc-0.RC3.2 -- Use SWT bundle ID for SWT %files list (determine in %%install). - -* Mon Jun 20 2005 Andrew Overholt 3.1.0_fc-0.RC3.1 -- Import 3.1RC3. -- Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse. -- Add eclipse-filenamepatterns.txt ("*.so" currently) for above. -- Symlink JNI libraries. - -* Fri Jun 17 2005 Andrew Overholt 3.1.0_fc-0.RC2.2 -- Update to new naming scheme for resulting gzipped tarball. -- Add patch to not generate help indices (it seems to hang). - -* Thu Jun 16 2005 Andrew Overholt 3.1.0_fc-0.RC2.1 -- Import 3.1RC2. -- Add RCP sub-package. Unsure about its dependencies ATM. - -* Tue Jun 14 2005 Andrew Overholt 3.1.0_fc-0.M7.9 -- Add tomcat5 patch and symlinks. - -* Thu May 26 2005 Andrew Overholt 3.1.0_fc-0.M7.8 -- Fix ant jar removal (gbenson). - -* Wed May 25 2005 Andrew Overholt 3.1.0_fc-0.M7.7 -- Fix ecj symlink in /usr/share/java (rh#158734). - -* Sun May 22 2005 Andrew Overholt 3.1.0_fc-0.M7.4 -- Remove compilation of jdt.ui jar.so on ppc. - -* Sat May 21 2005 Ben Konrath 3.1.0_fc-0.M7.3 -- Add ecj-options patch to bootstrap source. -- Make embedded browser widget work (Robin Green). -- Bump required version of java-gcj-compat to the latest (-40jpp_24rh). -- Use -lgcjawt when building with gcj. - -* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.2 -- Disable org.eclipse.osgi_3.1.0.jar.so. -- Add ecj-options patch, remove ecj-extdirs patch. - -* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.1 -- Update to 3.1M7. -- Add file initializer patch. -- Temporarily remove s390{,x} patches. -- Update GNU formatter ui patch. -- Add ECJ ext dirs patch. - -* Tue May 17 2005 Andrew Overholt 3.1.0_fc-0.M6.19 -- Add Epoch on eclipse-platform. -- Use %%{_bindir} in post and postun scripts. - -* Tue May 17 2005 Ben Konrath 3.1.0_fc-0.M6.18 -- Add Epoch to jsch requires. - -* Mon May 16 2005 Ben Konrath 3.1.0_fc-0.M6.17 -- Update libswt-mozilla patches and require mozilla 1.7.8. - -* Fri May 13 2005 Andrew Overholt -- Use %%{ix86} macro in ExclusiveArch rather than i386 (jorton). - -* Wed May 11 2005 Ben Konrath -- Add jsch >= 0.1.18-1jpp. -- Remove Fedora specific part of junit version. -- Temporarily disable org.eclipse.ui.forms_3.1.0.jar.so (rh#146463). - -* Mon May 09 2005 Ben Konrath 3.1.0_fc-0.M6.16 -- Add Requires junit >= 3.8.1-3jpp_4fc to JDT. -- Add -g to gcj calls. - -* Thu May 05 2005 Andrew Overholt 3.1.0_fc-0.M6.15 -- Rebuild with new gjdoc (rh#152049). - -* Wed May 4 2005 Ben Konrath -- Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296). - -* Mon May 2 2005 Ben Konrath 3.1.0_fc-0.M6.14 -- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853). - -* Sat Apr 30 2005 Ben Konrath 3.1.0_fc-0.M6.13 -- Add patch to temporarily stop an NPE in debug.ui (rh#155853). - -* Thu Apr 28 2005 Phil Muldoon -- Allow multiple optional arguments in eclipse-copy-platform.sh - -* Wed Apr 27 2005 Andrew Overholt -- Include epoch in mozilla BuildRequires. -- Remove last remaining gij-specific option from eclipse.script. - -* Wed Apr 27 2005 Jeremy Katz 3.1.0_fc-0.M6.12 -- silence %%post - -* Sun Apr 24 2005 Andrew Overholt 3.1.0_fc-0.M6.11 -- Re-add osgi.jar.so since gcj fix is in our gcc RPMs. -- Bump gcc requirements accordingly. -- Add gcc-c++ to BuildRequires (for SWT Mozilla). -- Add specific java-1.4.2-gcj-compat nvr requirement (rh#151866). - -* Fri Apr 22 2005 Aaron Luchko 3.1.0_fc-0.M6.10 -- Import archived projects (e.o#82988) - -* Fri Apr 22 2005 Andrew Overholt -- Add Requires(post,postun): java-1.4.2-gcj-compat for each sub-package and use - full path (Joe Orton). -- Make /usr/bin/eclipse executable again (rh#155715). -- Bump jsch version. - -* Thu Apr 21 2005 Andrew Overholt 3.1.0_fc-0.M6.9 -- Use upstream icons (not RHDS ones) (rh#146484). -- Add plugin directories to %files sections. -- Rework %files sections a bit. -- Fix SWT symlink (bkonrath). -- Temporarily remove jdt.ui/jdt.jar.so. - -* Thu Apr 21 2005 Ben Konrath 3.1.0_fc-0.M6.8 -- Fix updatesite patch. -- Temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so (r.c#151919) - -* Mon Apr 18 2005 Andrew Overholt 3.1.0_fc-0.M6.7 -- Add %if %%{gcj_support} blocks. -- Add %%{_libdir}/%%{name}/plugins to native %files section of each sub-rpm. -- Add GNU-style JDT code formatting option (e.o#91770). -- Add patch to install plugins from update site in home dir (e.o#90630). -- Change gcc-java requirements to libgcj as gcj-dbtool is now in the latter. - -* Mon Apr 18 2005 Ben Konrath 3.1.0_fc-0.M6.6 -- Bump version number. - -* Mon Apr 18 2005 Ben Konrath 3.1.0_fc-0.M6.5 -- Update mozilla patch. - -* Sat Apr 16 2005 Ben Konrath 3.1.0_fc-0.M6.4 -- Update to 3.1M6. -- Change bootstrap procedure to match the upstream method. -- Remove patches that were fixed upstream. -- Add efj wrapper script. - -* Wed Apr 13 2005 Ben Konrath 3.1.0_fc-0.M5.20 -- Fix the bootstrap patch (the ecj jar was missing some files). - -* Tue Apr 12 2005 Andrew Overholt 3.1.0_fc-0.M5.19 -- Add Requires(post,postun): java-1.4.2-gcj-compat for rebuild-gcj-db (Joe - Orton). -- Add ecj binary. - -* Wed Apr 06 2005 Andrew Overholt 3.1.0_fc-0.M5.18 -- Fix typo in gcj db building loops. -- Add -O1 to x86_64 jar.so compilation. -- Add EFJ (Eclipse Formatter for Java) patches (bkonrath) (e.o#75333). -- Add patch to build swttools.jar (e.o#90364). -- Symlink out to ant-jsch now that we have that. - -* Mon Apr 04 2005 Andrew Overholt 3.1.0_fc-0.M5.17 -- Actually insert .jar-.jar.so combinations into sub-dbs. - -* Thu Mar 31 2005 Andrew Overholt 3.1.0_fc-0.M5.16 -- Fix eclipse.script to not leave a sh process around (Joe Orton) -- Use proper sub-dbs. -- Don't compile jars that are symlinked from elsewhere. -- Add jar-so combinations to .db based on .jar.so existence (not .jar). -- Rename sub-dbs to be eclipse-*.db. -- Use rebuild-gcj-db script. - -* Mon Mar 28 2005 Christopher Aillon -- rebuilt - -* Fri Mar 25 2005 Christopher Aillon 3.1.0_fc-0.M5.14 -- Update the GTK+ theme icon cache on (un)install - -* Fri Mar 18 2005 Andrew Overholt 3.1.0_fc-0.M5.13 -- Re-add compilation of resources.jar. -- Backport bootstrapping patch. -- Add Requires: java-1.4.2-gcj-compat. -- Modified find patch courtesy Ziga Mahkovec (RH#149927#). -- Compile with -O2 on ppc as well. -- Add jsch, jakarta-commons-modeler, and mx4j symlinking. -- Make use of gcj-dbtool -f to create databases in install. -- Use system-wide classmap.db. -- Remove *.jarswithnativelibs from files sections. -- Update mozilla dependency. - -* Mon Mar 07 2005 Ben Konrath 3.1.0_fc-0.M5.12 -- Add activeHelpSample.jar patch. -- Change to Fedora M-build splash screen. -- Add find patch courtesy Ziga Mahkovec (RH#149927#) -- Build native stuff with -O2 on i386. - -* Mon Mar 07 2005 Andrew Overholt 3.1.0_fc-0.M5.11 -- Add s390 and s390x patches. -- Don't build for them, though, due to gcc bug and Eclipse building issue. -- Add xorg-x11-devel BuildRequires. - -* Fri Mar 04 2005 Andrew Overholt 3.1.0_fc-0.M5.10 -- Add proper mozilla version. -- Don't build eclipseAdaptor.jar.so in order to work around plugin building - problems. - -* Thu Mar 03 2005 Andrew Overholt 3.1.0_fc-0.M5.9 -- Add patch to build libswt-mozilla. -- Build libswt-awt. -- Add 64-bit swt lib list. - -* Tue Mar 01 2005 Andrew Overholt 3.1.0_fc-0.M5.8 -- Add ppc. -- Add patch to copy over icon for unsupported (upstream) platforms but don't - include the source for the launcher. -- gcc4 -> gcc changes. -- Add swt-cairo to 64-bit platforms' %files. - -* Fri Feb 25 2005 Andrew Overholt 3.1.0_fc-0.M5.7 -- Add tar args patch (e.o #86571). -- New build bootstrapping patches. - -* Fri Feb 25 2005 Andrew Overholt 3.1.0_fc-0.M5.6 -- Re-work how we do the gcj-dbtool magic. -- Don't remove ant-netrexx (need to find an RPM if we can). - -* Sun Feb 20 2005 Andrew Overholt 1:3.1_fc-0.M5.5 -- Build for just i386 and x86_64 for now due to upstream gcc bugs. - -* Sun Feb 20 2005 Andrew Overholt 1:3.1_fc-0.M5.1 -- New 3.1M5a build using upstream build method. -- Re-organize sub-packages (ecj, platform, platform-devel, jdt, jdt-devel, pde, - pde-devel, fold gtk2 package into platform). -- Move jface and org.eclipse.text into libswt3-gtk2. -- Bring in JPackage symlinks for packages we have in Fedora (David Walluck) and - put in %%prep. -- Work around x86_64 filename differences. -- Remove xerces, xalan, and xml-commons-apis requirement (and LD_PRELOAD from - script). -- Bootstrap build. -* Tue Jan 18 2005 Andrew Overholt 3.1-0.M4.21 -- explicitly require java-1.4.2-gcj4-compat-devel - -* Mon Jan 17 2005 Andrew Overholt 3.1-0.M4.20 -- add ppc64 - -* Mon Jan 17 2005 Andrew Overholt 3.1-0.M4.19 -- more 64-bit platform and launching script fixes -- add ppc - -* Sat Jan 15 2005 Andrew Overholt 3.1-0.M4.18 -- script path fixes -- x86_64 fixes - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.17 -- sed typo - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.15 -- fix /usr/share -> /usr/lib error in launcher script -- only add to the db those jar-so combinations that we've compiled - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.12 -- typos in %files - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.11 -- remove ppc for now - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.10 -- make PDE depend upon JDT -- move precompiled db to %{_libdir}/eclipse -- modify launching script to use compiled .sos -- rename compiled .sos to be .jar.so instead of .so -- for now, do dbtool adding in platform install - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.9 -- add ppc -- add launcher and swt patches - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.7 -- make jdtcore*.jar part of eclipse-ecj - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.6 -- use installed java-devel rpm instead of bootstrapping one - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.5 -- fix when we set JAVA_HOME variable - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.2 -- fix typos - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.1 -- fix versioning and release to upgrade cleanly - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-9 -- add Provides: ecj for eclipse-ecj - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-9 -- update patches - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-5 -- import all necessary patches - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-4 -- fix /usr/lib -> %{_datadir} to be /usr/lib -> %{_libdir} in - %{_bindir}/eclipse - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-3 -- add xerces - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-2 -- fold ecj-native into ecj -- add FIXMEs for necessary work -- add xml .jar->.so compilations so we can work without gnujaxp -- modify launching script to take this into account - -* Wed Jan 05 2005 Andrew Overholt 3.1.M4-1 -- new upstream milestone build -- re-organize sub-rpms - -* Mon Dec 20 2004 Andrew Overholt 3.0.1-4 -- build ecj first and use it to build the rest -- add %selfbuild to toggle between builds with java-gcj-compat style and other - JREs -- fold scripts into platform - -* Mon Nov 22 2004 Ben Konrath 3.0.1-3 -- split cvs-permission-bits.patch in two -- bug fix for cvs-permission-bits.patch - -* Fri Oct 29 2004 Ben Konrath 3.0.1-2 -- add symlink for releng plugins that rely on o.e.pde.build_3.0.0 - -* Fri Oct 29 2004 Ben Konrath 3.0.1-1 -- updated to Eclipse 3.0.1 -- updated jnigen patch -- removed some debugging print statements -- updated Red Hat documentaion sources -- added Red Hat documentation pdf -- remove commented ftp-webdav stuff as it will be in it's own spec file - -* Tue Oct 04 2004 Aaron Luchko 3.0.0-26 -- Changed the splash screen from a bmp to a png and fixed -- copyright date - -* Mon Aug 31 2004 Aaron Luchko 3.0.0-25 -- Building docs after the main build using headless eclise - to build the extension points - -* Mon Aug 16 2004 Ben Konrath 3.0.0-24 -- Add cvs permission bits patch - -* Wed Aug 04 2004 Elliot Lee 3.0.0-23 -- Unblock hack no longer needed. - -* Mon Jul 26 2004 Jeremy Handcock 3.0.0-22 -- Update Red Hat documentation sources - -* Thu Jul 22 2004 Tom Tromey 3.0.0-21 -- Set eclipse_arch for ppc -- Tell build about real platform -- Make swt.gtk install directory - -* Thu Jul 22 2004 Jeremy Handcock 3.0.0-20 -- Don't build on ppc64 -- Change Requires and BuildRequires to java >= 1.4.2 -- eclipse-platform package obsoletes old eclipse package - -* Wed Jul 21 2004 Jeremy Handcock 3.0.0-19 -- Update copy-platform with patch from Keith Seitz - -* Tue Jul 20 2004 Tom Tromey 3.0.0-18 -- Allow copy-platform to copy non-core parts as well - -* Tue Jul 20 2004 Jeremy Handcock 3.0.0-17 -- Update Red Hat documentation sources - -* Tue Jul 20 2004 Ben Konrath 3.0.0-16 -- Add patch for welcome screen - -* Mon Jul 19 2004 Tom Tromey 3.0.0-15 -- Don't require IBM JDK -- Don't build AWT/SWT interaction code - -* Fri Jul 16 2004 Tom Tromey 3.0.0-14 -- Install copy-platform correctly - -* Fri Jul 16 2004 Tom Tromey 3.0.0-13 -- Removed debugging code -- Added copy-platform script - -* Thu Jul 15 2004 Jeremy Handcock 3.0.0-12 -- Add Red Hat-specific documentation - -* Thu Jul 15 2004 Tom Tromey 3.0.0-12 -- Fixed provides/requires versioning buglets - -* Wed Jul 14 2004 Tom Tromey 3.0.0-11 -- Unblock signals before running ant - -* Wed Jul 14 2004 Tom Tromey 3.0.0-10 -- Added some debugging code - -* Tue Jul 13 2004 Jeremy Handcock 3.0.0-9 -- Add help server patch to prevent outside access - -* Fri Jul 9 2004 Tom Tromey 3.0.0-9 -- Handle libswt*.so correctly - -* Wed Jul 8 2004 Tom Tromey 3.0.0-9 -- Reworked 64 bit platform support -- org.eclipse.swt.tools now included in standard zip file -- Removed alternatives -- Added platform launcher patch - -* Thu Jul 8 2004 Jeremy Handcock 3.0.0-9 -- Don't BuildRequires: junit -- Don't symlink against JPackage jars; use eclipse.org ones instead - -* Tue Jul 6 2004 Tom Tromey 3.0.0-8 -- Work around "ppc64pseries" arch oddity -- Add classic-ant hack - -* Wed Jun 30 2004 Tom Tromey 3.0.0-7 -- Only install one desktop file; check it; updated contents - -* Tue Jun 29 2004 Tom Tromey 3.0.0-6 -- Require IBM JDK -- Only build on our platforms - -* Mon Jun 28 2004 Tom Tromey 3.0.0-5 -- Inlined libswt install source -- Special case for ia64 Xtst directory - -* Fri Jun 25 2004 Tom Tromey 3.0.0-4 -- Added patch for Mozilla build; disabled though -- Updated to 3.0 final - -* Thu Jun 24 2004 Tom Tromey 3.0.0-3 -- Removed more Motif code -- Updated to use more jpackage macros - -* Tue Jun 22 2004 Tom Tromey 3.0.0-2 -- Updated to Eclipse 3.0RC3 - -* Mon May 24 2004 Tom Tromey 3.0.0-1 -- Updated to Eclipse 3.0M8 -- Removed Motif build -- Removed some non-Red Hat code -- Added Red Hat artwork -- Build on non-x86 architectures - -* Sun Apr 25 2004 Ville Skyttä - 0:2.1.3-2jpp -- Fix "patch -p" levels. -- More coverage for failonerror and non-verbosity during build. - -* Fri Apr 23 2004 David Walluck 0:2.1.3-1jpp -- remove patches that were fixed upstream since the last release -- eclipse-pde now requires eclipse-source (thanks Michael Reinsch) -- add patch to allow compilation on recent GTK+ versions - (thanks Rudi Chiarito) -- include %%{_libdir}/libswt-gnome-gtk-%%{swt_version}.so in gtk2 - package - -* Sun Nov 16 2003 David Walluck 0:2.1.2-6jpp -- 2.1.2 public release -- %{_datadir}/%{name}/plugins is now used for plugins, and you must - move any plugins that you have manually installed into - %{_libdir}/%{name}/plugins to the new location. The new location is - not expected to change - -* Sat Nov 15 2003 David Walluck 0:2.1.2-5jpp -- apply patch from Ville to remove some motif conditional parts -- apply patch from Ville for .desktop -- make platform own %%{_libdir}/%{name} - -* Fri Nov 14 2003 David Walluck 0:2.1.2-4jpp -- have platform package provide and obsolete sdk package -- fold javac package back into jdt package - -* Tue Nov 11 2003 David Walluck 0:2.1.2-3jpp -- /usr/bin/mozilla is now required by eclipse-ui and not eclipse-platform -- make libswt2 required by motif and gtk subpackages -- disable motif by default (unsupported) -- motif and gtk related files are now fully separated from other packages - -* Mon Nov 10 2003 Ville Skyttä - 0:2.1.2-2jpp -- Don't use the Mandrake-specific %%mklibname macro. -- Update freedesktop.org desktop entry categories. -- Try to look up the QT dir in portable fashion. -- Refactor refactor-rename patch into two due to spaces in pathnames. -- Fix $RPM_OPT_FLAGS handling. -- Untabify specfile. - -* Sat Nov 08 2003 David Walluck 0:2.1.2-1jpp -- 2.1.2 - -* Thu Nov 06 2003 David Walluck 0:2.1.1-4jpp -- use versioned dirs -- add pde, javac, and motif subpackages and remove sdk subpackage -- patches from Debian -- fail build on error -- add libswt (GTK, Motif) packages - -* Sun Sep 21 2003 David Walluck 0:2.1.1-3jpp -- apply new patch for non-working rename action from Michael Reinsch -- build for Mandrake 9.2 with Sun JDK 1.4.2 - -* Thu Aug 21 2003 Ville Skyttä - 0:2.1.1-2jpp -- Include missed plugins: org.eclipse.ui.versioncheck (platform), - org.eclipse.pde.source (sdk). Thanks to Markus Härnvi for the heads up. - -* Sun Jun 29 2003 Michael Reinsch 0:2.1.1-1jpp -- patch for non-working rename action -- eclipse 2.1.1 -- Ville's comments: patch not applied, it didn't fix the problem completely. - Still built with Sun's 1.3.1.08. - -* Sun Jun 8 2003 Ville Skyttä - 0:2.1.0-4jpp -- Use xmlParserAPIs.jar that comes with Eclipse instead of xml-commons-apis: - - -* Sun Jun 1 2003 Ville Skyttä - 0:2.1.0-3jpp -- Rebuild with Sun's 1.3.1_08 to work around Eclipse Java 1.4.x build bug: - -- Drop %%{release} from subpackage interdependencies in order to make it - possible to do partial subpackage-only updates in the future. -- Make legacymenu conflict with redhat-menus. -- Add icon symlink in %%{_datadir}/pixmaps. - -* Mon Apr 21 2003 David Walluck 0:2.1.0-2jpp -- fix mdkmenu -- add Distribution and Vendor tags - -* Thu Apr 03 2003 David Walluck 0:2.1.0-1jpp -- 2.1 -- add %{name}-make-ld.patch to work around problems building on Mandrake 9.1 -- add Mandrake 9.1 comments to BuildRequires - -* Wed Mar 26 2003 Ville Skyttä - 0:2.1.0-0.rc3b.3jpp -- Rebuilt for JPackage 1.5. - -* Tue Mar 25 2003 Ville Skyttä - 0:2.1.0-0.rc3b.2jpp -- Add java.library.path and -Xms64M to default config. -- Don't use "-dev bin" by default. -- Use X-JPackage instead of X-Red-Hat-Extra in standard menu entry. -- Fix MDK menu entry title and summary. - -* Mon Mar 24 2003 Ville Skyttä - 0:2.1.0-0.rc3b.1jpp -- Update to 2.1.0 RC3b. -- Spec file and build cleanups, mostly from David Walluck. -- No longer requires csh. -- Made *.so in the gtk and platform packages executable. -- The %%{_libdir}/%{name} directory is now owned by the platform package. - -* Fri Mar 14 2003 Ville Skyttä - 2.1.0-0.rc2.2jpp -- Include a couple of platform files missing from the previous build. -- Remove bogus files from platform, ftp-webdav and sdk file lists. -- Abort with error if the file lists refer to nonexistent files. - -* Sun Mar 9 2003 Ville Skyttä - 2.1.0-0.rc2.1jpp -- Update to 2.1.0 RC2. -- Merge David Walluck's packaging work. -- Use JPackage lucene. -- Don't include Motif stuff. - -* Thu Mar 6 2003 Ville Skyttä - 2.1.0-0.rc1.0jpp -- First try at packaging. diff --git a/rt.incubator.pom.xml b/rt.incubator.pom.xml new file mode 100644 index 0000000..11665a2 --- /dev/null +++ b/rt.incubator.pom.xml @@ -0,0 +1,34 @@ + + + + + 4.0.0 + + + org.eclipse + eclipse-parent + 1.0.0-SNAPSHOT + ../eclipse-parent + + + org.eclipse.equinox.framework + rt.equinox.incubator + 3.8.0-SNAPSHOT + pom + + + framework/bundles/org.eclipse.equinox.initializer + + + diff --git a/sources b/sources index 4aafcfd..9d6b5b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -86d7933037b9d0e52d421c0740c1bb27 eclipse-4.2.0-I20120608-1400-src.tar.bz2 -d8a7ff665d3202dd387f63132371e9d3 eclipse-build-8b7060063e10f73e00056a9766d33fc43f043f4b.tar.xz +cb058e425a067773e648a78d4e3ada27 eclipse-source.tar.bz2 +d507c90f00c1fa6eac988138514e2e6f eclipse-jdtpdeupdatesite.tar.bz2