Update for latest I-build
- New sub-package for contributor-tools - Unbundle osgi.annotations compile time dep - Rebuild for new eclipse-ecf/httpcomponents - Revert "Use better AppData screenshots" this is fixed upstream - Update eclipse-build snapshot
This commit is contained in:
parent
f652cb09ba
commit
ba42d1328a
|
@ -18,9 +18,9 @@
|
|||
|
||||
|
||||
|
||||
--- 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,24 +4,15 @@
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2015-03-31 10:28:54.530277349 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2015-03-31 10:29:46.232519773 +0100
|
||||
@@ -4,18 +4,12 @@
|
||||
id="org.eclipse.sdk.tests"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
|
@ -39,14 +39,18 @@
|
|||
id="org.eclipse.sdk.examples.source"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
- id="org.eclipse.releng.tools"
|
||||
- version="0.0.0" />
|
||||
- <feature
|
||||
@@ -25,9 +19,6 @@
|
||||
id="org.eclipse.swt.tools.feature"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
@@ -31,9 +22,6 @@
|
||||
id="org.eclipse.sdk"
|
||||
- id="org.eclipse.rcp.configuration"
|
||||
- version="0.0.0" />
|
||||
- <feature
|
||||
id="org.eclipse.equinox.executable"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
@@ -37,9 +28,6 @@
|
||||
id="org.eclipse.e4.core.tools.feature"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
- id="org.eclipse.osgi.compatibility.plugins.feature"
|
||||
|
|
|
@ -447,7 +447,7 @@ diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/ecl
|
|||
index a8177c3..cd99e8a 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
|
||||
+++ b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
|
||||
@@ -18,16 +18,15 @@ Require-Bundle: org.junit,
|
||||
@@ -18,15 +18,14 @@
|
||||
org.eclipse.ui.intro.universal,
|
||||
org.eclipse.ui.forms,
|
||||
org.eclipse.ui.browser;bundle-version="3.2.300",
|
||||
|
@ -457,7 +457,6 @@ index a8177c3..cd99e8a 100644
|
|||
org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: Eclipse.org
|
||||
Bundle-ClassPath: ua-tests.jar
|
||||
Import-Package: javax.servlet;version="2.4.0",
|
||||
- javax.servlet.http;version="2.4.0",
|
||||
- org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
|
||||
|
|
87
eclipse.spec
87
eclipse.spec
|
@ -1,19 +1,18 @@
|
|||
%{?scl:%scl_package eclipse}
|
||||
%{!?scl:%global pkg_name %{name}}
|
||||
|
||||
# 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.
|
||||
# Set to 1 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.
|
||||
%global bootstrap 0
|
||||
|
||||
|
||||
Epoch: 1
|
||||
|
||||
%global eclipse_major 4
|
||||
%global eclipse_minor 5
|
||||
%global eclipse_micro 0
|
||||
%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
|
||||
%global eclipse_tag I20150317-2000
|
||||
%global eb_commit 0d6b8462556b99e3cd5abec65595efbcf37707d2
|
||||
%global eclipse_tag I20150331-0800
|
||||
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||
%global _jetty_version 9.2.9
|
||||
|
||||
|
@ -38,7 +37,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 0.9.git201503172000%{?dist}
|
||||
Release: 0.10.git201503310800%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
|
@ -168,21 +167,26 @@ BuildRequires: atinject >= 1-18
|
|||
BuildRequires: atinject-tck >= 1-18
|
||||
BuildRequires: tycho >= 0.22
|
||||
BuildRequires: tycho-extras >= 0.22
|
||||
BuildRequires: eclipse-ecf-core >= 3.9.2-2
|
||||
BuildRequires: cbi-plugins
|
||||
BuildRequires: ecj >= 4.4.2-1
|
||||
BuildRequires: eclipse-ecf-core >= 3.9.3-1
|
||||
BuildRequires: eclipse-emf-core >= 1:2.10.2-1
|
||||
BuildRequires: eclipse-license
|
||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||
BuildRequires: glassfish-jsp >= 2.2.5
|
||||
BuildRequires: glassfish-servlet-api >= 3.1.0
|
||||
BuildRequires: cbi-plugins
|
||||
BuildRequires: xml-maven-plugin
|
||||
BuildRequires: httpcomponents-core >= 4.4-1
|
||||
BuildRequires: httpcomponents-client >= 4.4-1
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: httpcomponents-core >= 4.4.1-1
|
||||
BuildRequires: httpcomponents-client >= 4.4.1-1
|
||||
BuildRequires: mockito
|
||||
BuildRequires: osgi(osgi.annotation)
|
||||
%if ! %{bootstrap}
|
||||
# Build deps that are excluded when bootstrapping
|
||||
BuildRequires: eclipse-pde
|
||||
# Build deps needed for contributor tools
|
||||
BuildRequires: eclipse-egit
|
||||
BuildRequires: eclipse-emf-runtime
|
||||
%endif
|
||||
BuildRequires: eclipse-license
|
||||
|
||||
%description
|
||||
The Eclipse platform is designed for building integrated development
|
||||
|
@ -235,7 +239,7 @@ Requires: batik-css >= 1.8-0.17
|
|||
Requires: xml-commons-apis >= 1.4.01-12
|
||||
Requires: atinject >= 1-18
|
||||
Requires: geronimo-annotation >= 1.0-7
|
||||
Requires: eclipse-ecf-core >= 3.9.2-2
|
||||
Requires: eclipse-ecf-core >= 3.9.3-1
|
||||
Requires: eclipse-emf-core >= 1:2.10.2-1
|
||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||
Requires: glassfish-jsp >= 2.2.5
|
||||
|
@ -243,8 +247,8 @@ Requires: glassfish-servlet-api >= 3.1.0
|
|||
Requires: %{?scl_prefix}icu4j >= 1:54.1.1-2
|
||||
Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
|
||||
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
|
||||
Requires: httpcomponents-core >= 4.4-1
|
||||
Requires: httpcomponents-client >= 4.4-1
|
||||
Requires: httpcomponents-core >= 4.4.1-1
|
||||
Requires: httpcomponents-client >= 4.4.1-1
|
||||
%{?scl:Requires: %scl_runtime}
|
||||
Obsoletes: %{name}-rcp < 1:4.3.0
|
||||
Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
|
||||
|
@ -279,7 +283,6 @@ developing Eclipse plugins.
|
|||
|
||||
%package p2-discovery
|
||||
Summary: Eclipse p2 Discovery
|
||||
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
|
||||
Obsoletes: %{name}-p2-discovery < 1:4.4.0
|
||||
|
||||
%description p2-discovery
|
||||
|
@ -288,6 +291,13 @@ p2 provisioning platform. Discovery can be used as a tool to display and
|
|||
install from existing P2 repositories or as a framework to build branded
|
||||
installer UIs.
|
||||
|
||||
%package contributor-tools
|
||||
Summary: Tools for Eclipse Contributors
|
||||
|
||||
%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}-pde = %{epoch}:%{eclipse_version}-%{release}
|
||||
|
@ -356,11 +366,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
|
||||
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
|
||||
|
||||
# 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
|
||||
|
@ -401,6 +406,9 @@ done
|
|||
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
|
||||
%pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt
|
||||
|
||||
# This plugin is already specified in the parent pom
|
||||
%pom_remove_plugin "org.eclipse.tycho:tycho-packaging-plugin" eclipse.platform.ui.tools
|
||||
|
||||
# This part generates secondary fragments using primary fragments
|
||||
for dir in eclipse.platform.swt.binaries/bundles \
|
||||
rt.equinox.framework/bundles rt.equinox.binaries ; do
|
||||
|
@ -422,8 +430,6 @@ sed -i -e '169i<feature id="org.eclipse.core.runtime.feature"/>' \
|
|||
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
|
||||
|
||||
# Since Tycho 0.22.0 resources get copied into generated eclipse-repository.
|
||||
# We place some content in ${project.build.directory} and use that to place
|
||||
|
@ -468,11 +474,6 @@ 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
|
||||
|
||||
%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
|
||||
|
||||
# Allow usage of javax.servlet.jsp 2.3.
|
||||
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
||||
|
||||
|
@ -494,6 +495,11 @@ sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.plat
|
|||
sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
|
||||
%endif
|
||||
|
||||
# Use system osgi.annotation lib
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
|
||||
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/
|
||||
|
||||
%build
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
|
@ -518,7 +524,7 @@ dependencies/fake_ant_dependency.sh \
|
|||
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 \
|
||||
"jdt cvs equinox.p2.discovery.feature sdk"
|
||||
"jdt cvs equinox.p2.discovery.feature swt.tools.feature releng.tools e4.core.tools.feature sdk"
|
||||
|
||||
# Symlink necessary plugins that are provided by other packages
|
||||
dependencies/replace_platform_plugins_with_symlinks.sh \
|
||||
|
@ -607,15 +613,6 @@ install -m644 -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT%{_d
|
|||
install -m644 -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-jdt.metainfo.xml
|
||||
install -m644 -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-pde.metainfo.xml
|
||||
|
||||
# Update the screenshot shown in the software center
|
||||
#
|
||||
# NOTE: It would be *awesome* if this file was pushed upstream.
|
||||
#
|
||||
# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
|
||||
#
|
||||
appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse.appdata.xml \
|
||||
https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/eclipse/a.png
|
||||
|
||||
#################################
|
||||
### Extraced from old build.xml #
|
||||
#################################
|
||||
|
@ -1013,6 +1010,10 @@ fi
|
|||
%files p2-discovery
|
||||
%{_libdir}/%{pkg_name}/dropins/equinox.p2.discovery.feature
|
||||
|
||||
%files contributor-tools
|
||||
%{_libdir}/%{pkg_name}/dropins/swt.tools.feature
|
||||
%{_libdir}/%{pkg_name}/dropins/releng.tools
|
||||
|
||||
%files tests
|
||||
%{_bindir}/%{pkg_name}-runEclipsePackageTests
|
||||
%{_bindir}/%{pkg_name}-runTestBundles
|
||||
|
@ -1026,6 +1027,14 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Tue Mar 31 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.10.git201503310800
|
||||
- Update for latest I-build
|
||||
- New sub-package for contributor-tools
|
||||
- Unbundle osgi.annotations compile time dep
|
||||
- Rebuild for new eclipse-ecf/httpcomponents
|
||||
- Revert "Use better AppData screenshots" this is fixed upstream
|
||||
- Update eclipse-build snapshot
|
||||
|
||||
* Tue Mar 31 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-0.9.git201503172000
|
||||
- Rebuild for eclipse-ecf update
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=I20150317-2000
|
||||
TAG=I20150331-0800
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
@ -21,9 +21,7 @@ rm -rf bootstrap streams scripts
|
|||
find . -type d -name ".git" | xargs rm -rf
|
||||
|
||||
# Delete pre-built binary artifacts
|
||||
# Note: osgi.annotation.jar contains the source for annotations used only at build-time
|
||||
# we don't actually ship it or it's contents with the platform
|
||||
find . -type f -name *.jar ! -name osgi.annotation.jar -delete
|
||||
find . -type f -name *.jar -delete
|
||||
find . -type f -name *.class -delete
|
||||
find . -type f -name *.so -delete
|
||||
find . -type f -name *.dll -delete
|
||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
|||
5ba2f92104250a33a76afebc760d49e0 R4_platform-aggregator-I20150317-2000.tar.xz
|
||||
1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2
|
||||
d3bdf45748f2229d6db96f51fd842bc3 org.eclipse.linuxtools.eclipse-build-0d6b8462556b99e3cd5abec65595efbcf37707d2.tar.bz2
|
||||
54aba473e15c70254418189df21df805 R4_platform-aggregator-I20150331-0800.tar.xz
|
||||
|
|
Loading…
Reference in New Issue