nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-08 11:11:34 +00:00
Code Releases Activity

Update native build to use go 1.11.4 (fixes #213) (#214)

Browse source 
* Update Go version

* Update native build to use go 1.11.4 (fixes #213)

* Update fdroid metadata

* Fix builds with Go 1.10 onwards (#213)
This commit is contained in:
Catfriend1 2019-02-05 23:28:47 +01:00 committed by GitHub
parent 697defb1a7
commit 9120e4afc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 122 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/Dockerfile
View file

@ -1,7 +1,7 @@
FROM openjdk:8 FROM openjdk:8
ENV GO_VERSION 1.9.7 ENV GO_VERSION 1.11.4
ENV ANDROID_SDK_VERSION 3859397 ENV ANDROID_SDK_VERSION 4333796
WORKDIR /opt WORKDIR /opt

114
fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml
View file

@ -10,7 +10,7 @@ LiberapayID: '1534877'
AutoName: Syncthing-Fork AutoName: Syncthing-Fork
Summary: File synchronization Summary: File synchronization
Description: |- Description: |-
This is a fork of <a href="https://f-droid.org/packages/com.nutomic.syncthingandroid">Syncthing</a> that brings major This is a fork of [[com.nutomic.syncthingandroid]] that brings major
enhancements like: enhancements like:
* Individual sync conditions can be applied per device and per folder * Individual sync conditions can be applied per device and per folder
* Recent changes UI, click to open files. * Recent changes UI, click to open files.
@ -432,7 +432,115 @@ Builds:
- PATH="$PWD/go/bin:$PATH" gradle buildNative - PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c ndk: r15c
- versionName: 0.14.54.4
versionCode: 4183
commit: v0.14.54.4
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz
- echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
- versionName: 0.14.54.7
versionCode: 145407
commit: v0.14.54.7
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz
- echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
- versionName: 0.14.54.9
versionCode: 145409
commit: v0.14.54.9
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz
- echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
- versionName: 1.0.0.1
versionCode: 1000001
commit: v1.0.0.1
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz
- echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
- versionName: 1.0.0.2
versionCode: 1000002
commit: v1.0.0.2
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz
- echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
- versionName: 1.0.0.5
versionCode: 1000005
commit: v1.0.0.5
submodules: true
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
rm:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
build:
- wget -O go.tgz https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz
- echo 'fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b go.tgz'
| shasum -c -
- tar xf go.tgz
- PATH="$PWD/go/bin:$PATH" gradle buildNative
ndk: r15c
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: Tags ^v[a-z0-9.]*$ UpdateCheckMode: Tags ^v[a-z0-9.]*$
CurrentVersion: 0.14.54.3 CurrentVersion: 1.0.0.5
CurrentVersionCode: 4182 CurrentVersionCode: 1000005

14
syncthing/build-syncthing.py
View file

@ -12,6 +12,10 @@ import platform
SUPPORTED_PYTHON_PLATFORMS = ['Windows', 'Linux', 'Darwin'] SUPPORTED_PYTHON_PLATFORMS = ['Windows', 'Linux', 'Darwin']
GO_VERSION = '1.11.4'
GO_EXPECTED_SHASUM_LINUX = 'fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b'
GO_EXPECTED_SHASUM_WINDOWS = 'eeb20e21702f2b9469d9381df5de85e2f731b64a1f54effe196d0f7d0227fe14'
BUILD_TARGETS = [ BUILD_TARGETS = [
{ {
'arch': 'arm', 'arch': 'arm',
@ -140,12 +144,12 @@ def install_go():
# Consts. # Consts.
pwd_path = os.path.dirname(os.path.realpath(__file__)) pwd_path = os.path.dirname(os.path.realpath(__file__))
if sys.platform == 'win32': if sys.platform == 'win32':
url = 'https://dl.google.com/go/go1.9.7.windows-amd64.zip' url = 'https://dl.google.com/go/go' + GO_VERSION + '.windows-amd64.zip'
expected_shasum = '8db4b21916a3bc79f48d0611202ee5814c82f671b36d5d2efcb446879456cd28' expected_shasum = GO_EXPECTED_SHASUM_WINDOWS
tar_gz_fullfn = pwd_path + os.path.sep + 'go.zip'; tar_gz_fullfn = pwd_path + os.path.sep + 'go.zip';
else: else:
url = 'https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz' url = 'https://dl.google.com/go/go' + GO_VERSION + '.linux-amd64.tar.gz'
expected_shasum = '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee' expected_shasum = GO_EXPECTED_SHASUM_LINUX
tar_gz_fullfn = pwd_path + os.path.sep + 'go.tgz'; tar_gz_fullfn = pwd_path + os.path.sep + 'go.tgz';
# Download prebuilt-go. # Download prebuilt-go.
@ -342,12 +346,12 @@ for target in BUILD_TARGETS:
environ.update({ environ.update({
'GOPATH': module_dir, 'GOPATH': module_dir,
'CGO_ENABLED': '1', 'CGO_ENABLED': '1',
'CC': os.path.join(standalone_ndk_dir, 'bin', target['cc'])
}) })
print('Building syncthing version', syncthingVersion); print('Building syncthing version', syncthingVersion);
subprocess.check_call([ subprocess.check_call([
go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'],
'-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']),
'-version', syncthingVersion '-version', syncthingVersion
] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir) ] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir)