Skip to content
Snippets Groups Projects
Unverified Commit ea112704 authored by Kali Kaneko's avatar Kali Kaneko Committed by meskio
Browse files

[pkg] check for qtinstaller framework

parent f1fc8004
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# (c) LEAP Encryption Access Project, 2019-2020 # (c) LEAP Encryption Access Project, 2019-2020
######################################################################### #########################################################################
.PHONY: all get build icon locales generate_locales clean .PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw
XBUILD ?= no XBUILD ?= no
SKIP_CACHECK ?= no SKIP_CACHECK ?= no
...@@ -28,6 +28,8 @@ SCRIPTS = branding/scripts ...@@ -28,6 +28,8 @@ SCRIPTS = branding/scripts
all: icon locales helper build all: icon locales helper build
HAS_QTIFW := $(shell PATH=$(PATH) which binarycreator)
######################################################################### #########################################################################
# go build # go build
...@@ -79,12 +81,18 @@ else ...@@ -79,12 +81,18 @@ else
@gui/build.sh @gui/build.sh
endif endif
build_installer: build build_installer: check_qtifw build
# TODO check for binarycreator in path
cp -r qtbuild/release/${PROVIDER}-vpn.app installer/packages/${PROVIDER}vpn/data/ cp -r qtbuild/release/${PROVIDER}-vpn.app installer/packages/${PROVIDER}vpn/data/
cp build/bin/${PLATFORM}/bitmask-helper installer/packages/${PROVIDER}vpn/data/ cp build/bin/${PLATFORM}/bitmask-helper installer/packages/${PROVIDER}vpn/data/
cd installer && qmake && make cd installer && qmake && make
check_qtifw:
ifdef HAS_QTIFW
@echo "[+] Found QTIFW"
else
$(error "[!] Cannot find QTIFW. Please install it and add it to your PATH")
endif
# ----------- FIXME ------- old build, reuse or delete ----------------------------- # ----------- FIXME ------- old build, reuse or delete -----------------------------
CROSS_WIN_FLAGS = CGO_ENABLED=1 GOARCH=386 GOOS=windows CC="/usr/bin/i686-w64-mingw32-gcc" CGO_LDFLAGS="-lssp" CXX="i686-w64-mingw32-c++" CROSS_WIN_FLAGS = CGO_ENABLED=1 GOARCH=386 GOOS=windows CC="/usr/bin/i686-w64-mingw32-gcc" CGO_LDFLAGS="-lssp" CXX="i686-w64-mingw32-c++"
...@@ -113,6 +121,9 @@ _build_xbuild_done: ...@@ -113,6 +121,9 @@ _build_xbuild_done:
# --------- FIXME ----------------------------------------------------------------------- # --------- FIXME -----------------------------------------------------------------------
clean: clean:
@rm -rf installer/*.app
@rm -rf installer/packages/${PROVIDER}vpn/data/*.app
@rm -rf installer/packages/${PROVIDER}vpn/data/bitmask-helper
@rm -rf build/ @rm -rf build/
@unlink branding/assets/default @unlink branding/assets/default
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment