[eclipse/f19] - Drop org.eclipse.releng.* from build. - Drop p2 discovery tests from build. - Fix running tests.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Apr 8 11:05:12 UTC 2013
commit 2e32d44e6dfd0d4dd5e5a587b111cd9ee6b4cc7b
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Apr 8 13:05:05 2013 +0200
- Drop org.eclipse.releng.* from build.
- Drop p2 discovery tests from build.
- Fix running tests.
eclipse-remove-weaving.patch | 48 +++++++++++++++++++++--------------------
eclipse-test-support.patch | 21 +++++++++++++++++-
eclipse.spec | 16 +++++++++++--
3 files changed, 58 insertions(+), 27 deletions(-)
---
diff --git a/eclipse-remove-weaving.patch b/eclipse-remove-weaving.patch
index 0b2e894..5c66402 100644
--- a/eclipse-remove-weaving.patch
+++ b/eclipse-remove-weaving.patch
@@ -1,39 +1,41 @@
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2012-07-27 14:50:27.668209657 +0200
-@@ -351,12 +351,6 @@
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2013-04-04 12:20:00.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2013-04-08 11:01:33.236100147 +0200
+@@ -349,12 +349,6 @@
version="0.0.0"/>
<plugin
-- id="org.eclipse.equinox.region.tests"
+- id="org.eclipse.releng.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.equinox.security.tests"
- download-size="0"
- install-size="0"
-@@ -404,14 +398,14 @@
+ id="org.eclipse.team.tests.cvs.core"
download-size="0"
install-size="0"
+@@ -392,12 +386,6 @@
version="0.0.0"/>
--
-- <plugin
-+
-+ <plugin
- id="org.eclipse.equinox.bidi.tests"
+
+ <plugin
+- id="org.eclipse.equinox.region.tests"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+ id="org.eclipse.equinox.security.tests"
download-size="0"
install-size="0"
+@@ -416,12 +404,6 @@
version="0.0.0"/>
--
-- <plugin
-+
-+ <plugin
- id="org.eclipse.update.core"
- download-size="0"
- install-size="0"
-@@ -419,4 +413,3 @@
- unpack="false"/>
- </feature>
+ <plugin
+- id="org.eclipse.equinox.p2.tests.discovery"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
-
+- <plugin
+ id="org.eclipse.equinox.p2.tests.ui"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 6c5ee40..1333e19 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -73,13 +73,14 @@
# This file should never exist or be needed for production machine,
# but allows an easy way for a "local user" to provide this file
# somewhere on the search path ($HOME/bin is common),
-@@ -92,59 +159,29 @@
+@@ -92,59 +159,30 @@
#necessary when invoking this script through rsh
cd $dir
+ mkdir -p /tmp/eclipse-tests-directory
+ pushd /tmp/eclipse-tests-directory
+ rm -rf *
++ cp ${testslocation}/*.properties .
+
if [ ! -r eclipse ]
then
@@ -292,6 +293,24 @@
<antcall target="runSuite" />
<antcall target="genResults" />
</target>
+@@ -1221,7 +1221,7 @@
+
+ <target name="all">
+
+- <antcall target="markCurrentTime">
++ <!--antcall target="markCurrentTime">
+ <param
+ name="message"
+ value="start relEng" />
+@@ -1231,7 +1231,7 @@
+ <param
+ name="message"
+ value="end relEng" />
+- </antcall>
++ </antcall-->
+
+ <antcall target="markCurrentTime">
+ <param
@@ -1409,7 +1339,7 @@
<antcall target="e4CssSwt" />
<antcall target="e4UI" />
diff --git a/eclipse.spec b/eclipse.spec
index 878c7c4..afc24f5 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -51,7 +51,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.30%{?dist}
+Release: 0.31%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -311,6 +311,7 @@ Version: %{eclipse_version}
Summary: Eclipse Tests
Group: Development/Tools
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
+Requires: %{?scl_prefix}easymock
%description tests
Eclipse Tests.
@@ -374,6 +375,10 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module features/master-equinox eclipse.platform.releng
%pom_disable_module features/master eclipse.platform.releng
%pom_disable_module features/master-ecf eclipse.platform.releng
+%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.swt.gtk.aix.ppc eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc64 eclipse.platform.swt.binaries
@@ -699,7 +704,7 @@ popd
install -m 0644 externalpoms/org.eclipse.jdt.core-3.8.0.v_C03.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-jdt.core.pom
%add_maven_depmap JPP.eclipse-jdt.core.pom %{pkg_name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jetty.orbit:org.eclipse.jdt.core" -f jdt
# A sanity check.
-%{?!scl: desktop-file-validate %{buildroot}/%{_datadir}/applications/%{pkg_name}.desktop}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{pkg_name}.desktop
# Create a script that can be used to make a symlink tree of the
# eclipse platform.
@@ -765,7 +770,7 @@ fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-scl:fi
+fi
%pre jdt
# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher
@@ -1022,6 +1027,11 @@ scl:fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Mon Apr 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.31
+- Drop org.eclipse.releng.* from build.
+- Drop p2 discovery tests from build.
+- Fix running tests.
+
* Mon Apr 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.30
- Remove unused bootstrap flag.
More information about the scm-commits
mailing list