summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkali <kali@win>2020-09-25 16:49:46 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-09-25 20:42:50 +0200
commit5518645dfdfd1250dcabd98bda5d71d18eb4edcc (patch)
treed0ca2b3090aec17d43edb63a4383c63388ee2c27 /Makefile
parent2ecd10efa37c6ccd04c43e663f88c4a6910b2a4b (diff)
[pkg] windows helper and qtinstaller
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ce65db4..e1af715 100644
--- a/Makefile
+++ b/Makefile
@@ -69,14 +69,9 @@ else
$(MAKE) _buildparts
endif
-_buildparts: $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path)))
-build_%:
- @echo "PLATFORM: ${PLATFORM}"
- @mkdir -p build/bin/${PLATFORM}
- go build -tags $(TAGS) -ldflags "-s -w -X main.version=`git describe --tags` ${EXTRA_LDFLAGS}" -o build/bin/${PLATFORM}/$* ./cmd/$*
- -@rm -rf build/${PROVIDER}/staging/${PLATFORM} && mkdir -p build/${PROVIDER}/staging/${PLATFORM}
- -@ln -s ../../../bin/${PLATFORM}/$* build/${PROVIDER}/staging/${PLATFORM}/$*
+helper:
+ go build -ldflags "-X main.AppName=${PROVIDER}VPN -X main.Version=${VERSION}" cmd/bitmask-helper/main.go
test:
@go test -tags "integration $(TAGS)" ./pkg/...
@@ -228,6 +223,13 @@ package_snap:
package_deb:
@make -C build/${PROVIDER} pkg_deb
+installer_win:
+ cp qtbuild/release/bitmask.exe branding/qtinstaller/packages/root.win_x86_64/data/${PROVIDER}-vpn.exe
+ windeployqt --qmldir gui/qml branding/qtinstaller/packages/root.win_x86_64/data/${PROVIDER}-vpn.exe
+ "/c/Qt/QtIFW-3.2.2/bin/binarycreator.exe" -c ./branding/qtinstaller/config/config.xml -p ./branding/qtinstaller/packages build/${PROVIDER}-vpn-${VERSION}-installer.exe
+
+# FIXME --- old nsis installer. deprecate, but probably we need something similar to sign all the binaries (helper, main app, installer...)
+
package_win_stage_1:
@make -C build/${PROVIDER} pkg_win_stage_1