Fix pdebuild to auto-set javacSouce based on BREE.
This commit is contained in:
parent
a4bc15876d
commit
30afa67113
|
@ -99,6 +99,26 @@ function findFeatureNameAndVersion {
|
|||
featureVersion=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
|
||||
rm $buildFile
|
||||
}
|
||||
|
||||
function findMaxBREE {
|
||||
manifests=$(find $sourceDir -name MANIFEST.MF)
|
||||
maxBree=1.4
|
||||
for i in $manifests; do
|
||||
breeLine=$(cat $i|grep RequiredExecutionEnvironment|cut -c37-|sed 's/^ *\(.*\) *$/\1/')
|
||||
case $breeLine in
|
||||
"J2SE-1.5")
|
||||
bree=1.5
|
||||
;;
|
||||
"JavaSE-1.6")
|
||||
bree=1.6
|
||||
;;
|
||||
esac
|
||||
if [ "$bree" \> "$maxBree" ]; then
|
||||
maxBree=$bree
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
sourceDir=$PWD
|
||||
buildDir=$PWD/build
|
||||
SDK=$buildDir/SDK
|
||||
|
@ -236,6 +256,10 @@ if [ "x$zipDeps" != "x" ]; then
|
|||
thisURL=
|
||||
done
|
||||
fi
|
||||
if [ -z "$additionalArgs" ]; then
|
||||
findMaxBREE
|
||||
additionalArgs="-DjavacSource=$maxBree -DjavacTarget=$maxBree"
|
||||
fi
|
||||
|
||||
echo "Starting build:"
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
@ -1567,6 +1567,9 @@ fi
|
|||
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
||||
|
||||
%changelog
|
||||
* Mon Jan 19 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.4.1-13
|
||||
- Fix pdebuild to auto-set javacSouce based on BREE.
|
||||
|
||||
* Fri Dec 19 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-12
|
||||
- Fixed GCJ AOT compilation (Gary Benson).
|
||||
|
||||
|
|
Loading…
Reference in New Issue