[eclipse/f19] Update to latest upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu May 2 12:02:24 UTC 2013
commit 5eaee80112be837876d28117b7706098892b8577
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Thu May 2 14:02:12 2013 +0200
Update to latest upstream.
.gitignore | 4 +-
eclipse-change-build-packagings.patch | 4 +-
eclipse.spec | 75 +++++++++++++--------------------
get-eclipse.sh | 47 +++++++++++++++++----
sources | 4 +-
5 files changed, 76 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f8cf97..8b97960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
/.project
eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
-/R4_platform-aggregator
+/R4_platform-aggregator-*
/eclipse-source.tar.bz2
/eclipse-jdtpdeupdatesite.tar.bz2
/x86_64
@@ -45,3 +45,5 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
/eclipse-build-62df1461d353e168d9cd713385bbe27b7ea66f4b.tar.xz
/.m2
/.xmvn
+/R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
+/eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index e93d0cc..bd28644 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -19,15 +19,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -160,6 +160,7 @@
+ <features>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
- <feature id="org.eclipse.rcp.configuration"/>
+ <feature id="org.eclipse.cvs"/>
</features>
diff --git a/eclipse.spec b/eclipse.spec
index 7ff943d..42acb0d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -9,7 +9,8 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
-%global eb_commit 62df1461d353e168d9cd713385bbe27b7ea66f4b
+%global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87
+%global eclipse_tag 2caa8794a57a9479ad642d7f6e3607a020aa36e0
%global build_id I20130128-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@@ -51,12 +52,12 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.40%{?dist}
+Release: 0.41%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
#get-eclipse.sh
-Source0: eclipse-source.tar.bz2
+Source0: R4_platform-aggregator-%{eclipse_tag}.tar.bz2
#http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
Source1: eclipse-build-%{eb_commit}.tar.xz
@@ -104,10 +105,10 @@ Patch10: %{pkg_name}-pdebuild-add-target.patch
Patch11: %{pkg_name}-change-build-packagings.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
-Patch12: %{pkg_name}-build-network-native-libs.patch
+#Patch12: %{pkg_name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
-Patch13: %{pkg_name}-build-filesystem-native-libs.patch
+#Patch13: %{pkg_name}-build-filesystem-native-libs.patch
Patch14: %{pkg_name}-test-support.patch
@@ -123,7 +124,7 @@ Patch22: %{pkg_name}-bug-903537.patch
Patch23: %{pkg_name}-jetty-9.patch
-Patch24: %{pkg_name}-fix-jsoup-crash.patch
+#Patch24: %{pkg_name}-fix-jsoup-crash.patch
Patch25: %{pkg_name}-fix-startup-class-refresh.patch
@@ -257,8 +258,8 @@ Requires: xml-commons-apis >= 1.4.01-6
Requires: batik >= 1.8
Requires: atinject >= 1-6
Requires: geronimo-annotation >= 1.0-7
-Requires: %{?scl_prefix}eclipse-ecf-core
-Requires: eclipse-emf-core >= 2.8.1
+Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0
+Requires: eclipse-emf-core >= 2.9.0
Requires: tomcat-servlet-3.0-api
Requires: tomcat-el-2.2-api
Requires: glassfish-jsp-api >= 2.2.1-4
@@ -324,9 +325,9 @@ Eclipse Tests.
%prep
-%setup -q %{SOURCE0} -n R4_platform-aggregator
+%setup -q %{SOURCE0} -n R4_platform-aggregator-%{eclipse_tag}
-tar --strip-components=1 -xf %{SOURCE1}
+tar --strip-components=1 -xf %{SOURCE1}
%patch0
%patch1
@@ -339,16 +340,16 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch9
%patch10
%patch11
-%patch12
-%patch13
-%patch14
+#%patch12
+#%patch13
+#%patch14
%patch17
%patch18
%patch20
%patch21
%patch22
%{!?scl:%patch23}
-%patch24
+#%patch24
%patch25
%patch26
@@ -383,7 +384,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
%pom_disable_module features/master-equinox eclipse.platform.releng
%pom_disable_module features/master eclipse.platform.releng
-%pom_disable_module features/master-ecf eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
@@ -416,17 +416,17 @@ sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/ja
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
-sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (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<String, ?>) (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<String, ?>) (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<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
+#sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (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<String, ?>) (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<String, ?>) (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<String, ?>) (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<String,?>)(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<String,?>)(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/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary<String,?>)(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<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=399617
-find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
+#find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
#This part generates secondary fragments using primary fragments.
@@ -487,36 +487,21 @@ cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo
find eclipse.platform.ua -name pom.xml -exec sed -i -e 's at org.apache.lucene<@org.apache.lucene.core<@g' {} \;
-sed -i -e 's/org.eclipse.ecf.provider.filetransfer.httpclient/org.eclipse.ecf.provider.filetransfer.httpclient4/' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-
-
-sed -i -e 's/1.0.0/4.3.0/g' eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml
-sed -i -e 's/600/700/g' eclipse.platform.debug/org.eclipse.core.variables/pom.xml
-sed -i -e 's/100/200/g' eclipse.platform.debug/org.eclipse.core.externaltools/pom.xml
-sed -i -e 's/100/200/g' eclipse.jdt.debug/org.eclipse.jdt.launching.macosx/pom.xml
-sed -i -e 's/100/200/g' eclipse.jdt.debug/org.eclipse.jdt.launching.ui.macosx/pom.xml
-sed -i -e 's/200/300/g' eclipse.pde.ui/ds/org.eclipse.pde.ds.core/pom.xml
-sed -i -e 's/200/300/g' eclipse.pde.ui/ds/org.eclipse.pde.ds.ui/pom.xml
-sed -i -e 's/200/300/g' eclipse.pde.ui/ua/org.eclipse.pde.ua.core/pom.xml
-sed -i -e 's/200/300/g' eclipse.pde.ui/ua/org.eclipse.pde.ua.tests/pom.xml
-sed -i -e 's/200/300/g' eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime/pom.xml
-sed -i -e 's/500/600/g' eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/pom.xml
-sed -i -e 's/100/200/g' eclipse.platform.debug/org.eclipse.debug.examples.core/pom.xml
LOCALREPO="file://`pwd`/.m2/p2/repo"
find eclipse.platform.common/bundles -name pom.xml -exec sed -i -e "s at http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \;
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
%{?scl:%scl_maven_opts}
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \
- -DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130313-2254 -Dpackaging=jar -DskipTychoVersionCheck \
- -Dtycho.local.keepTarget
-
# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
export JAVA_HOME=%{java_home}
@@ -749,7 +734,7 @@ sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%
unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/
unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
-cp eclipse.platform.releng/bundles/org.eclipse.test/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
+cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
@@ -821,7 +806,6 @@ fi
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_*
%{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
%{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{pkg_name}/plugins/javax.servlet_*
@@ -1014,8 +998,6 @@ fi
# FIXME: should we ship content.xml for the platform?
#%%{_libdir}/%%{pkg_name}/metadata
%{_libdir}/%{pkg_name}/p2
-%{_libdir}/%{pkg_name}/about.html
-%{_libdir}/%{pkg_name}/about_files/
%files jdt -f .mfiles-jdt
%attr(0755,root,root) %{_bindir}/efj
@@ -1038,6 +1020,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu May 02 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.41
+- Update to latest upstream.
+
* Tue Apr 23 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.40
- Fix generating tests summary.
- RHBZ 955214 Failure to properly start bundle on first run.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 557a981..766ca2b 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,21 +1,52 @@
#!/bin/bash
set -e
+AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
+TAG=2caa8794a57a9479ad642d7f6e3607a020aa36e0
-rm -rf R4_platform-aggregator
-rm -rf eclipse-source.tar.bz2
+#source http://www.linuxjournal.com/content/normalizing-path-names-bash
+function normalize()
+{
+ # Remove all /./ sequences.
+ path=${1//\/.\//\/}
+
+ # Remove dir/.. sequences.
+ while [[ $path =~ ([^/][^/]*/\.\./) ]]
+ do
+ path=${path/${BASH_REMATCH[0]}/}
+ done
+}
-git clone --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
-pushd R4_platform-aggregator
-find . -type d -name "\.git" -exec rm -rf {} \;
+rm -rf R4_platform-aggregator-$TAG
+rm -rf R4_platform-aggregator-$TAG.tar.bz2
-find . -type f -name "*.class" -exec rm -rf {} \;
+git clone --single-branch --depth 1 $AGGREGATOR_PATH R4_platform-aggregator-$TAG
-find . -name *.jar -exec rm -rf {} \;
+pushd R4_platform-aggregator-$TAG
+
+git submodule init
+
+for i in $(git submodule | sed -e 's/.* //'); do
+ spath=$(git config -f .gitmodules --get submodule.$i.path)
+ surl=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git/`git config -f .gitmodules --get submodule.$i.url`
+ normalize $surl
+ git clone --depth 1 $path $spath
+done
+
+echo "Check out done"
+
+#comment this line to get a shallow clone.
+find . -type d -name ".git" | xargs rm rm -rf
+
+find . -type f -name *.class -exec rm -rf {} \;
+
+find . -name *.jar -type f -exec rm -rf {} \;
find . -type f -name *.so -exec rm -rf {} \;
find . -type f -name *.dll -exec rm -rf {} \;
find . -type f -name *.jnilib -exec rm -rf {} \;
+
popd
-tar cjf eclipse-source.tar.bz2 R4_platform-aggregator
+
+tar cjf R4_platform-aggregator-$TAG.tar.bz2 R4_platform-aggregator-$TAG
diff --git a/sources b/sources
index b5eb8cf..7fee661 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f3ae800f0031319549a51cf8cec51346 eclipse-build-62df1461d353e168d9cd713385bbe27b7ea66f4b.tar.xz
-9984cb673e1a7995bf52c33af260b61c eclipse-source.tar.bz2
+0aff7988c384ece2ac27e6abfe517e77 eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
+c26e9055f0669ee13f6ad69faf6d34db R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
More information about the scm-commits
mailing list