From 3c23cb6e3223d72116e9b16109f7e81adaf87d91 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Tue, 6 Aug 2019 18:05:03 +0200 Subject: [pkg] be more silent --- Makefile | 121 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 61 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9546aef..84ed31d 100644 --- a/Makefile +++ b/Makefile @@ -26,47 +26,46 @@ all: icon locales get build depends: -@make depends$(UNAME) - go get -u golang.org/x/text/cmd/gotext github.com/cratonica/2goarray + @go get -u golang.org/x/text/cmd/gotext github.com/cratonica/2goarray dependsLinux: - sudo apt install libgtk-3-dev libappindicator3-dev golang pkg-config cmake + @sudo apt install libgtk-3-dev libappindicator3-dev golang pkg-config cmake dependsDarwin: # TODO - bootstrap homebrew if not there - brew install python3 golang make pkg-config upx - brew install --default-names gnu-sed + @brew install python3 golang make pkg-config upx + @brew install --default-names gnu-sed dependsCygwin: choco install -y golang python nssm nsis wget 7zip get: - go get -tags $(TAGS) ./... - go get -tags "$(TAGS) bitmaskd" ./... + @go get -tags $(TAGS) ./... + @go get -tags "$(TAGS) bitmaskd" ./... build: $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path))) build_%: - go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$* - # FIXME does not work in osx - # strip $* - mkdir -p build/bin - mv $* build/bin/ - mkdir -p build/${PROVIDER}/staging - ln -s ../../bin/$* build/${PROVIDER}/staging/$* + @go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$* + -@strip $* + @mkdir -p build/bin + @mv $* build/bin/ + -@rm -rf build/${PROVIDER}/staging && mkdir -p build/${PROVIDER}/staging + -@ln -s ../../bin/$* build/${PROVIDER}/staging/$* test: - go test -tags "integration $(TAGS)" ./... + @go test -tags "integration $(TAGS)" ./... build_bitmaskd: - go build -tags "$(TAGS) bitmaskd" -ldflags "-X main.version=`git describe --tags`" ./cmd/* + @go build -tags "$(TAGS) bitmaskd" -ldflags "-X main.version=`git describe --tags`" ./cmd/* build_win: powershell -Command '$$version=git describe --tags; go build -ldflags "-H windowsgui -X main.version=$$version" ./cmd/*' clean: - rm -f build/${PROVIDER}/bin/bitmask-* - unlink branding/assets/default + @rm -f build/${PROVIDER}/bin/bitmask-* + @unlink branding/assets/default ######################################################################### # packaging templates @@ -75,68 +74,68 @@ clean: prepare: prepare_templates gen_pkg_win gen_pkg_osx gen_pkg_snap gen_pkg_deb prepare_templates: generate relink_default tgz - mkdir -p build/${PROVIDER}/bin/ - cp ${TEMPLATES}/makefile/Makefile build/${PROVIDER}/Makefile - VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-vendor-make.py build/${PROVIDER}/vendor.mk - ${SCRIPTS}/check-ca-crt.py ${PROVIDER} ${PROVIDER_CONFIG} + @mkdir -p build/${PROVIDER}/bin/ + @cp ${TEMPLATES}/makefile/Makefile build/${PROVIDER}/Makefile + @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-vendor-make.py build/${PROVIDER}/vendor.mk + @${SCRIPTS}/check-ca-crt.py ${PROVIDER} ${PROVIDER_CONFIG} generate: - go generate cmd/bitmask-vpn/main.go + @go generate cmd/bitmask-vpn/main.go relink_default: ifneq (,$(wildcard ${DEFAULT_PROVIDER})) - cd branding/assets && unlink default + @cd branding/assets && unlink default endif - cd branding/assets && ln -s ${PROVIDER} default + @cd branding/assets && ln -s ${PROVIDER} default TGZ_NAME = bitmask-vpn_${VERSION}-src TGZ_PATH = $(shell pwd)/build/${TGZ_NAME} tgz: - mkdir -p $(TGZ_PATH) - git archive HEAD | tar -x -C $(TGZ_PATH) - mkdir $(TGZ_PATH)/helpers - wget -O $(TGZ_PATH)/helpers/bitmask-root https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root - chmod +x $(TGZ_PATH)/helpers/bitmask-root - wget -O $(TGZ_PATH)/helpers/se.leap.bitmask.policy https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy - cd build/ && tar cvzf bitmask-vpn_$(VERSION).tgz ${TGZ_NAME} - rm -r $(TGZ_PATH) + @mkdir -p $(TGZ_PATH) + @git archive HEAD | tar -x -C $(TGZ_PATH) + -@mkdir -p $(TGZ_PATH)/helpers + @wget -O $(TGZ_PATH)/helpers/bitmask-root https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root + @chmod +x $(TGZ_PATH)/helpers/bitmask-root + @wget -O $(TGZ_PATH)/helpers/se.leap.bitmask.policy https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy + @cd build/ && tar cvzf bitmask-vpn_$(VERSION).tgz ${TGZ_NAME} + @rm -f $(TGZ_PATH) gen_pkg_win: - mkdir -p build/${PROVIDER}/windows/ - cp -r ${TEMPLATES}/windows build/${PROVIDER} - VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-win.py build/${PROVIDER}/windows/data.json - cd build/${PROVIDER}/windows && python3 generate.py + @mkdir -p build/${PROVIDER}/windows/ + @cp -r ${TEMPLATES}/windows build/${PROVIDER} + @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-win.py build/${PROVIDER}/windows/data.json + @cd build/${PROVIDER}/windows && python3 generate.py # TODO create/copy build/PROVIDER/assets/ # TODO create/copy build/PROVIDER/staging/ gen_pkg_osx: - mkdir -p build/${PROVIDER}/osx/scripts - mkdir -p build/${PROVIDER}/staging + @mkdir -p build/${PROVIDER}/osx/scripts + @mkdir -p build/${PROVIDER}/staging ifeq (,$(wildcard build/${PROVIDER}/assets)) - ln -s ../../branding/assets/default build/${PROVIDER}/assets + @ln -s ../../branding/assets/default build/${PROVIDER}/assets endif ifeq (,$(wildcard build/${PROVIDER}/staging/openvpn-osx)) - curl -L https://downloads.leap.se/thirdparty/osx/openvpn/openvpn -o build/${PROVIDER}/staging/openvpn-osx + @curl -L https://downloads.leap.se/thirdparty/osx/openvpn/openvpn -o build/${PROVIDER}/staging/openvpn-osx endif - cp -r ${TEMPLATES}/osx build/${PROVIDER} - VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-osx.py build/${PROVIDER}/osx/data.json - cd build/${PROVIDER}/osx && python3 generate.py - cd build/${PROVIDER}/osx/scripts && chmod +x preinstall postinstall + @cp -r ${TEMPLATES}/osx build/${PROVIDER} + @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-osx.py build/${PROVIDER}/osx/data.json + @cd build/${PROVIDER}/osx && python3 generate.py + @cd build/${PROVIDER}/osx/scripts && chmod +x preinstall postinstall gen_pkg_snap: - cp -r ${TEMPLATES}/snap build/${PROVIDER} - VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-snap.py build/${PROVIDER}/snap/data.json - cd build/${PROVIDER}/snap && python3 generate.py - rm build/${PROVIDER}/snap/data.json build/${PROVIDER}/snap/snapcraft-template.yaml - mkdir -p build/${PROVIDER}/snap/gui && cp branding/assets/default/icon.svg build/${PROVIDER}/snap/gui/icon.svg + @cp -r ${TEMPLATES}/snap build/${PROVIDER} + @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-snap.py build/${PROVIDER}/snap/data.json + @cd build/${PROVIDER}/snap && python3 generate.py + @rm build/${PROVIDER}/snap/data.json build/${PROVIDER}/snap/snapcraft-template.yaml + @mkdir -p build/${PROVIDER}/snap/gui && cp branding/assets/default/icon.svg build/${PROVIDER}/snap/gui/icon.svg # TODO missing hooks gen_pkg_deb: - cp -r ${TEMPLATES}/debian build/${PROVIDER} - VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-debian.py build/${PROVIDER}/debian/data.json - mkdir -p build/${PROVIDER}/debian/icons/scalable && cp branding/assets/default/icon.svg build/${PROVIDER}/debian/icons/scalable/icon.svg - cd build/${PROVIDER}/debian && python3 generate.py - cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules + @cp -r ${TEMPLATES}/debian build/${PROVIDER} + @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-debian.py build/${PROVIDER}/debian/data.json + @mkdir -p build/${PROVIDER}/debian/icons/scalable && cp branding/assets/default/icon.svg build/${PROVIDER}/debian/icons/scalable/icon.svg + @cd build/${PROVIDER}/debian && python3 generate.py + @cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules ######################################################################### # packaging action @@ -162,7 +161,7 @@ pkg_snap: ######################################################################### icon: - make -C icon + @make -C icon LANGS ?= $(foreach path,$(wildcard locales/*),$(patsubst locales/%,%,$(path))) @@ -173,15 +172,15 @@ lang_list := $(subst $(space),,$(foreach lang,$(LANGS),$(lang),)) locales: $(foreach lang,$(LANGS),get_$(lang)) cmd/bitmask-vpn/catalog.go generate_locales: - gotext update -lang=$(lang_list) ./pkg/systray ./pkg/bitmask - make -C tools/transifex + @gotext update -lang=$(lang_list) ./pkg/systray ./pkg/bitmask + @make -C tools/transifex locales/%/out.gotext.json: pkg/systray/systray.go pkg/systray/notificator.go pkg/bitmask/standalone.go pkg/bitmask/bitmaskd.go - gotext update -lang=$* ./pkg/systray ./pkg/bitmask + @gotext update -lang=$* ./pkg/systray ./pkg/bitmask cmd/bitmask-vpn/catalog.go: $(foreach lang,$(LANGS),locales/$(lang)/messages.gotext.json) - gotext update -lang=$(lang_list) -out cmd/bitmask-vpn/catalog.go ./pkg/systray ./pkg/bitmask + @gotext update -lang=$(lang_list) -out cmd/bitmask-vpn/catalog.go ./pkg/systray ./pkg/bitmask get_%: locales/%/out.gotext.json - make -C tools/transifex build - curl -L -X GET --user "api:${API_TOKEN}" "https://www.transifex.com/api/2/project/bitmask/resource/RiseupVPN/translation/${subst -,_,$*}/?file" | tools/transifex/transifex t2g locales/$*/ + @make -C tools/transifex build + @curl -L -X GET --user "api:${API_TOKEN}" "https://www.transifex.com/api/2/project/bitmask/resource/RiseupVPN/translation/${subst -,_,$*}/?file" | tools/transifex/transifex t2g locales/$*/ -- cgit v1.2.3