summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorkali <kali@leap.se>2020-10-13 19:03:29 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-10-23 23:21:55 +0200
commit163f14df408febb1fe92f4ddeffdfe933164b87f (patch)
tree0b9d41d4054030c0bb76da19438d005cb0c3402d /gui
parentcee6f137e88c5874afd3a4b42c4db7b29e069a98 (diff)
[pkg] add golib target to makefile
- Resolves: #363
Diffstat (limited to 'gui')
-rwxr-xr-xgui/build.sh48
1 files changed, 38 insertions, 10 deletions
diff --git a/gui/build.sh b/gui/build.sh
index deb73a1..c3d1699 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -20,6 +20,7 @@ VENDOR_PATH=${VENDOR_PATH-providers/riseup}
PLATFORM=$(uname -s)
LDFLAGS=""
+BUILD_GOLIB="yes"
if [ "$TARGET" == "" ]
then
@@ -45,7 +46,6 @@ function init {
mkdir -p lib
}
-# TODO this should be moved to the makefile
function buildGoLib {
echo "[+] Using go in" $GO "[`go version`]"
$GO generate ./pkg/config/version/genver/gen.go
@@ -101,16 +101,44 @@ function renameOutput {
fi
}
-echo "[+] Building BitmaskVPN"
+function buildDefault {
+ echo "[+] Building BitmaskVPN"
+ lrelease bitmask.pro
+ if [ "$BUILD_GOLIB" == "yes" ]
+ then
+ buildGoLib
+ fi
+ buildQmake
-lrelease bitmask.pro
+ make -C $QTBUILD clean
+ make -C $QTBUILD -j4 all
+
+ renameOutput
+ echo "[+] Done."
+}
-# FIXME move buildGoLib to the main makefile, to avoid redundant builds if possible
-buildGoLib
-buildQmake
-make -C $QTBUILD clean
-make -C $QTBUILD -j4 all
+for i in "$@"
+do
+case $i in
+ --skip-golib)
+ BUILD_GOLIB="no"
+ shift # past argument=value
+ ;;
+ --just-golib)
+ BUILD_GOLIB="just"
+ shift # past argument=value
+ ;;
+ *)
+ # unknown option
+ ;;
+esac
+done
+
+if [ "$BUILD_GOLIB" == "just" ]
+then
+ buildGoLib
+else
+ buildDefault
+fi
-renameOutput
-echo "[+] Done."