0e84962fde
Merge in DNS/adguard-home from 2276-releases to master Updates #2276. Squashed commit of the following: commit 84961947c51477aae53606ec6e2e0cce0bdfc139 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:36:13 2020 +0300 all: fix github build commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:34:02 2020 +0300 all: remove old Dockerfile, improve build scripts commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e Merge: 2292b677a5e20ac7edAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:47:19 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:30:10 2020 +0300 all: improve docker build commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc Merge: c7d3f12efaef4659e9Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 17:47:45 2020 +0300 Merge branch 'master' into WIP-2276-releases commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 16:28:25 2020 +0300 all: improve build scripts commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 15:36:47 2020 +0300 all: fix Makefile commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 14:16:19 2020 +0300 scripts: fix build-release commit ecc0577e2451afa86c37da7283a63a9d26fb37ba Merge: dde64ed8e483f02c92Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 13:59:32 2020 +0300 Merge branch 'master' into WIP-2276-releases commit dde64ed8e456f73559f21c2ca549dc3b46724add Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 18:04:46 2020 +0300 all: imp docs, other improvements commit be8574408db79901bb15c1d31916db3ca352a35f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 14:48:30 2020 +0300 all: imp docker build commit fc1876f34b93d667bf166226f4bc666d394f10c7 Merge: fa5a304c8955b735c8Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 13:54:29 2020 +0300 Merge branch 'master' into WIP-2276-releases commit fa5a304c83d86145796a2de4141de6d18f7c56bf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 19:10:51 2020 +0300 all: improve scripts commit 3f32e3fd5e658d058d5c5172519384efc6cfef83 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:50:01 2020 +0300 all: improve scripts commit 2d38b81421acab4b90a7a19da7598c75063e8e93 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:25:21 2020 +0300 all: fix shell for windows, improve go-lint.sh commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049 Merge: 313b020e99fb6bf82cAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:14:38 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 313b020e9dfcdab736670cee72b2171eac8c32b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:13:31 2020 +0300 Makefile: use npm ci again commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:57:54 2020 +0300 all: try fixing windows build commit c63a2a54641ac8cd032a3306bb35e49b9ae74728 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:39:30 2020 +0300 all: imp scripts, try another goproxy and direct commit 423229e8b63ee73caeee8e84c23f67d145aff9df Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:25:29 2020 +0300 all: imp HACKING.md, try a new proxy ... and 1 more commit
95 lines
2.5 KiB
Makefile
95 lines
2.5 KiB
Makefile
# Keep the Makefile POSIX-compliant. We currently allow hyphens in
|
|
# target names, but that may change in the future.
|
|
#
|
|
# See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
|
|
.POSIX:
|
|
|
|
CHANNEL = development
|
|
CLIENT_BETA_DIR = client2
|
|
CLIENT_DIR = client
|
|
COMMIT = $$(git rev-parse --short HEAD)
|
|
DIST_DIR = dist
|
|
GO = go
|
|
# TODO(a.garipov): Add more default proxies using pipes after update to
|
|
# Go 1.15.
|
|
#
|
|
# GOPROXY = https://goproxy.io|https://goproxy.cn|direct
|
|
GOPROXY = https://goproxy.cn,https://goproxy.io,direct
|
|
GPG_KEY_PASSPHRASE = not-a-real-password
|
|
NPM = npm
|
|
NPM_FLAGS = --prefix $(CLIENT_DIR)
|
|
SIGN = 1
|
|
VERBOSE = 0
|
|
VERSION = v0.0.0
|
|
YARN = yarn
|
|
YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
|
|
|
|
ENV = env\
|
|
COMMIT='$(COMMIT)'\
|
|
CHANNEL='$(CHANNEL)'\
|
|
GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
|
|
DIST_DIR='$(DIST_DIR)'\
|
|
GO='$(GO)'\
|
|
GOPROXY='$(GOPROXY)'\
|
|
PATH="$${PWD}/bin:$$($(GO) env GOPATH)/bin:$${PATH}"\
|
|
SIGN='$(SIGN)'\
|
|
VERBOSE='$(VERBOSE)'\
|
|
VERSION='$(VERSION)'\
|
|
|
|
# Keep the line above blank.
|
|
|
|
# Keep this target first, so that a naked make invocation triggers
|
|
# a full build.
|
|
build: deps quick-build
|
|
|
|
quick-build: js-build go-build
|
|
|
|
ci: deps test
|
|
|
|
deps: js-deps go-deps
|
|
lint: js-lint go-lint
|
|
test: js-test go-test
|
|
|
|
# Here and below, keep $(SHELL) in quotes, because on Windows this will
|
|
# expand to something like "C:/Program Files/Git/usr/bin/sh.exe".
|
|
build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
|
|
|
|
build-release: deps js-build
|
|
$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
|
|
|
|
clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
|
|
init: ; git config core.hooksPath ./scripts/hooks
|
|
|
|
js-build:
|
|
$(NPM) $(NPM_FLAGS) run build-prod
|
|
$(YARN) $(YARN_FLAGS) build
|
|
js-deps:
|
|
$(NPM) $(NPM_FLAGS) ci
|
|
$(YARN) $(YARN_FLAGS) install
|
|
js-lint:
|
|
$(NPM) $(NPM_FLAGS) run lint
|
|
$(YARN) $(YARN_FLAGS) lint
|
|
js-test:
|
|
$(NPM) $(NPM_FLAGS) run test
|
|
|
|
go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
|
|
go-deps: ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
|
|
go-lint: ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
|
|
go-test: ; $(ENV) "$(SHELL)" ./scripts/make/go-test.sh
|
|
go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
|
|
|
|
# TODO(a.garipov): Remove the legacy targets once the build
|
|
# infrastructure stops using them.
|
|
dependencies:
|
|
@ echo "use make deps instead"
|
|
@ $(MAKE) deps
|
|
docker-multi-arch:
|
|
@ echo "use make build-docker instead"
|
|
@ $(MAKE) build-docker
|
|
go-install-tools:
|
|
@ echo "use make go-tools instead"
|
|
@ $(MAKE) go-tools
|
|
release:
|
|
@ echo "use make build-release instead"
|
|
@ $(MAKE) build-release
|