From c4ff7ce75dd3179ad529747ba018cc721ccd7134 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Aug 27 2014 20:59:44 +0000 Subject: Build Eclipse bootstrapped. --- diff --git a/eclipse.spec b/eclipse.spec index dbd1b4e..5580d25 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -4,7 +4,7 @@ # 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 +%global bootstrap 1 Epoch: 1 @@ -455,13 +455,7 @@ done #fake dependencies that don't exist in fedora ./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar -cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/ -cp -r %{_javadir}/emf/eclipse/features/* .m2/p2/repo-sdk/features/ -cp -r %{_javadir}/ecf/eclipse/features/* .m2/p2/repo-sdk/features/ -%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 +%if %{bootstrap} # 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 @@ -498,6 +492,7 @@ xmvn -o clean verify \ -Declipse.javadoc=/usr/bin/javadoc \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \ -Dtycho.local.keepTarget -Ddirector.running.env.only=true \ + -Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins \ -Dtargets=install #ant again @@ -1013,6 +1008,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Aug 27 2014 Roland Grunberg - 1:4.4.0-15 +- Build Eclipse bootstrapped. + * Tue Aug 26 2014 Sami Wagiaalla - 1:4.4.0-15 - Build agianst webkitgtk4.