kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Code Activity

Merge changes from the master branch

Browse Source
This commit is contained in:
Daniel Martí 2013-08-08 13:02:11 +02:00
parent ece2ece071
commit 1d046790bb
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
buildserver/cookbooks/android-sdk/recipes/default.rb
View File

@ -23,27 +23,30 @@ execute "add-android-sdk-path" do
not_if "grep #{sdk_loc} /home/#{user}/.bashrc"
end
script "add_build_tools" do
interpreter "bash"
user user
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/17.0.0.tar.gz ] ; then
echo Installing from cache
tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/17.0.0.tar.gz
else
#{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-17.0.0 <<X
%w{17.0.0 18.0.1}.each do |ver|
script "add_build_tools_#{ver}" do
interpreter "bash"
user user
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
echo Installing from cache
mkdir #{sdk_loc}/build-tools
tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/#{ver}.tar.gz
else
#{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-#{ver} <<X
y
X
fi
"
not_if "test -d #{sdk_loc}/build-tools/17.0.0"
fi
"
not_if "test -d #{sdk_loc}/build-tools/#{ver}"
end
end
%w{android-3 android-4 android-7 android-8 android-10 android-11
android-12 android-13 android-14 android-15 android-16 android-17
android-12 android-13 android-14 android-15 android-16 android-17 android-18
extra-android-support}.each do |sdk|
script "add_sdk_#{sdk}" do