diff options
| author | kali <kali@win> | 2020-09-25 17:46:50 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-09-25 21:00:08 +0200 |
| commit | 5d102497e80f17056ce97bcc58a4906cf8a05c28 (patch) | |
| tree | 3052ed39a403fc4f73d7d73f60597caaca9d2a75 /Makefile | |
| parent | 5518645dfdfd1250dcabd98bda5d71d18eb4edcc (diff) | |
[bug] workaround for helper path in windows
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -8,6 +8,7 @@ XBUILD ?= no SKIP_CACHECK ?= no PROVIDER ?= $(shell grep ^'provider =' branding/config/vendor.conf | cut -d '=' -f 2 | tr -d "[:space:]") +TARGET ?= bitmask PROVIDER_CONFIG ?= branding/config/vendor.conf DEFAULT_PROVIDER = branding/assets/default/ VERSION ?= $(shell git describe) @@ -20,11 +21,12 @@ SOURCE_GOLIB=gui/backend.go # detect OS, we use it for dependencies UNAME = $(shell uname -s) PLATFORM ?= $(shell echo ${UNAME} | awk "{print tolower(\$$0)}") +WININST_DATA = branding/qtinstaller/packages/root.win_x86_64/data/ TEMPLATES = branding/templates SCRIPTS = branding/scripts -all: icon locales build +all: icon locales helper build ######################################################################### @@ -66,7 +68,7 @@ else ifeq (${XBUILD}, osx) $(MAKE) build_cross_osx $(MAKE) _build_done else - $(MAKE) _buildparts + @gui/build.sh endif @@ -224,8 +226,9 @@ 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 + cp helper.exe ${WININST_DATA} + cp qtbuild/release/${TARGET}.exe ${WININST_DATA}${PROVIDER}-vpn.exe + windeployqt --qmldir gui/qml ${WININST_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...) |