[eclipse] Update to latest upstream. Fix the build on secondary platforms.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon May 13 11:19:04 UTC 2013
commit a31024c5744d6e0bbc9e613f682af168b312bbac
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon May 13 12:50:59 2013 +0200
Update to latest upstream. Fix the build on secondary platforms.
eclipse-fix-jsoup-crash.patch | 18 -----
eclipse-osgi-unpack-sources.patch | 140 +++++++++++++++++++++++------------
eclipse-remove-loop-predicate.patch | 84 ---------------------
eclipse.spec | 19 +++--
get-eclipse.sh | 2 +-
5 files changed, 103 insertions(+), 160 deletions(-)
---
diff --git a/eclipse-osgi-unpack-sources.patch b/eclipse-osgi-unpack-sources.patch
index 286d4e2..848ae6b 100644
--- a/eclipse-osgi-unpack-sources.patch
+++ b/eclipse-osgi-unpack-sources.patch
@@ -1,30 +1,94 @@
---- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2012-07-25 17:42:07.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2012-07-30 12:05:54.525785334 +0200
-@@ -42,6 +42,84 @@
- </dependency-resolution>
- </configuration>
- </plugin>
-+ <plugin>
-+ <groupId>org.eclipse.tycho</groupId>
-+ <artifactId>target-platform-configuration</artifactId>
-+ <configuration>
-+ <dependency-resolution>
+--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2013-05-10 10:19:28.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2013-05-10 11:29:48.359120855 +0200
+@@ -11,10 +11,16 @@
+ bin.includes = plugin.properties,\
+ about.html,\
+ META-INF/,\
++ org/,\
+ about_files/
+ src.includes = plugin.properties,\
+ about.html,\
+ about_files/
++source.. = src/
++output.. = bin/
+ customBuildCallbacks=customBuildCallbacks.xml
+ javacSource = 1.5
+ javacTarget = 1.5
++jars.compile.order = library.jar,\
++ src/
++source.library.jar = src2/
+--- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2013-05-10 10:19:28.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2013-05-10 11:28:11.292306529 +0200
+@@ -25,64 +25,81 @@
+ <build>
+ <plugins>
+ <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-antrun-plugin</artifactId>
+- <version>1.7</version>
+- <executions>
+- <execution>
+- <phase>prepare-package</phase>
+- <configuration>
+- <target>
+- <unzip src="src.zip" dest="${basedir}"/>
+- </target>
+- </configuration>
+- <goals>
+- <goal>run</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+- <!--
+- When building monolith, optional import-package javax.microedition.io causes circular dependency
+- between this org.eclipse.osgi.services bundle and org.eclipse.equinox.io.
+- Since this bundle does not need to compile anything, we just disable optional dependencies during
+- the build.
+- -->
+ <configuration>
+ <dependency-resolution>
+- <optionalDependencies>ignore</optionalDependencies>
++ <optionalDependencies>ignore</optionalDependencies>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>javax.servlet</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
-+ <!--requirement>
-+ <type>eclipse-plugin</type>
-+ <id>org.eclipse.equinox.io</id>
-+ <versionRange>0.0.0</versionRange>
-+ </requirement-->
+ </extraRequirements>
-+ </dependency-resolution>
-+ </configuration>
-+ </plugin>
-+ <plugin>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>tycho-packaging-plugin</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <additionalFileSets>
+- <fileSet>
+- <directory>${basedir}</directory>
+- <includes>
+- <include>org/**/*.class</include>
+- </includes>
+- </fileSet>
+- </additionalFileSets>
+- </configuration>
+- </plugin>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>tycho-source-plugin</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <includes>
+- <include>org/**/*.java</include>
+- <include>org/**/packageinfo</include>
+- </includes>
+- </configuration>
+- </plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
@@ -33,10 +97,13 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
-+ <mkdir dir="src" /><mkdir dir="bin" />
++ <mkdir dir="src" />
++ <mkdir dir="bin" />
+ <unzip src="src.zip" dest="src" overwrite="false"/>
+ <mkdir dir="src2/javax" />
-+ <copy todir="src2/javax/"><fileset dir="../../../rt.equinox.bundles/bundles/org.eclipse.equinox.io/src/javax"/></copy>
++ <copy todir="src2/javax/">
++ <fileset dir="../../../rt.equinox.bundles/bundles/org.eclipse.equinox.io/src/javax"/>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
@@ -48,10 +115,9 @@
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
-+ <copy todir="org/"><fileset dir="target/classes/org/"/></copy>
-+ <!--unzip src="src.zip" dest="src" overwrite="false"/>
-+ <mkdir dir="src2/javax" />
-+ -->
++ <copy todir="org/">
++ <fileset dir="target/classes/org/"/>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
@@ -85,25 +151,3 @@
</plugins>
</build>
---- 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.spec b/eclipse.spec
index 311a200..71c15eb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -10,7 +10,7 @@ Epoch: 1
%global eclipse_micro 0
%global initialize 1
%global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87
-%global eclipse_tag 2caa8794a57a9479ad642d7f6e3607a020aa36e0
+%global eclipse_tag 05399d45ad26182e90acf47798283268aaeb4471
%global build_id I20130128-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@@ -52,7 +52,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.43%{?dist}
+Release: 0.44.git4bccf2%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -118,12 +118,8 @@ Patch22: %{pkg_name}-bug-903537.patch
Patch23: %{pkg_name}-jetty-9.patch
-#Patch24: %{pkg_name}-fix-jsoup-crash.patch
-
Patch25: %{pkg_name}-fix-startup-class-refresh.patch
-Patch26: %{pkg_name}-remove-loop-predicate.patch
-
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -343,7 +339,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%{!?scl:%patch23}
#%patch24
%patch25
-%patch26
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -472,8 +467,7 @@ find eclipse.platform.common/bundles -name pom.xml -exec sed -i -e "s at http://dow
find eclipse.platform.swt/bundles -name pom.xml -exec sed -i -e "s at http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \;
sed -i -e "s at http://download.eclipse.org/releases/juno@${LOCALREPO}@g" eclipse-platform-parent/pom.xml
-sed -i -e "s at linux/x86_64/@linux/@g" eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
-sed -i -e "s/httpclient/httpclient4/g" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+
%{_javadir}/tycho/copy-platform-all $(pwd)/.m2/p2/repo
%build
@@ -774,8 +768,10 @@ fi
%{_libdir}/%{pkg_name}/eclipse
%dir %{_libdir}/%{pkg_name}/dropins
%dir %{_datadir}/%{pkg_name}/dropins
+%dir %{_libdir}/%{pkg_name}/configuration/
%{_libdir}/%{pkg_name}/configuration/config.ini
%{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+%dir %{_libdir}/%{pkg_name}/features/
%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
@@ -967,6 +963,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_*
+%dir %{_libdir}/%{pkg_name}/readme
%{_libdir}/%{pkg_name}/readme/readme_eclipse.html
# Put this in -platform since we're putting the p2 stuff here
%{_libdir}/%{pkg_name}/artifacts.xml
@@ -995,6 +992,10 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Mon May 13 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.44.git4bccf2
+- Fix the build on secondary platforms.
+- Update to latest upstream.
+
* Mon May 13 2013 Alexander Kurtakov <akurtako at redhat.com> 1:4.3.0-0.43
- Fix the eclipse-rcp obsolete version.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 766ca2b..9ca3db8 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=2caa8794a57a9479ad642d7f6e3607a020aa36e0
+TAG=05399d45ad26182e90acf47798283268aaeb4471
#source http://www.linuxjournal.com/content/normalizing-path-names-bash
function normalize()
More information about the scm-commits
mailing list