From e73eb08388195d08717a83d21cc88342b6129b86 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 19 Oct 2014 17:36:19 +0200 Subject: [PATCH] MozStumbler: Try to fix build. --- metadata/org.mozilla.mozstumbler.txt | 21 ++++++++++++++++++++- srclibs/MozOsmDroid.txt | 2 ++ srclibs/SimpleKML.txt | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 srclibs/MozOsmDroid.txt create mode 100644 srclibs/SimpleKML.txt diff --git a/metadata/org.mozilla.mozstumbler.txt b/metadata/org.mozilla.mozstumbler.txt index 103dfbb6dd..79f42e07cc 100644 --- a/metadata/org.mozilla.mozstumbler.txt +++ b/metadata/org.mozilla.mozstumbler.txt @@ -106,10 +106,29 @@ Build:0.40.3.0,400300 gradle=yes Build:0.40.4.0,400400 - disable=untrusted repos commit=v0.40.4.0 gradle=yes subdir=android + srclibs=MozOsmDroid@4.3.1,SimpleKML@v1.0 + prebuild=sed -i \ + -e '/sonatype/d' \ + -e '/mavenCentral/amavenLocal()' \ + -e 's/http:\/\/mozilla-services.github.io\/ivy-repo/http:\/\/localhost' \ + -e '/fileTree/acompile "org.osmdroid:osmdroid-android:4.3-SNAPSHOT"' build.gradle && \ + sed -i -e '/fileTree/d' build.gradle && \ + $$MVN3$$ install:install-file \ + -DgroupId=android \ + -DartifactId=android \ + -Dversion=4.4.2_r3 \ + -Dpackaging=jar \ + -Dfile=$$SDK$$/platforms/android-19/android.jar && \ + pushd $$MozOsmDroid$$ && $$MVN3$$ install && popd && \ + cp -fR $$SimpleKML$$/SimpleKML ../ && \ + rm ../SimpleKML/libs/* && \ + sed -i -e '/libs\/simple-xml/acompile "org.simpleframework:simple-xml:2.6.3"' -e '/dependencies {/irepositories { mavenCentral() \n mavenLocal() \n }\n' ../SimpleKML/build.gradle && \ + sed -i -e '/libs\/simple-xml/d' ../SimpleKML/build.gradle && \ + echo "include ':SimpleKML'" >> ../settings.gradle && \ + sed -i -e 's/runProguard true/runProguard false/g' build.gradle && \ #Auto Update Mode:Version v%v Update Check Mode:Tags diff --git a/srclibs/MozOsmDroid.txt b/srclibs/MozOsmDroid.txt new file mode 100644 index 0000000000..225fb0bc7b --- /dev/null +++ b/srclibs/MozOsmDroid.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/mozilla/osmdroid diff --git a/srclibs/SimpleKML.txt b/srclibs/SimpleKML.txt new file mode 100644 index 0000000000..d5f86c7c31 --- /dev/null +++ b/srclibs/SimpleKML.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/crankycoder/SimpleKML