From 804912062c564eaf16b5fc20445e15fc5ed4de65 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 6 Aug 2014 16:15:44 +0200
Subject: [PATCH] Adjust build process for syncthing v0.9.0 (binary moved,
 fixes #72).

---
 build-native.sh | 24 ++++++++----------------
 build.gradle    |  7 +++----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/build-native.sh b/build-native.sh
index 3557a9e2..3dd31444 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -2,26 +2,18 @@
 
 cd "$GOPATH/src/github.com/syncthing/syncthing/"
 
+rm bin/
+
 ./build.sh test || exit 1
 
 export GOOS=linux
 export ENVIRONMENT=android
 
-export GOARCH=386
+GOARCH=386 ./build.sh "" -tags noupgrade
+mv bin/linux_386/syncthing bin/syncthing-x86
 
-./build.sh "" -tags noupgrade
-cp syncthing syncthing-x86
+GOARCH=arm GOARM=5 ./build.sh "" -tags noupgrade
+mv bin/linux_arm/syncthing bin/syncthing-armeabi
 
-export GOARCH=arm
-
-export GOARM=7
-./build.sh "" -tags noupgrade
-cp syncthing syncthing-armeabi-v7a
-
-export GOARM=5
-./build.sh "" -tags noupgrade
-cp syncthing syncthing-armeabi
-
-#export GOARCH=mips
-#./build.sh "" -tags noupgrade
-#cp syncthing syncthing-mips
+GOARCH=arm GOARM=7 ./build.sh "" -tags noupgrade
+mv bin/linux_arm/syncthing bin/syncthing-armeabi-v7a
diff --git a/build.gradle b/build.gradle
index 0b7051d8..d6f2aad9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,13 +101,12 @@ task buildNative(type: Exec) {
 }
 
 task copyNative(type: Copy) {
-	def st_dir = System.getenv("GOPATH") + "/src/github.com/syncthing/syncthing/";
-	from st_dir + 'syncthing-x86', st_dir + 'syncthing-armeabi', st_dir + 'syncthing-armeabi-v7a';
+	def st_dir = System.getenv("GOPATH") + "/src/github.com/syncthing/syncthing/bin/";
+	from st_dir + 'syncthing-x86', st_dir + 'syncthing-armeabi-v7a', st_dir + 'syncthing-armeabi';
 	into 'libs/'
 	rename('syncthing-x86', 'x86/libsyncthing.so')
-	rename('syncthing-armeabi-v7a', 'armeabi-v7a/libsyncthing.so')
+    rename('syncthing-armeabi-v7a', 'armeabi-v7a/libsyncthing.so')
 	rename('syncthing-armeabi', 'armeabi/libsyncthing.so')
-	rename('syncthing-mips', 'mips/libsyncthing.so')
 }
 buildNative.finalizedBy copyNative