rpms/tycho
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respect %{eclipse_bootstrap} flag in tycho-bootstrap.sh.

Browse Source 
- Update Eclipse bootstrap cache.
- Fix Equinox Launcher usage logic in copy-platform-all.
This commit is contained in:
Roland Grunberg 2014-03-12 11:38:47 -04:00
parent 14f9989163
commit 5bfcd54870
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
copy-platform-all
View File

@ -14,7 +14,14 @@ jnidir=/usr/lib/java
launcher="/usr/lib*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
if [ ! -e ${launcher} ]; then
launcher="$(pwd)/tycho-bundles/tycho-bundles-external/target/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
launcher="$javadir/tycho/tycho-bundles-external.zip"
if [ -e ${launcher} ]; then
mkdir -p .tycho-runtime
unzip ${launcher} -d .tycho-runtime
launcher="$(pwd)/.tycho-runtime/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
else
launcher="$(pwd)/tycho-bundles/tycho-bundles-external/target/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
fi
fi
trap "rm -rf $sdk" 0
@ -63,19 +70,19 @@ pushd $sdk >/dev/null
fi
done
for p in $(ls -d $eclipse/dropins/jdt/plugins/*); do
for p in $(ls -d $eclipse/dropins/jdt/plugins/* 2>/dev/null); do
plugin=$(basename $p)
[ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/jdt/plugins/$plugin plugins/$plugin
done
for f in $(ls -d $eclipse/dropins/jdt/features/*); do
for f in $(ls -d $eclipse/dropins/jdt/features/* 2>/dev/null); do
feature=$(basename $f)
[ ! -e features/$feature ] && ln -s $eclipse/dropins/jdt/features/$feature features/$feature
done
for p in $(ls -d $eclipse/dropins/sdk/plugins/*); do
for p in $(ls -d $eclipse/dropins/sdk/plugins/* 2>/dev/null); do
plugin=$(basename $p)
[ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/sdk/plugins/$plugin plugins/$plugin
done
for f in $(ls -d $eclipse/dropins/sdk/features/*); do
for f in $(ls -d $eclipse/dropins/sdk/features/* 2>/dev/null); do
feature=$(basename $f)
[ ! -e features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature features/$feature
done

2
sources
View File

@ -1,2 +1,2 @@
012fd267fc85a6b3372acac6e4860e76 tycho-0.19.x.tar.bz2
a99482415dbbf43ff2f00e29b793c004 eclipse-bootstrap.tar.xz
9ddabf6744eb091413cb8671639521c4 eclipse-bootstrap.tar.xz

4
tycho-bootstrap.sh
View File

@ -53,7 +53,7 @@ function copyBundles () {
osgiLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib*/eclipse' )
if [ ! -e /usr/lib*/eclipse ]; then
if [ ${eclipse_bootstrap} -eq 1 ]; then
prefix="$(pwd)/bootstrap"
osgiLocations+=( ${osgiLocations[@]/#/${prefix}} )
fi
@ -130,6 +130,8 @@ echo ${bsn}
}
eclipse_bootstrap=$1
preV='0.19.0'
v='0.19.0-SNAPSHOT'
osgiV='3.9.1.v20131014-1715'

9
tycho.spec
View File

@ -19,7 +19,7 @@
Name: tycho
Version: 0.19.0
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@ -193,7 +193,7 @@ tar -xf %{SOURCE4}
%patch7 -p1
# Perform the 'minimal' (bootstrap) build of Tycho
%{SOURCE2}
%{SOURCE2} %{eclipse_bootstrap}
%patch7 -p1 -R
@ -334,6 +334,11 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
* Wed Mar 12 2014 Roland Grunberg <rgrunber@redhat.com> - 0.19.0-11
- Respect %%{eclipse_bootstrap} flag in tycho-bootstrap.sh.
- Update Eclipse bootstrap cache.
- Fix Equinox Launcher usage logic in copy-platform-all.
* Thu Mar 06 2014 Roland Grunberg <rgrunber@redhat.com> - 0.19.0-10
- Non-bootstrap build.