Misc fixes

This commit is contained in:
licaon-kter 2020-12-23 18:42:58 +02:00
parent 27a0d85057
commit 35b112c3d3
9 changed files with 20 additions and 51 deletions

View file

@ -3558,9 +3558,19 @@ Builds:
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21d
- versionName: '1.1431'
versionCode: 1431
commit: '1.1431'
subdir: app
submodules: true
gradle:
- fdroid
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21d
MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: '1.1429'
CurrentVersionCode: 1429
CurrentVersion: '1.1431'
CurrentVersionCode: 1431

View file

@ -63,7 +63,7 @@ Builds:
- versionName: '3.0'
versionCode: 30
commit: '3.0'
commit: ae9e6f9e43dadaf9195181d355cebc15bbe17f50
subdir: app
gradle:
- yes

View file

@ -220,6 +220,7 @@ Builds:
- versionName: 1.4.1
versionCode: 201
disable: fails to build
commit: v1.4.1
subdir: app
gradle:

View file

@ -49,6 +49,7 @@ Builds:
- versionName: 2.5.20
versionCode: 375
disable: fails to build
commit: v2.5.20
subdir: app
submodules: true

View file

@ -279,6 +279,7 @@ Builds:
- versionName: 3.6.0
versionCode: 360
disable: fails to build
commit: 3.6.0
subdir: app
gradle:

View file

@ -440,6 +440,7 @@ Builds:
- versionName: 3.6.0
versionCode: 360
disable: fails to build
commit: 3.6.0
subdir: app
gradle:

View file

@ -1395,56 +1395,9 @@ Builds:
- mv jni/static_library_built/openssl/output/android/ jni/openssl/
ndk: r15c
- versionName: 2.4.4
versionCode: 1144
disable: fails to build
commit: 2.4.4
subdir: aTalk/
gradle:
- fdroid
srclibs:
- fmj@r122
- jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
rm:
- aTalk/lib/src_reference/
- aTalk/jni/ffmpeg/android/
- aTalk/jni/openssl/android/
- aTalk/jni/vpx/android/
prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
scanignore:
- aTalk/build.gradle
scandelete:
- aTalk/jni/static_library_built/libvpx/sources/*.gz
- aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
build:
- pushd $$fmj$$
- ant
- popd
- pushd $$jitsi-zrtp4j$$
- ant jar
- popd
- mkdir -p lib/bundles
- mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
- mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
- pushd jni/static_library_built/ffmpeg-x264/
- ./init_update_libs.sh
- ./ffmpeg-atalk_build.sh
- popd
- mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/
- pushd jni/static_library_built/libvpx/
- ./init_libvpx.sh
- ./build-libvpx4android.sh
- popd
- mv jni/static_library_built/libvpx/output/android/ jni/vpx/
- pushd jni/static_library_built/openssl/
- ./init_libopenssl.sh
- ./build-openssl4android.sh
- popd
- mv jni/static_library_built/openssl/output/android/ jni/openssl/
ndk: r15c
- versionName: 2.4.5
versionCode: 1145
disable: fails to build
commit: 2.4.5
subdir: aTalk/
gradle:

View file

@ -137,6 +137,7 @@ Builds:
- versionName: 0.9.2
versionCode: 807
disable: fails to build
commit: v0.9.2
init:
- curl -Lo node.tar.xz https://nodejs.org/dist/v12.18.2/node-v12.18.2-linux-x64.tar.xz

View file

@ -226,6 +226,7 @@ Builds:
- versionName: 3.6.0
versionCode: 360
disable: fails to build
commit: 3.6.0
subdir: app
gradle: