From 006e8d853feec736811b1b160ac681113ab3edc9 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Dec 20 2019 04:03:07 +0000 Subject: Full build Drop tests sub-package --- diff --git a/eclipse.spec b/eclipse.spec index 8a46a44..abc56bd 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,10 +1,10 @@ # Set to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%bcond_without bootstrap +%bcond_with bootstrap -# Set this to avoid building contributor tools and tests -%bcond_with contrib_tools +# Set this to avoid building contributor tools +%bcond_without contrib_tools Epoch: 1 @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.14 -Release: 1%{?dist} +Release: 2%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -212,7 +212,7 @@ BuildRequires: osgi(osgi.annotation) # For building docs and apitooling BuildRequires: eclipse-pde %if %{with contrib_tools} -# For contributor tools and tests +# For contributor tools BuildRequires: eclipse-egit BuildRequires: eclipse-emf-runtime BuildRequires: mockito >= 2.23.9 @@ -349,6 +349,8 @@ installer UIs. %if %{without bootstrap} && %{with contrib_tools} %package contributor-tools Summary: Tools for Eclipse Contributors +# No longer shipping tests +Obsoletes: %{name}-tests < 1:4.14-2 Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: easymock @@ -358,14 +360,6 @@ Requires: mockito >= 2.23.9 %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. - -%package tests -Summary: Eclipse Tests - -Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release} - -%description tests -Eclipse Tests. %endif %prep @@ -418,9 +412,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ # Optional (unused) multipart support (see patch 25) rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java -# Remove python-based test -rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py - # No strict bin includes sed -i -e '/jgit.dirtyWorkingTree>/afalsefalse' eclipse-platform-parent/pom.xml @@ -488,20 +479,26 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom %pom_disable_module examples/org.eclipse.compare.examples eclipse.platform.team %pom_disable_module examples/org.eclipse.compare.examples.xml eclipse.platform.team %pom_disable_module examples/org.eclipse.team.examples.filesystem eclipse.platform.team +%pom_disable_module org.eclipse.jface.text.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua %pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua -# Except for this one example, which is used by tests -%pom_xpath_inject "pom:modules" "examples/org.eclipse.jface.examples.databinding" eclipse.platform.ui + +# Disable tests +for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui{,/apitools} \ + eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ + eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ + rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do + sed -i -e '/.*tests.*<\/module>/d' $pom/pom.xml +done +%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 +%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder # Disable servletbridge stuff %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles -# Missing dep on reddeer -%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui - # Don't need enforcer on RPM builds %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent @@ -518,7 +515,6 @@ done # we are not currently building) TYCHO_ENV="linuxgtk%{eclipse_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent -%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :) @@ -548,7 +544,6 @@ for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core. module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :) if [ -n "$module" ] ; then %pom_disable_module bundles/$b eclipse.platform.resources - %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml fi done %pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug @@ -572,10 +567,6 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \ done done -# We don't need SWT fragments since we only care for current arch -%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt -%pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk} - %if %{with bootstrap} || %{without contrib_tools} # Disable contributor tools that have external dependencies during bootstrap %pom_disable_module eclipse.platform.ui.tools @@ -585,21 +576,11 @@ done %pom_disable_module bundles/org.eclipse.swt.tools eclipse.platform.swt %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng -# Disable tests for bootstrapping %pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng %pom_disable_module bundles/org.eclipse.test eclipse.platform.releng %pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng %pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng %pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng -for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui{,/apitools} \ - eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ - eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ - rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do - sed -i -e '/.*tests.*<\/module>/d' $pom/pom.xml -done -%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 -%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module examples/org.eclipse.jface.examples.databinding eclipse.platform.ui %endif # Include some extra features with the product that some other projects may need at @@ -665,10 +646,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. # The order of these mvn_package calls is important %mvn_package "::pom::" __noinstall -%mvn_package ":*tests*" tests -%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests -%mvn_package ":org.eclipse.jface.examples.databinding" tests -%mvn_package ":org.eclipse.pde.tools.versioning" tests +%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools %mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools %mvn_package "::jar:sources{,-feature}:" sdk %mvn_package ":org.eclipse.jdt.doc.isv" sdk @@ -877,21 +855,6 @@ pushd %{buildroot}/%{_eclipsedir}/ ln -s $(abs2rel %{_jnidir}/swt.jar %{_eclipsedir}) popd -%if %{without bootstrap} && %{with contrib_tools} -# Tests framework -unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \ - -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh -cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing -rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip - -# These properties are not correct and nested properties won't get resolved -sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties - -# Package testbundle-to-eclipse-test -cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle -mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles -%endif - #fix so permissions find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; @@ -1097,10 +1060,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %if %{without bootstrap} && %{with contrib_tools} %files contributor-tools -f .mfiles-contributor-tools - -%files tests -f .mfiles-tests -%{_bindir}/eclipse-runTestBundles -%{_datadir}/eclipse-testing %endif %files equinox-osgi -f .mfiles-equinox-osgi @@ -1110,6 +1069,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Dec 19 2019 Mat Booth - 1:4.14-2 +- Full build +- Drop tests sub-package + * Thu Dec 19 2019 Mat Booth - 1:4.14-1 - Update to latest upstream release