mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-12 18:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install Java 1.8 alongside 1.7 for retrolambda

Browse source 
Fixes #103.
This commit is contained in:
Daniel Martí 2015-09-03 21:44:59 -07:00
parent 6812390e39
commit a4d1fa22f7
4 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildserver/config.buildserver.py
View file

@ -3,3 +3,7 @@ ndk_paths = {
'r9b': "/home/vagrant/android-ndk/r9b",
'r10e': "/home/vagrant/android-ndk/r10e",
}
java_paths = {
'1.7': "/usr/lib/jvm/java-7-openjdk",
'1.8': "/usr/lib/jvm/java-8-openjdk",
}

6
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View file

@ -10,7 +10,7 @@ execute "apt-get-update" do
command "apt-get update"
end
%w{ant ant-contrib autoconf autoconf2.13 automake1.11 autopoint bison bzr cmake curl expect faketime flex gettext git-core git-svn gperf graphviz imagemagick inkscape javacc libarchive-zip-perl liblzma-dev librsvg2-bin libsaxonb-java libssl-dev libssl1.0.0 libtool make maven mercurial nasm openjdk-7-jdk optipng pandoc perlmagick pkg-config python python-yaml python-gnupg python-magic python-setuptools python3-gnupg quilt realpath scons subversion swig texinfo transfig unzip vorbis-tools xsltproc yasm zip}.each do |pkg|
%w{ant ant-contrib autoconf autoconf2.13 automake1.11 autopoint bison bzr cmake curl expect faketime flex gettext git-core git-svn gperf graphviz imagemagick inkscape javacc libarchive-zip-perl liblzma-dev librsvg2-bin libsaxonb-java libssl-dev libssl1.0.0 libtool make maven mercurial nasm openjdk-7-jdk openjdk-8-jdk optipng pandoc perlmagick pkg-config python python-yaml python-gnupg python-magic python-setuptools python3-gnupg quilt realpath scons subversion swig texinfo transfig unzip vorbis-tools xsltproc yasm zip}.each do |pkg|
package pkg do
action :install
end
@ -35,4 +35,8 @@ execute "add-bsenv" do
not_if "grep bsenv /home/#{user}/.bashrc"
end
execute "set-default-java" do
user user
command "update-java-alternatives --set java-7-openjdk"
end