mirror of https://0xacab.org/leap/bitmask-vpn
revert pedantic portable fixes, breaks windows build
parent
b6c6dd90a6
commit
6168feacf5
50
Makefile
50
Makefile
|
@ -11,22 +11,29 @@ QMAKE ?= qmake
|
|||
LRELEASE ?= lrelease
|
||||
SKIP_CACHECK ?= no
|
||||
VENDOR_PATH ?= providers
|
||||
APPNAME != VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam appname | tail -n 1
|
||||
TARGET != VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam binname | tail -n 1
|
||||
PROVIDER != grep ^'provider =' ${VENDOR_PATH}/vendor.conf | cut -d '=' -f 2 | cut -d ',' -f 1 | tr -d "[:space:]"
|
||||
VERSION != git describe 2>/dev/null || echo -n "unknown"
|
||||
APPNAME ?= $(shell VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam appname | tail -n 1)
|
||||
TARGET ?= $(shell VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam binname | tail -n 1)
|
||||
PROVIDER ?= $(shell grep ^'provider =' ${VENDOR_PATH}/vendor.conf | cut -d '=' -f 2 | cut -d ',' -f 1 | tr -d "[:space:]")
|
||||
VERSION ?= $(shell git describe 2> /dev/null)
|
||||
ifeq ($(VERSION),)
|
||||
VERSION := "unknown"
|
||||
endif
|
||||
WINCERTPASS ?= pass
|
||||
OSXAPPPASS ?= pass
|
||||
OSXMORDORUID ?= uid
|
||||
|
||||
# go paths
|
||||
GOPATH != go env GOPATH
|
||||
GOPATH = $(shell go env GOPATH)
|
||||
TARGET_GOLIB=lib/libgoshim.a
|
||||
SOURCE_GOLIB=gui/backend.go
|
||||
|
||||
# detect OS
|
||||
UNAME != uname -s
|
||||
PLATFORM != [ '$(UNAME)' = 'Windows_NT' ] && echo -n 'windows' || (echo ${UNAME} | awk "{print tolower(\$$0)}")
|
||||
UNAME = $(shell uname -s)
|
||||
ifeq ($(OS), Windows_NT)
|
||||
PLATFORM = windows
|
||||
else
|
||||
PLATFORM ?= $(shell echo ${UNAME} | awk "{print tolower(\$$0)}")
|
||||
endif
|
||||
|
||||
QTBUILD = build/qt
|
||||
INSTALLER = build/installer
|
||||
|
@ -43,10 +50,14 @@ endif
|
|||
SCRIPTS = branding/scripts
|
||||
TEMPLATES = branding/templates
|
||||
|
||||
OPENVPN_WINDOWS_INSTALLER = https://build.openvpn.net/downloads/releases/OpenVPN-2.5.1-I601-amd64.msi
|
||||
TAP_WINDOWS = https://build.openvpn.net/downloads/releases/tap-windows-9.24.2-I601-Win10.exe
|
||||
|
||||
HAS_QTIFW != which binarycreator.exe 2>/dev/null || PATH=$(PATH) which binarycreator
|
||||
OPENVPN_BIN != echo -n "$(HOME)/openvpn_build/sbin/$$(grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')"
|
||||
ifeq ($(PLATFORM), windows)
|
||||
HAS_QTIFW := $(shell which binarycreator.exe)
|
||||
else
|
||||
HAS_QTIFW := $(shell PATH=$(PATH) which binarycreator)
|
||||
endif
|
||||
OPENVPN_BIN = "$(HOME)/openvpn_build/sbin/$(shell grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')"
|
||||
|
||||
|
||||
#########################################################################
|
||||
|
@ -80,13 +91,20 @@ dependsCYGWIN_NT-10.0:
|
|||
@echo "==================================WARNING=================================="
|
||||
@echo
|
||||
|
||||
EXTRA_FLAGS != [ $(PLATFORM) = 'darwin' ] && echo -n MACOSX_DEPLOYMENT_TARGET=10.10 GOOS=darwin CC=clang
|
||||
EXTRA_GO_LDFLAGS != [ $(PLATFORM) = 'windows' ] && echo -n '-H=windowsgui'
|
||||
ifeq ($(PLATFORM), darwin)
|
||||
EXTRA_FLAGS = MACOSX_DEPLOYMENT_TARGET=10.10 GOOS=darwin CC=clang
|
||||
else
|
||||
EXTRA_FLAGS =
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), windows)
|
||||
EXTRA_GO_LDFLAGS = "-H=windowsgui"
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), windows)
|
||||
PKGFILES = $(wildcard "pkg/*") # syntax err in windows with find
|
||||
else
|
||||
PKGFILES != find pkg -type f -name '*.go'
|
||||
PKGFILES = $(shell find pkg -type f -name '*.go')
|
||||
endif
|
||||
|
||||
lib/%.a: $(PKGFILES)
|
||||
|
@ -204,9 +222,9 @@ else
|
|||
endif
|
||||
@cp ${QTBUILD}/release/${TARGET}.exe ${INST_DATA}${TARGET}.exe
|
||||
ifeq (${RELEASE}, yes)
|
||||
@windeployqt --qmldir gui/qml ${INST_DATA}${TARGET}.exe # FIXME --release flag cannot find platform plugin
|
||||
@windeployqt --qmldir gui/qml ${INST_DATA}${TARGET}.exe # FIXME --release flag cannot find platform plugin
|
||||
else
|
||||
@windeployqt --qmldir gui/components ${INST_DATA}${TARGET}.exe
|
||||
@windeployqt --qmldir gui/qml ${INST_DATA}${TARGET}.exe
|
||||
endif
|
||||
# XXX this is a workaround for missing libs after windeployqt ---
|
||||
@cp /c/Qt/5.15.2/mingw81_64/bin/libgcc_s_seh-1.dll ${INST_DATA}
|
||||
|
@ -214,7 +232,7 @@ endif
|
|||
@cp /c/Qt/5.15.2/mingw81_64/bin/libwinpthread-1.dll ${INST_DATA}
|
||||
@cp -r /c/Qt/5.15.2/mingw81_64/qml ${INST_DATA}
|
||||
# TODO stage it
|
||||
@wget ${OPENVPN_WINDOWS_INSTALLER} -O ${INST_DATA}openvpn-installer.msi
|
||||
@wget ${OPENVPN_WINDOWS_INSTALLER} -O ${INST_DATA}openvpn-installer.msi
|
||||
endif
|
||||
ifeq (${PLATFORM}, linux)
|
||||
@VERSION=${VERSION} ${SCRIPTS}/gen-qtinstaller linux ${INSTALLER}
|
||||
|
|
2
go.sum
2
go.sum
|
@ -1,3 +1,5 @@
|
|||
0xacab.org/leap/obfsvpn v0.0.0-20220626143947-feff527c00e5 h1:9L+A7UxH5cooOshq4IR9v8BfCyt29EGEZuOEHzviwvs=
|
||||
0xacab.org/leap/obfsvpn v0.0.0-20220626143947-feff527c00e5/go.mod h1:UmbCj0Xa/h264q6CfWKjmpofz6aVql4gzKSy7SDVUl4=
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q=
|
||||
|
|
Loading…
Reference in New Issue