[eclipse/cbi] Successful local build!
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Aug 10 12:24:15 UTC 2012
commit 334c54ec08105d40a552263d64af71e1473431a2
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Aug 10 14:23:47 2012 +0200
Successful local build!
eclipse-no-source-for-dependencies.patch | 53 +++++++++++++++++++++++------
eclipse.spec | 21 +++++++----
2 files changed, 55 insertions(+), 19 deletions(-)
---
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 9876d29..1d2f7a5 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -447,10 +447,10 @@
<plugin id="org.eclipse.swt.gtk.aix.ppc64" />
<plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+
-+ <plugin id="org.w3c.dom.svg" />
-+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
-+ <plugin id=" org.apache.felix.gogo.command" />
-+ <plugin id="org.apache.felix.gogo.runtime" />
++ <plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
++ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
++ <plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>
++ <plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
+ <plugin id="org.apache.felix.gogo.shell" />
</excludes>
</configuration>
@@ -461,7 +461,7 @@
<excludes>
<plugin id="org.sat4j.core" />
<plugin id="org.sat4j.pb" />
-+ <plugin id="org.apache.commons.codec" />
++ <plugin id="org.apache.commons.codec" /><plugin id="org.apache.commons.httpclient" /><plugin id="org.apache.commons.logging" />
</excludes>
</configuration>
</execution>
@@ -473,15 +473,46 @@
</goals>
+ <configuration>
+ <excludes>
-+ <plugin id="javax.servlet" />
-+ <plugin id="javax.servlet.jsp" />
-+ <plugin id="org.apache.tomcat" />
-+ <plugin id="org.apache.juli" />
-+ <plugin id="org.eclipse.jetty.util" />
-+ <plugin id="org.apache.jasper" />
++ <plugin id="javax.servlet" /><plugin id="javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
++ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
++ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
++ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
++ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
++ <plugin id="org.apache.jasper" /><plugin id="org.eclipse.jetty.servlet" />
+ <plugin id="org.apache.commons.el" />
+ </excludes>
+ </configuration>
</execution>
</executions>
</plugin>
+--- 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,7 @@
+
+ <plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="org.eclipse.equinox.security.macosx"/>
++ <plugin id="com.jcraft.jsch"/>
+ </excludes>
+ </configuration>
+ </execution>
+--- 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 @@
+ <excludes>
+ <plugin id="org.eclipse.jdt" />
+ <plugin id="org.junit4" />
++ <plugin id="org.junit" />
++ <plugin id="org.hamcrest.core" />
+ <plugin id="org.eclipse.jdt.doc.user" />
+ </excludes>
+ </configuration>
+--- 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 @@
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.pde"/>
++ <plugin id="org.objectweb.asm"/>
+ <plugin id="org.eclipse.pde.doc.user"/>
+ </excludes>
+ </configuration>
diff --git a/eclipse.spec b/eclipse.spec
index 543bfd0..65fb99e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -143,6 +143,8 @@ BuildRequires: batik >= 1.8
BuildRequires: xml-commons-apis >= 1.4.01-6
BuildRequires: atinject >= 1-6
BuildRequires: tycho >= 0.16
+BuildRequires: eclipse-emf-core
+BuildRequires: eclipse-ecf-core
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@@ -200,6 +202,8 @@ 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
Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
Provides: eclipse-rcp = 1:%{eclipse_version}-%{release}
@@ -287,9 +291,7 @@ popd
%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
+%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/
@@ -366,18 +368,21 @@ sed -i -e "s/<module>rt.equinox.p2<\/module>/<module>rt.equinox.p2<\/module><mod
#sed -i -e "s/x86/x86_64/" eclipse.jdt.debug/org.eclipse.jdt.launching.macosx/pom.xml
%build
mvn-rpmbuild -f eclipse-parent/pom.xml \
- install \
+ clean install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget
mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
- install \
+ clean install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget
-mvn-rpmbuild install \
+#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
+#popd
-mvn-rpmbuild install \
+mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
-Dmaven.local.mode=true -Dtycho.local.keepTarget
@@ -689,7 +694,6 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/features/org.eclipse.emf.common_*
%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
%{_libdir}/%{name}/plugins/com.ibm.icu_*
-%{_libdir}/%{name}/plugins/org.apache.jasper.glassfish_*
%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*
%{_libdir}/%{name}/plugins/javax.servlet_*
@@ -712,6 +716,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_*
More information about the scm-commits
mailing list