more WIP net.osmand.plus and tidy org.linphone

This commit is contained in:
David Black 2013-02-18 16:19:10 +00:00
parent 8d767bc4ed
commit 7c12946753
2 changed files with 19 additions and 16 deletions

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

@ -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