From 5d102497e80f17056ce97bcc58a4906cf8a05c28 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 25 Sep 2020 17:46:50 +0200 Subject: [bug] workaround for helper path in windows --- build.sh | 72 ---------------------------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100755 build.sh (limited to 'build.sh') diff --git a/build.sh b/build.sh deleted file mode 100755 index 1ded17e..0000000 --- a/build.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -set -e - - -XBUILD=${XBUILD-no} -WIN64="win64" -GO=`which go` - -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 - # TODO allow to override vars - QMAKE="`pwd`/../mxe/usr/x86_64-w64-mingw32.static/qt5/bin/qmake" - PATH="`pwd`/../mxe/usr/bin"/:$PATH - CC=x86_64-w64-mingw32.static-gcc -else - if [ "$QMAKE" == "" ] - then - QMAKE=`which qmake` - fi -fi - - -function init { - mkdir -p lib -} - -function buildGoLib { - echo "[+] Using go in" $GO "[`go version`]" - $GO generate ./pkg/config/version/genver/gen.go - if [ "$XBUILD" == "no" ] - then - echo "[+] Building Go library with standard Go compiler" - CGO_ENABLED=1 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB - fi - if [ "$XBUILD" == "$WIN64" ] - then - echo "[+] Building Go library with mxe" - echo "[+] Using cc:" $CC - CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB - fi -} - -function buildQmake { - echo "[+] Now building Qml app with Qt qmake" - echo "[+] Using qmake in:" $QMAKE - mkdir -p qtbuild - $QMAKE -o qtbuild/Makefile "CONFIG-=debug CONFIG+=release" $PROJECT -} - -echo "[+] Building BitmaskVPN" - -lrelease bitmask.pro -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 -- cgit v1.2.3