[eclipse/cbi] tycho 0.16 adoption.
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Aug 10 12:24:10 UTC 2012
commit 24ccb9c0d49caaef0534c1e0dceec2ab7e3db25f
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Aug 10 09:06:59 2012 +0200
tycho 0.16 adoption.
eclipse-remove-jgit-provider.patch | 22 ++++++++++++++
eclipse.spec | 54 ++++++++++++++++++------------------
sources | 2 +-
3 files changed, 50 insertions(+), 28 deletions(-)
---
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 @@
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+- <dependencies>
+- <dependency>
+- <groupId>org.eclipse.tycho.extras</groupId>
+- <artifactId>tycho-buildtimestamp-jgit</artifactId>
+- <version>${tycho-extras.version}</version>
+- </dependency>
+- </dependencies>
+ <configuration>
+ <strictBinIncludes>false</strictBinIncludes>
+ <format>'v'yyyyMMdd-HHmm</format>
+- <timestampProvider>jgit</timestampProvider>
+- <jgit.ignore>
+- </jgit.ignore>
+ </configuration>
+ </plugin>
+ <plugin>
diff --git a/eclipse.spec b/eclipse.spec
index fbe04ed..543bfd0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 4%{?dist}
+Release: 10%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -95,7 +95,7 @@ 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
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -142,6 +142,7 @@ 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
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@@ -174,19 +175,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
@@ -215,6 +203,7 @@ Requires: geronimo-annotation >= 1.0-7
Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
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
@@ -285,6 +274,7 @@ popd
%patch19
%patch20
%patch21
+%patch22
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@@ -296,6 +286,11 @@ popd
%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 org.eclipse.jdt.launching.macosx eclipse.jdt.debug
+#%pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug
+#%pom_disable_module eclipse.platform update/org.eclipse.update.core.linux
+
#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/
@@ -364,25 +359,27 @@ cp %{SOURCE20} rt.equinox.incubator/pom.xml
cp %{SOURCE21} rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/pom.xml
sed -i -e "s/<module>rt.equinox.p2<\/module>/<module>rt.equinox.p2<\/module><module>rt.equinox.incubator<\/module>/" pom.xml
+
+
+
+
+#sed -i -e "s/x86/x86_64/" eclipse.jdt.debug/org.eclipse.jdt.launching.macosx/pom.xml
%build
-mvn-local -f eclipse-parent/pom.xml \
+mvn-rpmbuild -f eclipse-parent/pom.xml \
install \
- -Dmaven.local.mode=true
+ -Dmaven.local.mode=true -Dtycho.local.keepTarget
-mvn-local -f maven-cbi-plugin/pom.xml \
+mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
install \
- -Dmaven.local.mode=true
+ -Dmaven.local.mode=true -Dtycho.local.keepTarget
-#workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
-pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
-mvn-local install \
+mvn-rpmbuild install \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
- -Dmaven.local.mode=true
-popd
+ -Dmaven.local.mode=true -Dtycho.local.keepTarget
-mvn-local clean install \
+mvn-rpmbuild install \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
- -Dmaven.local.mode=true
+ -Dmaven.local.mode=true -Dtycho.local.keepTarget
pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{_arch}
@@ -427,7 +424,7 @@ 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.pde.feature.group
+ -installIU org.eclipse.sdk.feature.group
popd
mkdir -p sdk/plugins sdk/features
@@ -913,6 +910,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/*
%changelog
+* Tue Aug 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-10
+- Adopt upstream CBI system.
+
* Tue Jul 17 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-4
- Bug 839986 - eclipse-rcp: broken symlinks
diff --git a/sources b/sources
index ef70804..9d6b5b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
cb058e425a067773e648a78d4e3ada27 eclipse-source.tar.bz2
-217623d9468096a76f4955e5307a0410 eclipse-jdtpdeupdatesite.tar.bz2
+d507c90f00c1fa6eac988138514e2e6f eclipse-jdtpdeupdatesite.tar.bz2
More information about the scm-commits
mailing list