Non-bootstrap build against Eclipse Neon

This commit is contained in:
Mat Booth 2016-04-22 07:48:35 +01:00
parent 8b147e672d
commit ee2f4805ef
1 changed files with 8 additions and 5 deletions

View File

@ -8,11 +8,11 @@
# This basically uses javac + xmvn to build only the Tycho components
# required to perform a full Tycho build
# Most common usage : A library (in Fedora) used by Tycho's runtime broke API
%global tycho_bootstrap 1
%global tycho_bootstrap 0
# Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
# This basically provides a location for usage of pre-bundled Eclipse
# Possible uses : Need to build Tycho before Eclipse in fresh buildroot
%global eclipse_bootstrap 1
%global eclipse_bootstrap 0
# When building version under development (non-release)
# %%global snap -SNAPSHOT
%global snap %{nil}
@ -27,7 +27,7 @@
Name: %{?scl_prefix}tycho
Version: 0.25.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
# license file is missing but all files having some licensing information are ASL 2.0
@ -101,7 +101,7 @@ BuildRequires: sac
BuildRequires: sat4j
BuildRequires: xz-java
%else
BuildRequires: eclipse-platform >= 4.6.0
BuildRequires: eclipse-platform >= 1:4.6.0
%endif
BuildRequires: jetty-http
BuildRequires: jetty-util
@ -119,7 +119,7 @@ Requires: maven-verifier
Requires: objectweb-asm
Requires: ecj
%if ! %{eclipse_bootstrap}
Requires: eclipse-platform >= 4.6.0
Requires: eclipse-platform >= 1:4.6.0
%endif
# Tycho always tries to resolve all build plugins, even if they are
@ -428,6 +428,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
* Thu Apr 21 2016 Mat Booth <mat.booth@redhat.com> - 0.25.0-2
- Non-bootstrap build against Eclipse Neon
* Wed Apr 20 2016 Mat Booth <mat.booth@redhat.com> - 0.25.0-1
- Update to latest upstream release
- Full bootstrap mode due to incompatibility with Eclipse Mars