Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
	metadata/net.sourceforge.servestream.txt
This commit is contained in:
Ciaran Gultnieks 2013-02-21 17:43:13 +00:00
commit a163b3cd75
4 changed files with 27 additions and 23 deletions

View file

@ -6,7 +6,8 @@ Issue Tracker:
Summary:Bird info Summary:Bird info
Description: 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 them from the web as mentioned on the website
. .
@ -14,13 +15,11 @@ Repo Type:git
#Be warned! Repo is large #Be warned! Repo is large
Repo:https://github.com/giletvin/ornidroid.git Repo:https://github.com/giletvin/ornidroid.git
#non-commercial license Build Version:1.0.1,2,!non-commercial licence v1.0.1,subdir=ornidroid,\
Build Version:1.0.1,2,!not suitable for f-droid.org 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,\ 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 prebuild=rm -rf ../ornidroid_images ../ornidroid_database ../ornidroid_audio ../ornidroid_icons
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None
Current Version:1.0.1 Current Version:1.0.1
Current Version Code:2 Current Version Code:2

View file

@ -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. 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 Type:git
Repo:https://github.com/osmandapp/Osmand.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/ && \ cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \ zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
cp -r ../DataExtractionOSM/build/lib/ libs/ 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,\ #ndk-r8b doesn't work but ndk-r8d does;ndk-build isn't building all native bits
submodules=yes,update=force,srclibs=OsmAnd-tools@d67969427e;OsmAnd-core@62247627bd,prebuild=\ Build Version:1.1.2,110,!more WIP: top-level exceptions errors and native bits missing ceff4509a8,\
sed -i 's/app_version">[^<]*/app_version">1.1.0-fdroid/' res/values/no_translate.xml && \ 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@..\/core@$$OsmAnd-core$$@g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
sed -i 's/jar\,\ junits/jar/g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ sed -i 's@..\/..\/core@$$OsmAnd-core$$@g' build.xml && \
sed -i 's/value="lib"/value="libs"/g' $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ sed -i 's@..\/..\/core@$$OsmAnd-core$$@g' jni/Android.mk && \
mv $$OsmAnd-tools$$/OsmAndMapCreator/lib $$OsmAnd-tools$$/OsmAndMapCreator/libs && \ ant jar -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
ant compile build -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \ ant jar -f $$OsmAnd-core$$/OsmAnd-java/build.xml && \
cp $$OsmAnd-tools$$/OsmAndMapCreator/build/OsmAndMapCreator.jar libs/ && \ cp $$OsmAnd-tools$$/OsmAndMapCreator/OsmAndMapCreator.jar libs/ && \
cp $$OsmAnd-tools$$/OsmAndMapCreator/build/lib/OsmAnd-core.jar libs/ && rm ant.properties,buildjni=yes 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 Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market

View file

@ -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.8,58,1031,prebuild=mv lib/ libs/
#Build Version:0.4.9,59,1049,buildjni=no #Build Version:0.4.9,59,1049,buildjni=no
#Build Version:0.4.12,62,1160,buildjni=no #Build Version:0.4.12,62,1160,buildjni=no
Build Version:0.5.4,69,1354,srclibs=ActionBarSherlock,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 && \ 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?\ 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 && \ 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?\ 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 && \ tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
chmod +x arm-build.sh && \ chmod +x arm-build.sh && \
mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \ 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 && \ sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \
cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \ 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 's/bash/sh/g' arm-build.sh && \
sed -i '/PIPESTATUS/d' arm-build.sh && \ sed -i '/PIPESTATUS/d' arm-build.sh && \
NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes 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 Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market

View file

@ -22,11 +22,10 @@ releases. Until then, you can find apks on the project's website.
Repo Type:git Repo Type:git
Repo:git://git.linphone.org/linphone-android.git Repo:git://git.linphone.org/linphone-android.git
Build Version:2.0.2,2002,!wip 2.0.2,submodules=yes,update=no,\ Build Version:2.0.3,2003,!WIP 2.0.3-1,submodules=yes,update=no,\
init=cd submodules/linphone && git submodule init && git submodule update && cd ../../,\ init=cd submodules/linphone && git submodule update --init,\
prebuild=export NDK_PATH=$$NDK$$ && rm -rf tests && \ prebuild=rm -rf tests && echo "sdk.dir=$$SDK$$" > local.properties && \
echo "sdk.dir=$$SDK$$" > local.properties && \ make NDK_PATH=$$NDK$$ prepare-sources generate-libs && \
sed -i 's@\(all:\).*@\1 prepare-sources generate-libs@' Makefile && make && \
sed -i 's/debuggable ="true"/debuggable="false"/g' AndroidManifest.xml && \ 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 sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml,buildjni=no