misc fixes

This commit is contained in:
linsui 2021-10-20 23:17:45 +08:00
parent d6d24f58de
commit 2b4d9370a3
8 changed files with 19 additions and 38 deletions

View file

@ -368,6 +368,7 @@ Builds:
- versionName: 2021.10.15-15-FDroid
versionCode: 21101515
disable: Could not find python to use in qt/, shaders/ and 3party/
commit: 2465430346fcda22e8242748ee20c6578806e17e
subdir: android
submodules: true

View file

@ -29,6 +29,10 @@ Builds:
versionCode: 280
commit: cc65731ba4a07255cac52721d741c5780207c850
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes

View file

@ -76,6 +76,10 @@ Builds:
versionCode: 16
commit: da50a7ca744fcb26a567bfecb0469f9f13e8e0b5
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes

View file

@ -1044,6 +1044,7 @@ Builds:
- versionName: 16.0.1.0
versionCode: 1803
disable: https://github.com/MarcusWolschon/osmeditor4android/issues/1459
commit: 27a9861c233ae9ff58d704a7a46829135bcca6c1
gradle:
- current

View file

@ -292,6 +292,10 @@ Builds:
commit: v2.11.2.0
subdir: Corona-Warn-App
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- device
scanignore:

View file

@ -67,6 +67,10 @@ Builds:
versionCode: 2630
commit: c9b7a84ebbffb2d120a3a9290b94edc502635cd2
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- production

View file

@ -367,8 +367,6 @@ Builds:
- update-alternatives --auto java
gradle:
- foss
rm:
- app/libs/*.aar
prebuild: sed -i -e '/places-maps-sdk-3.1.0-beta/d' build.gradle
gradleprops:
- GOINGELECTRIC_API_KEY=7ef9a064ec4602a853c9201ac35be94b

View file

@ -409,42 +409,7 @@ Builds:
- ninja android/apk/mpd-unsigned.apk
ndk: r22b
- versionName: 0.23.1
versionCode: 61
commit: fff25ac753a06953964c28b68d74de161cd18165
sudo:
- apt-get update || apt-get update
- apt-get install -y ninja-build imagemagick-6.q16 -t stretch-backports
- apt-get install -y clang-7 libc++-7-dev libc++abi-7-dev
- pip3 install meson
- update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100
- update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100
- pushd build/srclib/cpython
- ./configure
- make -j`nproc`
- make altinstall
- popd
output: output/android/android/apk/mpd-unsigned.apk
srclibs:
- cpython@v3.10.0
prebuild:
- mkdir -p output/android/android/classes/
- $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3' >
/dev/null
- sed -i -e "/native/a cpp_args:['-stdlib=libc++','-nostdinc++','-I/usr/lib/llvm-7/include/c++/v1',],"
src/tag/meson.build
- sed -i -e "/native/a link_args:['-lc++abi','-L/usr/lib/llvm-7/lib','-Wl,-rpath,/usr/lib/llvm-7/lib',],"
src/tag/meson.build
scandelete:
- src/haiku/
build:
- cd output/android/
- python3.10 ../../android/build.py $$SDK$$ $$NDK$$ armeabi-v7a
- meson configure
- ninja android/apk/mpd-unsigned.apk
ndk: r22b
AutoUpdateMode: Version v%v
AutoUpdateMode: None
UpdateCheckMode: Tags
CurrentVersion: 0.23.1
CurrentVersionCode: 61