From 842ba328e0eb457c3612988cc1e3c9c78107de0f Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 18 Feb 2013 11:23:04 +0000 Subject: [PATCH 1/3] remove update check for ornidroid to see if it shows in wiki category --- metadata/fr.ornidroid.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/metadata/fr.ornidroid.txt b/metadata/fr.ornidroid.txt index f0698f5391..0c3c0a6db8 100644 --- a/metadata/fr.ornidroid.txt +++ b/metadata/fr.ornidroid.txt @@ -6,7 +6,8 @@ Issue Tracker: Summary:Bird info Description: -Works online by default but you can copy the files from the repo to the sdcard or download +Works online by default but you can copy the files from the repo to the sdcard +or download them from the web as mentioned on the website . @@ -14,13 +15,11 @@ Repo Type:git #Be warned! Repo is large Repo:https://github.com/giletvin/ornidroid.git -#non-commercial license -Build Version:1.0.1,2,!not suitable for f-droid.org v1.0.1,subdir=ornidroid,\ +Build Version:1.0.1,2,!non-commercial licence v1.0.1,subdir=ornidroid,\ extlibs=commons-lang/commons-lang-2.6.jar;commons-io/commons-io-1.4.jar;junit/junit-4.10.jar,\ prebuild=rm -rf ../ornidroid_images ../ornidroid_database ../ornidroid_audio ../ornidroid_icons Auto Update Mode:None -Update Check Mode:None Current Version:1.0.1 Current Version Code:2 From 8d767bc4ed654e00d102f0d3b74803ef6a2efec0 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 18 Feb 2013 12:08:44 +0000 Subject: [PATCH 2/3] another attempt at net.sourceforge.servestream --- metadata/net.sourceforge.servestream.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index a4b5f4f087..0cbd319b45 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -42,21 +42,23 @@ Repo:http://svn.code.sf.net/p/servestream/code/trunk #Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/ #Build Version:0.4.9,59,1049,buildjni=no #Build Version:0.4.12,62,1160,buildjni=no -Build Version:0.5.4,69,1354,prebuild=\ +Build Version:0.5.4,69,1354,srclibs=ActionBarSherlock@4.2.0,prebuild=\ rm custom_rules.xml && echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \ wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?\ format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \ wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?\ -format=raw --output-document=arm-build.sh && \ +format=raw --output-document=arm-build.sh && \ tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \ chmod +x arm-build.sh && \ mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \ sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \ cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \ +sed -i 's/make -j4/make -j1/g' arm-build.sh && \ sed -i 's/bash/sh/g' arm-build.sh && \ sed -i '/PIPESTATUS/d' arm-build.sh && \ NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes -Build Version:0.5.5,70,1361,buildjni=no +Build Version:0.5.5,70,1361,srclibs=ActionBarSherlock@4.2.0,prebuild=\ +echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,buildjni=no Auto Update Mode:None Update Check Mode:Market From 7c12946753d46845da1db83de220b2d1243384cc Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 18 Feb 2013 16:19:10 +0000 Subject: [PATCH 3/3] more WIP net.osmand.plus and tidy org.linphone --- metadata/net.osmand.plus.txt | 26 +++++++++++++++----------- metadata/org.linphone.txt | 9 ++++----- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 94cafe911f..0bfc0a421e 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -28,7 +28,7 @@ Status: We don't have the latest version of this app because it is difficult to build. Nightly builds by the developer are available via the Donate page. . -#Don't use master branch +#Don't use master branch for main app nor srclibs Repo Type:git Repo:https://github.com/osmandapp/Osmand.git @@ -55,17 +55,21 @@ sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \ zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ cp -r ../DataExtractionOSM/build/lib/ libs/ -#Should build from head of v1.1.0 branch; jenkins is inactive; test without jni! -Build Version:1.1.0,110,!WIP 9e0f825531,subdir=OsmAnd,encoding=utf-8,\ -submodules=yes,update=force,srclibs=OsmAnd-tools@d67969427e;OsmAnd-core@62247627bd,prebuild=\ -sed -i 's/app_version">[^<]*/app_version">1.1.0-fdroid/' res/values/no_translate.xml && \ + +#ndk-r8b doesn't work but ndk-r8d does;ndk-build isn't building all native bits +Build Version:1.1.2,110,!more WIP: top-level exceptions errors and native bits missing ceff4509a8,\ +subdir=OsmAnd,encoding=utf-8,\ +srclibs=OsmAnd-tools@94486e332d;OsmAnd-core@4759ffbd96,prebuild=\ +sed -i 's/app_version">[^<]*/app_version">1.1.2-fdroid/' res/values/no_translate.xml && \ sed -i 's@..\/core@$$OsmAnd-core$$@g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ -sed -i 's/jar\,\ junits/jar/g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ -sed -i 's/value="lib"/value="libs"/g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ -mv $$OsmAnd-tools$$/OsmAndMapCreator/lib $$OsmAnd-tools$$/OsmAndMapCreator/libs && \ -ant compile build -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ -cp $$OsmAnd-tools$$/OsmAndMapCreator/build/OsmAndMapCreator.jar libs/ && \ -cp $$OsmAnd-tools$$/OsmAndMapCreator/build/lib/OsmAnd-core.jar libs/ && rm ant.properties,buildjni=yes +sed -i 's@..\/..\/core@$$OsmAnd-core$$@g' build.xml && \ +sed -i 's@..\/..\/core@$$OsmAnd-core$$@g' jni/Android.mk && \ +ant jar -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ +ant jar -f $$OsmAnd-core$$/OsmAnd-java/build.xml && \ +cp $$OsmAnd-tools$$/OsmAndMapCreator/OsmAndMapCreator.jar libs/ && \ +cp $$OsmAnd-core$$/OsmAnd-java/OsmAnd-core.jar libs/ && \ +zip -d libs/OsmAnd-core.jar net/osmand/PlatformUtil.class && rm ant.properties,\ +buildjni=yes Auto Update Mode:None Update Check Mode:Market diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt index 41521618ea..266136b28c 100644 --- a/metadata/org.linphone.txt +++ b/metadata/org.linphone.txt @@ -22,11 +22,10 @@ releases. Until then, you can find apks on the project's website. Repo Type:git Repo:git://git.linphone.org/linphone-android.git -Build Version:2.0.2,2002,!wip 2.0.2,submodules=yes,update=no,\ -init=cd submodules/linphone && git submodule init && git submodule update && cd ../../,\ -prebuild=export NDK_PATH=$$NDK$$ && rm -rf tests && \ -echo "sdk.dir=$$SDK$$" > local.properties && \ -sed -i 's@\(all:\).*@\1 prepare-sources generate-libs@' Makefile && make && \ +Build Version:2.0.3,2003,!WIP 2.0.3-1,submodules=yes,update=no,\ +init=cd submodules/linphone && git submodule update --init,\ +prebuild=rm -rf tests && echo "sdk.dir=$$SDK$$" > local.properties && \ +make NDK_PATH=$$NDK$$ prepare-sources generate-libs && \ sed -i 's/debuggable ="true"/debuggable="false"/g' AndroidManifest.xml && \ sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml,buildjni=no