From 6d234d0e6cde42917ee3477062e136fc73aff92f Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 15 Sep 2020 16:30:40 +0200
Subject: [PATCH] [pkg] pass target name to the build script

---
 bitmask.pro |  3 +--
 build.sh    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bitmask.pro b/bitmask.pro
index fcedd75f..db675ab1 100644
--- a/bitmask.pro
+++ b/bitmask.pro
@@ -1,5 +1,4 @@
-# FIXME: this should be overwritten by build templates
-TARGET=riseup-vpn
+#TARGET = $$BINARY_NAME
 
 CONFIG += qt staticlib
 windows:CONFIG += console
diff --git a/build.sh b/build.sh
index 56b4c68f..1ded17ed 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,12 @@ PROJECT=bitmask.pro
 TARGET_GOLIB=lib/libgoshim.a
 SOURCE_GOLIB=gui/backend.go
 
+RELEASE=qtbuild/release
+
+if [ "$TARGET" == "" ]
+then
+    TARGET=riseup-vpn
+fi
 
 if [ "$XBUILD" == "$WIN64" ]
 then
@@ -40,7 +46,7 @@ function buildGoLib {
     if [ "$XBUILD" == "$WIN64" ]
     then
         echo "[+] Building Go library with mxe"
-        echo ">> using cc:" $CC
+        echo "[+] Using cc:" $CC
         CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
     fi
 }
@@ -59,3 +65,8 @@ buildGoLib
 buildQmake
 make -C qtbuild clean
 make -C qtbuild -j4 all
+
+# i would expect that passing QMAKE_TARGET would produce the right output, but nope.
+mv qtbuild/release/bitmask $RELEASE/$TARGET
+strip $RELEASE/$TARGET
+echo "[+] Binary is in" $RELEASE/$TARGET
-- 
GitLab