diff options
| author | kali <kali@leap.se> | 2020-07-21 20:47:30 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2020-10-13 19:08:33 +0200 |
| commit | 75d723cf167136a18342402a9a6e82e51c13b700 (patch) | |
| tree | a440e0bc912505143167233ca8457eace2ce0e8c /Makefile | |
| parent | 1ae11e5c615c996cbef3db694fc571bfe6524d1d (diff) | |
[bug] fix version reporting in helper
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -54,11 +54,13 @@ dependsDarwin: @brew install python3 golang make pkg-config curl @brew install --default-names gnu-sed -dependsCygwin: - @choco install -y golang python nssm nsis wget 7zip +build: build_helper + @gui/build.sh -build: - gui/build.sh +build_helper: + @echo "PLATFORM: ${PLATFORM}" + @mkdir -p build/bin/${PLATFORM} + go build -o build/bin/${PLATFORM}/bitmask-helper -ldflags "-X main.AppName=${PROVIDER}VPN -X main.Version=${VERSION}" ./cmd/bitmask-helper/ build_old: ifeq (${XBUILD}, yes) @@ -76,8 +78,12 @@ else endif -helper: - go build -ldflags "-X main.AppName=${PROVIDER}VPN -X main.Version=${VERSION}" cmd/bitmask-helper/main.go +build_old_%: + @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}/$* test: @go test -tags "integration $(TAGS)" ./pkg/... |