Re-introduce and update bootstrapping capability.

eclipse.spec

@@ -2,6 +2,12 @@
 %{!?scl:%global pkg_name %{name}}
 %{!?scl:%global _scl_root %{nil}}
 
+# Set to 1 to build Eclipse without dependency to eclipse-pde
+# Some parts (help) will not be built, and second run will be required,
+# but this is a way to bootstrap Eclipse on secondary archs.
+%global bootstrap       0
+
+
 Epoch:                  1
 
 %global eclipse_major   4
@@ -188,7 +194,9 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
 BuildRequires: maven-deploy-plugin
 BuildRequires: httpcomponents-core
 BuildRequires: httpcomponents-client
+%if ! %{bootstrap}
 BuildRequires: eclipse-pde
+%endif
 
 %description
 The Eclipse platform is designed for building integrated development
@@ -427,8 +435,13 @@ done
 cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
 %{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins}
 %{?scl: cp %{_javadir}/*sat4j* .m2/p2/repo-sdk/plugins}
+%if ! %{bootstrap}
 cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_* .m2/p2/repo-sdk/plugins/
 cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo-sdk/plugins/
+%else
+# Use org.eclipse.tycho:org.eclipse.jdt.core (ecj)
+sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
+%endif
 
 %pom_remove_plugin  org.mortbay.jetty:jetty-jspc-maven-plugin  eclipse.platform.ua/org.eclipse.help.webapp
 %pom_remove_plugin  org.eclipse.tycho:tycho-compiler-plugin rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent
@@ -445,20 +458,27 @@ pushd eclipse.platform.swt.binaries/bundles/
 popd
 
 sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+
 %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}"
 export JAVA_HOME=%{java_home}
 
+
+%if ! %{bootstrap}
 pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
     xmvn -o clean verify \
     -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
     -Dtycho.local.keepTarget -Dmaven.repo.local=../../../.m2
 popd
+%endif
 
 export GTK_VERSION=3.0
 xmvn -o clean verify -P update-branding-plugins \
+%if %{bootstrap}
+   -P !api-generation,!build-docs \
+%endif
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
    -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."`
 
@@ -991,6 +1011,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Jan 24 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.3.1-18
+- Re-introduce and update bootstrapping capability.
+
 * Fri Jan 17 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.3.1-17
 - Rebuild for Jetty 9.1.1.