[eclipse/cbi] Build in acceptable state (build Eclipse is usable, and has JDT and PDE in dropins).
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Aug 6 09:47:07 UTC 2012
commit fc35c148b1b515e321c5dba9ddb95007062b4924
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Aug 6 11:39:28 2012 +0200
Build in acceptable state (build Eclipse is usable, and has JDT and PDE
in dropins).
.gitignore | 1 +
eclipse.spec | 119 ++++++++++++++++++++++++++++++++++++++++------------------
sources | 1 +
3 files changed, 84 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47a0244..186de50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ 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.spec b/eclipse.spec
index ce51672..cf5c582 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 emf_version 2.8.0
# FIXME: update java packaging guidelines for this. See
# fedora-devel-java-list discussion in September 2008.
@@ -25,8 +25,8 @@ License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: eclipse-source.tar.bz2
-#Source1: %{download_url}eclipse-%{eclipse_version}-%{build_id}-src.tar.bz2
-Source4: macros.%{name}
+Source1: eclipse-jdtpdeupdatesite.tar.bz2
+#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
# Patched to remove fake parent
@@ -163,16 +163,16 @@ Requires: jpackage-utils
%description equinox-osgi
Eclipse OSGi - Equinox
-%package emf-core
-Version: %{emf_version}
-Summary: Eclipse Modeling Framework Core
-Group: Development/Languages
-Requires: java >= 1:1.7.0
-Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
-Conflicts: eclipse-emf < 2.8.0-0.5
+#%package emf-core
+#Version: %{emf_version}
+#Summary: Eclipse Modeling Framework Core
+#Group: Development/Languages
+#Requires: java >= 1:1.7.0
+#Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
+#Conflicts: eclipse-emf < 2.8.0-0.5
-%description emf-core
-Eclipse Modeling Framework Core
+#%description emf-core
+#Eclipse Modeling Framework Core
%package rcp
@@ -259,6 +259,10 @@ developing Eclipse plugins.
%prep
%setup %{SOURCE0} -n R4_platform-aggregator
+pushd TMP
+tar xf %{SOURCE1}
+popd
+
%patch0
%patch1
%patch2
@@ -345,6 +349,14 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch
#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/<id>org.eclipse.sdk.epp<\/id>/<id>org.fedoraproject.eclipse.platform<\/id>/" TMP/org.eclipse.sdk.epp/pom.xml
+sed -i -e "s/\"org.eclipse.sdk\"/\"org.eclipse.platform\"/" 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/<module>TMP\/org.eclipse.sdk.epp<\/module>/<module>TMP\/org.eclipse.sdk.epp<\/module><module>TMP\/jdtpde<\/module>/" pom.xml
+
%build
mvn-local -f eclipse-parent/pom.xml \
install \
@@ -365,26 +377,67 @@ mvn-local clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
-Dmaven.local.mode=true
-%install
+pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{_arch}
+
+######################
+# Extract jdt and pde to dropins
+######################
+#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
+
+mkdir -p jdt/plugins jdt/features
+
+
+#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
-pushd TMP/org.eclipse.sdk.epp/target/products/org.eclipse.sdk.epp/linux/gtk/%{_arch}/eclipse
+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`/../../../../../../repository \
- -installIU org.eclipse.platform \
- -destination $RPM_BUILD_ROOT/usr/%{_libdir}/eclipse \
- -profile PlatformProfile \
- -profileProperties org.eclipse.update.install.features=true \
- -bundlepool $RPM_BUILD_ROOT/usr/%{_libdir}/eclipse \
- -p2.os linux \
- -p2.ws gtk \
- -p2.arch %{_arch} \
- -roaming
+ -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
+ -installIU org.eclipse.pde.feature.group
+popd
+
+mkdir -p pde/plugins pde/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 pde/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 pde/plugins ; \
+ fi \
+done
+
+
+cp -r jdt pde eclipse/dropins
+
popd
-exit 0;
-export JAVA_HOME=%{java_home}
-ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
+%install
# We don't need icon.xpm
# https://bugs.eclipse.org/292472
@@ -539,14 +592,6 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/swt.jar
%{_libdir}/java/swt.jar
-%files -n eclipse-emf-core
-%{_libdir}/%{name}/features/org.eclipse.emf.common_*
-%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
-
%files rcp
%dir %{_libdir}/%{name}/features
%dir %{_datadir}/%{name}
diff --git a/sources b/sources
index 477b5f4..ef70804 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
cb058e425a067773e648a78d4e3ada27 eclipse-source.tar.bz2
+217623d9468096a76f4955e5307a0410 eclipse-jdtpdeupdatesite.tar.bz2
More information about the scm-commits
mailing list