diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch index 06985de..f909f5c 100644 --- a/eclipse-change-build-packagings.patch +++ b/eclipse-change-build-packagings.patch @@ -1,50 +1,3 @@ ---- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2014-03-12 12:17:01.623708316 +0000 -@@ -50,7 +50,7 @@ - SDKProfile - - -- org.eclipse.platform.ide -+ org.fedoraproject.eclipse.platform - eclipse - - ---- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig 2014-03-12 12:17:01.624708315 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2014-03-12 12:54:18.543754231 +0000 -@@ -1,7 +1,7 @@ - - - -- -+ - - - ---- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2014-03-12 12:17:01.625708314 +0000 -@@ -34,5 +34,6 @@ - sdk - eclipse-junit-tests - eclipse.platform.repository -+ jdtpde - - ---- eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml.orig 2014-03-25 11:20:26.959967304 +0000 -+++ eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml 2014-03-25 11:20:41.710980911 +0000 -@@ -17,11 +17,11 @@ - - org.eclipse - eclipse-platform-parent -- 4.3.0-SNAPSHOT -+ 4.4.0-SNAPSHOT - ../../eclipse-platform-parent - - - org.eclipse.jdt.update-site -- 4.3.0-SNAPSHOT -+ 4.4.0-SNAPSHOT - eclipse-repository - --- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100 +++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100 @@ -19,7 +19,7 @@ @@ -65,19 +18,75 @@ ---- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml.orig 2014-04-16 13:31:33.300795779 +0100 -+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml 2014-04-16 13:31:41.995647371 +0100 -@@ -132,13 +132,6 @@ - version="0.0.0"/> - - +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2014-04-22 19:03:17.404382093 +0100 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2014-04-22 19:08:40.599989429 +0100 +@@ -4,33 +4,21 @@ + id="org.eclipse.sdk.tests" + version="0.0.0" /> + +- + + +- + +- + + +- + p2-metadata + + - -- +- ${project.baseUri}/../rcp/target/repository +- p2 +- +- +- +- ${project.baseUri}/../rcp.sdk/target/repository +- p2 +- +- + + ${project.baseUri}/../platform/target/repository + p2 + + + +- ${project.baseUri}/../platform.sdk/target/repository +- p2 +- +- +- +- ${project.baseUri}/../sdk/target/repository +- p2 +- +- +- + ${project.baseUri}/../eclipse-junit-tests/target/repository + p2 + diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index e77022d..64c9676 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -140,6 +140,21 @@ +--- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml.orig 2014-04-23 15:44:51.755422154 +0100 ++++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml 2014-04-23 15:45:22.730893380 +0100 +@@ -39,11 +39,9 @@ + + + +- + + + --- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.bak 2013-03-14 11:18:11.000000000 +0100 +++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2013-03-14 13:00:08.498377327 +0100 @@ -11,31 +11,12 @@ diff --git a/eclipse.spec b/eclipse.spec index 7b0e906..659e538 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -15,10 +15,9 @@ Epoch: 1 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} %global eclipse_micro 0 %global initialize 1 -%global eb_commit 7923630a54ee16ba70e90b11ac3184cab5f306fb +%global eb_commit 718530cb80abfabdebe3d2ea19d0e842dc1dd314 %global eclipse_tag I20140422-0800 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} -%global installation_loc %{_libdir}/%{pkg_name} %global _jetty_version 9.1.3 %{?scl:%global _jetty_version 8} @@ -44,7 +43,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.12.git201404220800%{?dist} +Release: 0.13.git201404220800%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -63,8 +62,8 @@ Patch0: %{pkg_name}-help-doc-adjust-dependencies.patch # +org.apache.geronimo.specs.geronimo-annotation_1.1_spec Patch1: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch -# Eclipse should not duplicate dependency sources (which are delivered -# by those dependencies packages). +# Eclipse should not include source for dependencies that are not supplied by this package +# and should not include source for bundles that are not relevant to our platform Patch2: %{pkg_name}-no-source-for-dependencies.patch # This has too many dependencies. We will not build it. @@ -177,6 +176,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin) BuildRequires: maven-deploy-plugin BuildRequires: httpcomponents-core BuildRequires: httpcomponents-client +BuildRequires: mockito %if ! %{bootstrap} BuildRequires: eclipse-pde %endif @@ -190,7 +190,6 @@ everything in between. %package swt Summary: SWT Library for GTK+ Group: Development/Tools -# %%{_libdir}/java directory owned by jpackage-utils Requires: java >= 1:1.7.0 Requires: jpackage-utils Requires: gtk2 @@ -328,14 +327,12 @@ tar --strip-components=1 -xf %{SOURCE1} %pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module eclipse.platform.repository eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles - %pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles @@ -349,13 +346,15 @@ tar --strip-components=1 -xf %{SOURCE1} %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2 %pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng -%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng %pom_disable_module bundles/org.eclipse.equinox.p2.tests.discovery rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 %pom_disable_module org.eclipse.ua.tests eclipse.platform.ua +# We don't need releng tools +%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng +%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng + # We don't need support for Eclipse 2.x style plugins %pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework %pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework @@ -397,6 +396,21 @@ for dir in eclipse.platform.swt.binaries/bundles \ utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le done +# Don't mirror stuff to the repo that we haven't built +%pom_xpath_remove "pom:execution[pom:id[text()='mirror-org.eclipse.rcp']]" \ + eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository +%pom_xpath_remove "pom:execution[pom:id[text()='mirror-org.eclipse.rcp.source']]" \ + eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository +%pom_xpath_remove "pom:execution[pom:id[text()='mirror-org.eclipse.releng.tools']]" \ + eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository + +# Remove the SWT build sections from every linux arch that is not currently being built +# (this is not really necessary but further reduces the build time on arm by around 20 +# minutes per architecture that we are not currently building, over 2.5 hours in total) +for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt.gtk.linux.(?!%{eclipse_arch})'` ; do + %pom_xpath_remove "/pom:project/pom:build" eclipse.platform.swt.binaries/bundles/$b +done + #hack - there should be a patch providing a profile for each arch mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch} @@ -462,19 +476,19 @@ xmvn -o clean verify \ #symlink necessary plugins (that are provided by other packages) dependencies/replace_platform_plugins_with_symlinks.sh \ - eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir} #ant again -./dependencies/./fake_ant_dependency.sh \ - eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* /usr/share/java \ - /usr/bin +dependencies/fake_ant_dependency.sh \ + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* \ + /usr/share/java /usr/bin # JDT and PDE are built as update sites. # Initialize them and move into dropins. -utils/./move_JDT_PDE_to_dropins.sh \ -eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/ \ -`pwd`/eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository +utils/move_JDT_PDE_to_dropins.sh \ + eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/ \ + `pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository -pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse +pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse # This is a temporary hack # We offer javax.servlet and javax.servlet-api as the same bundle @@ -533,18 +547,26 @@ popd #eclipse %install -#install icons +# Some directories we need +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir} +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} +install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}/dropins +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -d -m 755 $RPM_BUILD_ROOT%{_bindir} + +# Install icons install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \ $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{?scl_prefix}eclipse.png install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \ $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{?scl_prefix}eclipse.png install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \ $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -ln -s /usr/share/icons/hicolor/256x256/%{?scl_prefix}apps/eclipse.png \ +install -d $RPM_BUILD_ROOT/usr/share/pixmaps +ln -s /usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png \ $RPM_BUILD_ROOT/usr/share/pixmaps/%{?scl_prefix}eclipse.png -#desktop file +# Install desktop file and app data %{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop} %{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktopintegration/eclipse.desktop} %{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop} @@ -552,35 +574,28 @@ install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applicat install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop -# Some directories we need -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} -install -d -m 755 $RPM_BUILD_ROOT%{_scl_root}/usr/share/%{pkg_name}/dropins -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -d -m 755 $RPM_BUILD_ROOT%{_scl_root}%{_bindir} - ################################# ### Extraced from old build.xml # ################################# LOCAL_PWD=`pwd` #change the installation p2 files -pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ +pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ for i in `ls | grep "profile.gz"` ; do \ echo $i ; \ gunzip $i ; \ - sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse@%{_libdir}/eclipse@g" *.profile ; \ + sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse@%{_libdir}/eclipse@g" *.profile ; \ gzip *.profile ; \ done popd #installation itself - copy it into right location -rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse \ +rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse \ $RPM_BUILD_ROOT%{_libdir} #eclipse compiler install -m 755 jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_bindir}/efj -TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*` +TARGET_LAUNCHER=%{_libdir}/%{pkg_name}/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*` sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_bindir}/efj #eclipse binary @@ -636,16 +651,13 @@ done # eclipse platform. cp -p pdebuildscripts/eclipse-copy-platform.sh copy-platform sed -i -e "s|@DATADIR@|%{_datadir}|g" copy-platform - -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts # Install the PDE Build wrapper script. install -p -D -m0755 pdebuildscripts/eclipse-pdebuild.sh \ $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins \ - | grep org.eclipse.pde.build_ | \ - sed 's/org.eclipse.pde.build_//') + | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//') sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild sed -i "s|@LIBDIR@|%{_libdir}|g" \ @@ -740,7 +752,7 @@ fi %config %{_libdir}/%{pkg_name}/eclipse.ini %config %{_sysconfdir}/eclipse.ini /usr/share/applications/* -/usr/share/pixmaps/ +/usr/share/pixmaps/* /usr/share/icons/*/*/apps/* /usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml %{_libdir}/%{pkg_name}/eclipse @@ -973,6 +985,12 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Thu Apr 24 2014 Mat Booth - 1:4.4.0-0.13.git201404220800 +- Drop the use of custom jdtpde repository build from e-b +- Don't use a custom product ID +- Add BR on mockito +- Fix pixmaps directory ownership + * Tue Apr 22 2014 Mat Booth - 1:4.4.0-0.12.git201404220800 - Update to latest I-build of Luna 4.4.0 - Enable Java 8 specific bundles diff --git a/sources b/sources index 73209ca..c63ac91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ed5ba30c72af1eedd895399c9cf8f463 org.eclipse.linuxtools.eclipse-build-7923630a54ee16ba70e90b11ac3184cab5f306fb.tar.bz2 9dac4d5949b3fe0e8f37db78c9e2c9e2 R4_platform-aggregator-I20140422-0800.tar.xz +89f46935ac71012a6bce13b2fe3c25c4 org.eclipse.linuxtools.eclipse-build-718530cb80abfabdebe3d2ea19d0e842dc1dd314.tar.bz2