Fix and enable bootstrap mode

This commit is contained in:
Mat Booth 2017-04-20 18:37:00 +01:00
parent 391b2d1640
commit 9b099d8bb9
2 changed files with 9 additions and 6 deletions

View File

@ -3,8 +3,8 @@
. $(pwd)/tycho-scripts.sh
eclipse_bootstrap=$1
preV='0.25.0'
v='0.25.0-SNAPSHOT'
preV=$2
v="$preV-SNAPSHOT"
osgiV='3.11.0.v20160419-1000'
fp2V='0.0.1-SNAPSHOT'
bundles=()

View File

@ -6,11 +6,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 0
%global tycho_bootstrap 1
# 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 0
%global eclipse_bootstrap 1
# When building version under development (non-release)
# %%global snap -SNAPSHOT
%global snap %{nil}
@ -25,7 +25,7 @@
Name: tycho
Version: 0.26.0
Release: 2%{?dist}
Release: 3%{?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
@ -243,7 +243,7 @@ popd
# Perform the 'minimal' (bootstrap) build of Tycho
cp %{SOURCE2} %{SOURCE3} .
./tycho-bootstrap.sh %{eclipse_bootstrap}
./tycho-bootstrap.sh %{eclipse_bootstrap} %{version}
%patch5 -p1 -R
@ -422,6 +422,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
* Thu Apr 20 2017 Mat Booth <mat.booth@redhat.com> - 0.26.0-3
- Fix and enable bootstrap mode
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild