From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 10 Oct 2013 14:30:11 +0000 (+0200)
Subject: Try to add maven support repo and ndk variables to recipes
X-Git-Tag: 0.1~364
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b315968b;p=fdroidserver.git

Try to add maven support repo and ndk variables to recipes
---

diff --git a/buildserver/cookbooks/android-ndk/recipes/default.rb b/buildserver/cookbooks/android-ndk/recipes/default.rb
index 57c423fd..6a759a74 100644
--- a/buildserver/cookbooks/android-ndk/recipes/default.rb
+++ b/buildserver/cookbooks/android-ndk/recipes/default.rb
@@ -1,5 +1,18 @@
 
 ndk_loc = node[:settings][:ndk_loc]
+user = node[:settings][:user]
+
+execute "add-android-ndk-path" do
+  user user
+  command "echo \"export PATH=\\$PATH:#{ndk_loc} #PATH-NDK\" >> /home/#{user}/.bsenv"
+  not_if "grep PATH-NDK /home/#{user}/.bsenv"
+end
+
+execute "add-android-ndk-var" do
+  user user
+  command "echo \"export ANDROID_NDK=#{ndk_loc}\" >> /home/#{user}/.bsenv"
+  not_if "grep ANDROID_NDK /home/#{user}/.bsenv"
+end
 
 script "setup-android-ndk" do
   timeout 14400
diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 222c14ea..1092990e 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -29,6 +29,17 @@ execute "add-android-home" do
   not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
 end
 
+execute "add-maven-support-repo" do
+  user user
+  command "echo \"
+<settings><activeProfiles><activeProfile>android</activeProfile></activeProfiles>
+<profiles><profile><id>android</id><repositories><repository><id>android-support-repository</id>
+<url>file:///opt/android/sdk/extras/android/m2repository/</url>
+</repository></repositories></profile></profiles></settings>
+\" > /home/#{user}/.m2/settings.xml"
+  not_if "grep m2repository /home/#{user}/.m2/settings.xml"
+end
+
 %w{17.0.0 18.0.1}.each do |ver|
 
   script "add_build_tools_#{ver}" do