Fix standalone calendar (merging with master)

This commit is contained in:
Daniel Martí 2013-11-13 17:41:11 +01:00
commit 02095076bd
17 changed files with 44 additions and 47 deletions

View file

@ -52,6 +52,7 @@ Build:3.4,3040
Build:3.4.2,3042 Build:3.4.2,3042
commit=23bce9d7fc7b commit=23bce9d7fc7b
rm=jni/scan;assets/scan
prebuild=mkdir libs && \ prebuild=mkdir libs && \
cp extra/system.jar libs/ cp extra/system.jar libs/
buildjni=yes buildjni=yes

View file

@ -3,6 +3,7 @@ License:GPLv2+
Web Site:http://openttd.org/ Web Site:http://openttd.org/
Source Code:https://github.com/pelya/commandergenius Source Code:https://github.com/pelya/commandergenius
Issue Tracker:https://github.com/pelya/commandergenius/issues Issue Tracker:https://github.com/pelya/commandergenius/issues
Name:OpenTTD Name:OpenTTD
Summary:Railway emulator Summary:Railway emulator
Description: Description:
@ -13,29 +14,38 @@ extending it with new features.
Repo Type:srclib Repo Type:srclib
Repo:libsdl-android Repo:libsdl-android
# some libraries, such as libandroid.so can't be rebuilt from included sources; # some libraries, such as libandroid.so can't be rebuilt from included sources;
# others, such as python.so may be recompiled (probably, better from srclibs) # others, such as python.so may be recompiled (probably, better from srclibs)
Build Version:1.3.2.25,13225,openttd-1.3.2.25,subdir=project,submodules=yes,buildjni=no,target=android-17,\ Build:1.3.2.25,13225
srclibs=OpenTTD@1.3.2,scanignore=project/jni/application/commandergenius/commandergenius/icotool,\ commit=openttd-1.3.2.25
init=\ disable=Fails to clone source - Svndiff compressed data is invalid: Compression of svndiff data failed at /usr/share/perl5/Git/SVN/Ra.pm line 282
ln -fs openttd jni/application/src && \ subdir=project
sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \ submodules=yes
sed -ri 's/exit 0//' ../copyAssets.sh && \ init=ln -fs openttd jni/application/src && \
find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \ sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \
rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \ sed -ri 's/exit 0//' ../copyAssets.sh && \
cd ../.. && ./changeAppSettings.sh -a,\ find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
prebuild=\ cd jni && \
mkdir -p jni/application/openttd/openttd-1.3.2 && \ rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \
cp -R $$OpenTTD$$/* jni/application/openttd/openttd-1.3.2 && \ cd ../.. && \
cd jni/application/openttd/ && \ ./changeAppSettings.sh -a
patch -p 0 -d openttd-1.3.2 < openttd-trunk-android.patch && \ target=android-17
patch -p 0 -d openttd-1.3.2 < findversion.sh.patch,\ srclibs=OpenTTD@1.3.2
build=\ prebuild=mkdir -p jni/application/openttd/openttd-1.3.2 && \
sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \ cp -R $$OpenTTD$$/* jni/application/openttd/openttd-1.3.2 && \
cd .. && ./build.sh release cd jni/application/openttd/ && \
patch -p 0 -d openttd-1.3.2 < openttd-trunk-android.patch && \
patch -p 0 -d openttd-1.3.2 < findversion.sh.patch
scanignore=project/jni/application/commandergenius/commandergenius/icotool
build=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
cd .. && \
./build.sh release
buildjni=no
# todo # todo
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None
Current Version:1.3.2.25 Current Version:1.3.2.25
Current Version Code:13225 Current Version Code:13225

View file

@ -42,13 +42,12 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=main subdir=main
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=main subdir=main
prebuild=make prebuild prebuild=make prebuild

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-bluetooth subdir=module-bluetooth
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-bluetooth subdir=module-bluetooth
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-bluetoothadmin subdir=module-bluetoothadmin
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-bluetoothadmin subdir=module-bluetoothadmin
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-clipboard subdir=module-clipboard
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-clipboard subdir=module-clipboard
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-contactsread subdir=module-contactsread
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-contactsread subdir=module-contactsread
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-fileread subdir=module-fileread
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-fileread subdir=module-fileread
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-filewrite subdir=module-filewrite
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-filewrite subdir=module-filewrite
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-phonestateread subdir=module-phonestateread
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-phonestateread subdir=module-phonestateread
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-ringermode subdir=module-ringermode
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-ringermode subdir=module-ringermode
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-smsnotify subdir=module-smsnotify
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-smsnotify subdir=module-smsnotify
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-smsread subdir=module-smsread
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-smsread subdir=module-smsread
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-smssend subdir=module-smssend
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-smssend subdir=module-smssend
init=cd .. && \ init=cd .. && \

View file

@ -45,7 +45,7 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=module-smswrite subdir=module-smswrite
init=cd .. && \ init=cd .. && \
@ -53,7 +53,6 @@ Build:0.0.1.4,5
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=module-smswrite subdir=module-smswrite
init=cd .. && \ init=cd .. && \

View file

@ -38,13 +38,12 @@ Build:0.0.1.3,4
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.4,5 Build:0.0.1.4,5
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae] disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
commit=0.0.1.4 commit=0.0.1.4
subdir=transport-xmpp subdir=transport-xmpp
prebuild=make prebuild prebuild=make prebuild
Build:0.0.1.5,6 Build:0.0.1.5,6
disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/0aafd4801cb83a63c215cf8a803bc16acba4fcae]
commit=0.0.1.5 commit=0.0.1.5
subdir=transport-xmpp subdir=transport-xmpp
prebuild=make prebuild prebuild=make prebuild

View file

@ -16,8 +16,8 @@ Repo Type:git
Repo:https://github.com/dschuermann/standalone-calendar.git Repo:https://github.com/dschuermann/standalone-calendar.git
Build:standalone-1.2,3 Build:standalone-1.2,3
disable=library project issues
commit=standalone-1.2 commit=standalone-1.2
submodules=yes
gradle=yes gradle=yes
Auto Update Mode:None Auto Update Mode:None