From c0d0dfcddc5c41a34e2d7236e3275b2dc7225dd5 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 15:29:53 +0100 Subject: [PATCH] more wip osmand --- metadata/net.osmand.plus.txt | 20 ++++++++++++-------- srclibs/build.txt | 2 +- srclibs/resources.txt | 3 +++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 srclibs/resources.txt diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 5dd6791684..4f99fbc5ac 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -58,19 +58,23 @@ cp -r ../DataExtractionOSM/build/lib/ libs/ # Name srclibs in such a way as to replicate OsmAnd build tree # Could try making https://github.com/osmandapp/OsmAnd-external-qtbase a srclib too -Build Version:1.4-fdroid,145,!WIP at r1.4,\ -rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,update=.;../SherlockBar,\ -srclibs=tools@9b4c9da995;core@r1.1.4;build@master,prebuild=\ +# Declare OSMAND_ARM_ONLY=true ndk-build.sh for just ARM +# Don't really understand what the other build.xmls do: they don't appear to put jars in classpath +# Jars haven't been verified +Build Version:1.4-fdroid,145,r1.4,\ +rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\ +srclibs=tools@9b4c9da995;core@r1.1.4;build@86a575b93,prebuild=\ +sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ +$$SDK$$/tools/android update project -p ../SherlockBar && \ sed -i 's/"\${aapt.ignore.assets}"/"\${aapt.ignore.assets}" \ libraryRFileRefid="project.library.bin.r.file.path"/g' build.xml && \ sed -i 's/app_version">[^<]*/app_version">1.4-fdroid/' \ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\ -ant build -f $$tools$$/OsmAndMapCreator/build.xml && \ -mv $$tools$$/OsmAndMapCreator/OsmAndMapCreator.jar libs/ && \ -mv $$core$$/OsmAnd-java/OsmAnd-core.jar libs/ && \ -zip -d libs/OsmAnd-core.jar net/osmand/PlatformUtil.class && \ -$$NDK$$/ndk-build +ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ +ant build -f ../OsmAnd-java/build.xml && \ +ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./ndk-build.sh,buildjni=no +# well need to source "resources" srclib for next version # see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml Auto Update Mode:None Update Check Mode:Market diff --git a/srclibs/build.txt b/srclibs/build.txt index dd8e6b8ca2..e6238b94a0 100644 --- a/srclibs/build.txt +++ b/srclibs/build.txt @@ -1,3 +1,3 @@ Repo Type:git -Repo:https://github.com/osmandapp/Osmand-build +Repo:https://github.com/osmandapp/OsmAnd-build diff --git a/srclibs/resources.txt b/srclibs/resources.txt new file mode 100644 index 0000000000..8b9f0d969e --- /dev/null +++ b/srclibs/resources.txt @@ -0,0 +1,3 @@ +Repo Type:git +Repo:https://github.com/osmandapp/OsmAnd-resources +