Skip to content
Snippets Groups Projects
Unverified Commit 3c23cb6e authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[pkg] be more silent

parent 50372107
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 61 deletions
Makefile
+ 60
− 61
View file @ 3c23cb6e
...@@ -26,47 +26,46 @@ all: icon locales get build ...@@ -26,47 +26,46 @@ all: icon locales get build
depends: depends:
-@make depends$(UNAME) -@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: 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: dependsDarwin:
# TODO - bootstrap homebrew if not there # TODO - bootstrap homebrew if not there
brew install python3 golang make pkg-config upx @brew install python3 golang make pkg-config upx
brew install --default-names gnu-sed @brew install --default-names gnu-sed
dependsCygwin: dependsCygwin:
choco install -y golang python nssm nsis wget 7zip choco install -y golang python nssm nsis wget 7zip
get: get:
go get -tags $(TAGS) ./... @go get -tags $(TAGS) ./...
go get -tags "$(TAGS) bitmaskd" ./... @go get -tags "$(TAGS) bitmaskd" ./...
build: $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path))) build: $(foreach path,$(wildcard cmd/*),build_$(patsubst cmd/%,%,$(path)))
build_%: build_%:
go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$* @go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" -o $* ./cmd/$*
# FIXME does not work in osx -@strip $*
# strip $* @mkdir -p build/bin
mkdir -p build/bin @mv $* build/bin/
mv $* build/bin/ -@rm -rf build/${PROVIDER}/staging && mkdir -p build/${PROVIDER}/staging
mkdir -p build/${PROVIDER}/staging -@ln -s ../../bin/$* build/${PROVIDER}/staging/$*
ln -s ../../bin/$* build/${PROVIDER}/staging/$*
test: test:
go test -tags "integration $(TAGS)" ./... @go test -tags "integration $(TAGS)" ./...
build_bitmaskd: 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: build_win:
powershell -Command '$$version=git describe --tags; go build -ldflags "-H windowsgui -X main.version=$$version" ./cmd/*' powershell -Command '$$version=git describe --tags; go build -ldflags "-H windowsgui -X main.version=$$version" ./cmd/*'
clean: clean:
rm -f build/${PROVIDER}/bin/bitmask-* @rm -f build/${PROVIDER}/bin/bitmask-*
unlink branding/assets/default @unlink branding/assets/default
######################################################################### #########################################################################
# packaging templates # packaging templates
...@@ -75,68 +74,68 @@ clean: ...@@ -75,68 +74,68 @@ clean:
prepare: prepare_templates gen_pkg_win gen_pkg_osx gen_pkg_snap gen_pkg_deb prepare: prepare_templates gen_pkg_win gen_pkg_osx gen_pkg_snap gen_pkg_deb
prepare_templates: generate relink_default tgz prepare_templates: generate relink_default tgz
mkdir -p build/${PROVIDER}/bin/ @mkdir -p build/${PROVIDER}/bin/
cp ${TEMPLATES}/makefile/Makefile build/${PROVIDER}/Makefile @cp ${TEMPLATES}/makefile/Makefile build/${PROVIDER}/Makefile
VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-vendor-make.py build/${PROVIDER}/vendor.mk @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-vendor-make.py build/${PROVIDER}/vendor.mk
${SCRIPTS}/check-ca-crt.py ${PROVIDER} ${PROVIDER_CONFIG} @${SCRIPTS}/check-ca-crt.py ${PROVIDER} ${PROVIDER_CONFIG}
generate: generate:
go generate cmd/bitmask-vpn/main.go @go generate cmd/bitmask-vpn/main.go
relink_default: relink_default:
ifneq (,$(wildcard ${DEFAULT_PROVIDER})) ifneq (,$(wildcard ${DEFAULT_PROVIDER}))
cd branding/assets && unlink default @cd branding/assets && unlink default
endif endif
cd branding/assets && ln -s ${PROVIDER} default @cd branding/assets && ln -s ${PROVIDER} default
TGZ_NAME = bitmask-vpn_${VERSION}-src TGZ_NAME = bitmask-vpn_${VERSION}-src
TGZ_PATH = $(shell pwd)/build/${TGZ_NAME} TGZ_PATH = $(shell pwd)/build/${TGZ_NAME}
tgz: tgz:
mkdir -p $(TGZ_PATH) @mkdir -p $(TGZ_PATH)
git archive HEAD | tar -x -C $(TGZ_PATH) @git archive HEAD | tar -x -C $(TGZ_PATH)
mkdir $(TGZ_PATH)/helpers -@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 @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 @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 @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} @cd build/ && tar cvzf bitmask-vpn_$(VERSION).tgz ${TGZ_NAME}
rm -r $(TGZ_PATH) @rm -f $(TGZ_PATH)
gen_pkg_win: gen_pkg_win:
mkdir -p build/${PROVIDER}/windows/ @mkdir -p build/${PROVIDER}/windows/
cp -r ${TEMPLATES}/windows build/${PROVIDER} @cp -r ${TEMPLATES}/windows build/${PROVIDER}
VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-win.py build/${PROVIDER}/windows/data.json @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-win.py build/${PROVIDER}/windows/data.json
cd build/${PROVIDER}/windows && python3 generate.py @cd build/${PROVIDER}/windows && python3 generate.py
# TODO create/copy build/PROVIDER/assets/ # TODO create/copy build/PROVIDER/assets/
# TODO create/copy build/PROVIDER/staging/ # TODO create/copy build/PROVIDER/staging/
gen_pkg_osx: gen_pkg_osx:
mkdir -p build/${PROVIDER}/osx/scripts @mkdir -p build/${PROVIDER}/osx/scripts
mkdir -p build/${PROVIDER}/staging @mkdir -p build/${PROVIDER}/staging
ifeq (,$(wildcard build/${PROVIDER}/assets)) ifeq (,$(wildcard build/${PROVIDER}/assets))
ln -s ../../branding/assets/default build/${PROVIDER}/assets @ln -s ../../branding/assets/default build/${PROVIDER}/assets
endif endif
ifeq (,$(wildcard build/${PROVIDER}/staging/openvpn-osx)) 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 endif
cp -r ${TEMPLATES}/osx build/${PROVIDER} @cp -r ${TEMPLATES}/osx build/${PROVIDER}
VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-osx.py build/${PROVIDER}/osx/data.json @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 && python3 generate.py
cd build/${PROVIDER}/osx/scripts && chmod +x preinstall postinstall @cd build/${PROVIDER}/osx/scripts && chmod +x preinstall postinstall
gen_pkg_snap: gen_pkg_snap:
cp -r ${TEMPLATES}/snap build/${PROVIDER} @cp -r ${TEMPLATES}/snap build/${PROVIDER}
VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-snap.py build/${PROVIDER}/snap/data.json @VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-snap.py build/${PROVIDER}/snap/data.json
cd build/${PROVIDER}/snap && python3 generate.py @cd build/${PROVIDER}/snap && python3 generate.py
rm build/${PROVIDER}/snap/data.json build/${PROVIDER}/snap/snapcraft-template.yaml @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 @mkdir -p build/${PROVIDER}/snap/gui && cp branding/assets/default/icon.svg build/${PROVIDER}/snap/gui/icon.svg
# TODO missing hooks # TODO missing hooks
gen_pkg_deb: gen_pkg_deb:
cp -r ${TEMPLATES}/debian build/${PROVIDER} @cp -r ${TEMPLATES}/debian build/${PROVIDER}
VERSION=${VERSION} PROVIDER_CONFIG=${PROVIDER_CONFIG} ${SCRIPTS}/generate-debian.py build/${PROVIDER}/debian/data.json @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 @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 && python3 generate.py
cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules @cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules
######################################################################### #########################################################################
# packaging action # packaging action
...@@ -162,7 +161,7 @@ pkg_snap: ...@@ -162,7 +161,7 @@ pkg_snap:
######################################################################### #########################################################################
icon: icon:
make -C icon @make -C icon
LANGS ?= $(foreach path,$(wildcard locales/*),$(patsubst locales/%,%,$(path))) LANGS ?= $(foreach path,$(wildcard locales/*),$(patsubst locales/%,%,$(path)))
...@@ -173,15 +172,15 @@ lang_list := $(subst $(space),,$(foreach lang,$(LANGS),$(lang),)) ...@@ -173,15 +172,15 @@ lang_list := $(subst $(space),,$(foreach lang,$(LANGS),$(lang),))
locales: $(foreach lang,$(LANGS),get_$(lang)) cmd/bitmask-vpn/catalog.go locales: $(foreach lang,$(LANGS),get_$(lang)) cmd/bitmask-vpn/catalog.go
generate_locales: generate_locales:
gotext update -lang=$(lang_list) ./pkg/systray ./pkg/bitmask @gotext update -lang=$(lang_list) ./pkg/systray ./pkg/bitmask
make -C tools/transifex @make -C tools/transifex
locales/%/out.gotext.json: pkg/systray/systray.go pkg/systray/notificator.go pkg/bitmask/standalone.go pkg/bitmask/bitmaskd.go 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) 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 get_%: locales/%/out.gotext.json
make -C tools/transifex build @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/$*/ @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/$*/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment