You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ei...@apache.org on 2020/02/18 15:14:49 UTC
[couchdb] branch prototype/sync-master-makefile created (now
b1ad185)
This is an automated email from the ASF dual-hosted git repository.
eiri pushed a change to branch prototype/sync-master-makefile
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at b1ad185 Sync Makefile with master
This branch includes the following new commits:
new b1ad185 Sync Makefile with master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 01/01: Sync Makefile with master
Posted by ei...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eiri pushed a commit to branch prototype/sync-master-makefile
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b1ad185d35ba4535ac44b3e43071eb0487d8a02e
Author: Eric Avdey <ei...@eiri.ca>
AuthorDate: Tue Feb 18 11:14:29 2020 -0400
Sync Makefile with master
---
Makefile | 131 +++++++++++++++--------------------------
Makefile.win | 188 +++++++++++++++++++++++++++--------------------------------
2 files changed, 133 insertions(+), 186 deletions(-)
diff --git a/Makefile b/Makefile
index 8039106..e229ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -45,13 +45,13 @@ IN_RC = $(shell git describe --tags --always --first-parent \
# ON_TAG matches *ONLY* if we are on a release or RC tag
ON_TAG = $(shell git describe --tags --always --first-parent \
| grep -Eo -- '^[0-9]+\.[0-9]\.[0-9]+(-RC[0-9]+)?$$' 2>/dev/null)
-# RELTAG contains the #.#.# from git describe, which might be used
-RELTAG = $(shell git describe --tags --always --first-parent \
+# REL_TAG contains the #.#.# from git describe, which might be used
+REL_TAG = $(shell git describe --tags --always --first-parent \
| grep -Eo -- '^[0-9]+\.[0-9]\.[0-9]+' 2>/dev/null)
# DIRTY identifies if we're not on a commit
DIRTY = $(shell git describe --dirty | grep -Eo -- '-dirty' 2>/dev/null)
# COUCHDB_GIT_SHA is our current git hash.
-COUCHDB_GIT_SHA=$(shell git rev-parse --short --verify HEAD)
+COUCHDB_GIT_SHA=$(shell git rev-parse --short=7 --verify HEAD)
ifeq ($(ON_TAG),)
# 4. Not on a tag.
@@ -59,7 +59,7 @@ COUCHDB_VERSION_SUFFIX = $(COUCHDB_GIT_SHA)$(DIRTY)
COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)-$(COUCHDB_VERSION_SUFFIX)
else
# 2 and 3. On a tag.
-COUCHDB_VERSION = $(RELTAG)$(DIRTY)
+COUCHDB_VERSION = $(REL_TAG)$(DIRTY)
endif
endif
@@ -93,6 +93,8 @@ EXUNIT_OPTS=$(subst $(comma),$(space),$(tests))
#ignore javascript tests
ignore_js_suites=
+TEST_OPTS="-c 'startup_jitter=0' -c 'default_security=admin_local'"
+
################################################################################
# Main commands
################################################################################
@@ -144,19 +146,11 @@ fauxton: share/www
.PHONY: check
# target: check - Test everything
-check: all
- @$(MAKE) test-cluster-with-quorum
- @$(MAKE) test-cluster-without-quorum
- @$(MAKE) python-black
+check: all python-black
@$(MAKE) eunit
@$(MAKE) javascript
@$(MAKE) mango-test
@$(MAKE) elixir
-# @$(MAKE) build-test
-
-
-.PHONY: eunit
-# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
ifdef apps
subdirs = $(apps)
@@ -164,22 +158,16 @@ else
subdirs=$(shell ls src)
endif
+.PHONY: eunit
+# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
eunit: export BUILDDIR = $(shell pwd)
eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell pwd)/bin/couchjs $(shell pwd)/share/server/main.js
+eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
eunit: couch
- @$(REBAR) setup_eunit 2> /dev/null
+ @COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) setup_eunit 2> /dev/null
@for dir in $(subdirs); do \
- tries=0; \
- while true; do \
- $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir ; \
- if [ $$? -eq 0 ]; then \
- break; \
- else \
- let "tries=tries+1"; \
- [ $$tries -gt 2 ] && exit 1; \
- fi \
- done \
+ COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir || exit 1; \
done
@@ -191,7 +179,7 @@ exunit: export ERL_LIBS = $(shell pwd)/src
exunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
exunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell pwd)/bin/couchjs $(shell pwd)/share/server/main.js
exunit: couch elixir-init setup-eunit elixir-check-formatted elixir-credo
- @mix test --trace $(EXUNIT_OPTS)
+ @mix test --cover --trace $(EXUNIT_OPTS)
setup-eunit: export BUILDDIR = $(shell pwd)
setup-eunit: export ERL_AFLAGS = -config $(shell pwd)/rel/files/eunit.config
@@ -221,7 +209,7 @@ python-black: .venv/bin/black
@python3 -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
LC_ALL=C.UTF-8 LANG=C.UTF-8 .venv/bin/black --check \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- . dev/run rel/overlay/bin/couchup test/javascript/run
+ . dev/run test/javascript/run src/mango src/docs
python-black-update: .venv/bin/black
@python3 -c "import sys; exit(1 if sys.version_info < (3,6) else 0)" || \
@@ -229,19 +217,17 @@ python-black-update: .venv/bin/black
@python3 -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
LC_ALL=C.UTF-8 LANG=C.UTF-8 .venv/bin/black \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- . dev/run rel/overlay/bin/couchup test/javascript/run
+ . dev/run test/javascript/run src/mango src/docs
.PHONY: elixir
elixir: export MIX_ENV=integration
+elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
elixir: elixir-init elixir-check-formatted elixir-credo devclean
- @dev/run --erlang-config=rel/files/eunit.config -n 1 -a adm:pass --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
-
-.PHONY: elixir-only
-elixir-only: devclean
- @dev/run --erlang-config=rel/files/eunit.config -n 1 -a adm:pass --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+ @dev/run "$(TEST_OPTS)" -a adm:pass -n 1 --enable-erlang-views --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
-elixir-init:
+elixir-init: MIX_ENV=test
+elixir-init: config.erl
@mix local.rebar --force && mix local.hex --force && mix deps.get
.PHONY: elixir-cluster-without-quorum
@@ -270,6 +256,7 @@ elixir-credo: elixir-init
.PHONY: javascript
# target: javascript - Run JavaScript test suites or specific ones defined by suites option
+javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
javascript: devclean
@mkdir -p share/www/script/test
ifeq ($(IN_RELEASE), true)
@@ -280,43 +267,13 @@ else
endif
@dev/run -n 1 -q --with-admin-party-please \
--enable-erlang-views \
- -c 'startup_jitter=0' \
+ "$(TEST_OPTS)" \
'test/javascript/run --suites "$(suites)" \
--ignore "$(ignore_js_suites)"'
-.PHONY: test-cluster-with-quorum
-test-cluster-with-quorum: devclean
- @mkdir -p share/www/script/test
-ifeq ($(IN_RELEASE), true)
- @cp test/javascript/tests/lorem*.txt share/www/script/test/
-else
- @mkdir -p src/fauxton/dist/release/test
- @cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
-endif
- @dev/run -n 3 -q --with-admin-party-please \
- --enable-erlang-views --degrade-cluster 1 \
- -c 'startup_jitter=0' \
- 'test/javascript/run --suites "$(suites)" \
- --ignore "$(ignore_js_suites)" \
- --path test/javascript/tests-cluster/with-quorum'
-
-.PHONY: test-cluster-without-quorum
-test-cluster-without-quorum: devclean
- @mkdir -p share/www/script/test
-ifeq ($(IN_RELEASE), true)
- @cp test/javascript/tests/lorem*.txt share/www/script/test/
-else
- @mkdir -p src/fauxton/dist/release/test
- @cp test/javascript/tests/lorem*.txt src/fauxton/dist/release/test/
-endif
- @dev/run -n 3 -q --with-admin-party-please \
- --enable-erlang-views --degrade-cluster 2 \
- -c 'startup_jitter=0' \
- 'test/javascript/run --suites "$(suites)" \
- --ignore "$(ignore_js_suites)" \
- --path test/javascript/tests-cluster/without-quorum'
.PHONY: soak-javascript
+soak-javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
soak-javascript:
@mkdir -p share/www/script/test
ifeq ($(IN_RELEASE), true)
@@ -328,11 +285,17 @@ endif
@rm -rf dev/lib
while [ $$? -eq 0 ]; do \
dev/run -n 1 -q --with-admin-party-please \
- -c 'startup_jitter=0' \
+ "$(TEST_OPTS)" \
'test/javascript/run --suites "$(suites)" \
--ignore "$(ignore_js_suites)"' \
done
+.PHONY: build-report
+# target: build-report - Generate and upload a build report
+build-report:
+ build-aux/show-test-results.py --suites=10 --tests=10 > test-results.log
+ build-aux/logfile-uploader.py
+
.PHONY: check-qs
# target: check-qs - Run query server tests (ruby and rspec required!)
check-qs:
@@ -371,11 +334,12 @@ build-test:
.PHONY: mango-test
# target: mango-test - Run Mango tests
+mango-test: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
mango-test: devclean all
@cd src/mango && \
python3 -m venv .venv && \
- .venv/bin/pip3 install -r requirements.txt
- @cd src/mango && ../../dev/run -n 1 --admin=testuser:testpass .venv/bin/nosetests
+ .venv/bin/python3 -m pip install -r requirements.txt
+ @cd src/mango && ../../dev/run "$(TEST_OPTS)" -n 1 --admin=testuser:testpass '.venv/bin/python3 -m nose --with-xunit'
################################################################################
# Developing
@@ -413,7 +377,7 @@ introspect:
.PHONY: dist
# target: dist - Make release tarball
-dist: all
+dist: all derived
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
@cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
@@ -462,9 +426,9 @@ endif
.PHONY: install
# target: install- install CouchDB :)
-install:
+install: release
@echo
- @echo "Notice: There is no 'make install' command for CouchDB 2.x."
+ @echo "Notice: There is no 'make install' command for CouchDB 2.x+."
@echo
@echo " To install CouchDB into your system, copy the rel/couchdb"
@echo " to your desired installation location. For example:"
@@ -515,19 +479,6 @@ devclean:
@rm -rf dev/lib/*/data
-.PHONY: uninstall
-# target: uninstall - Uninstall CouchDB :-(
-uninstall:
- @rm -rf $(DESTDIR)/$(install_dir)
- @rm -f $(DESTDIR)/$(bin_dir)/couchdb
- @rm -f $(DESTDIR)/$(libexec_dir)
- @rm -rf $(DESTDIR)/$(sysconf_dir)
- @rm -rf $(DESTDIR)/$(data_dir)
- @rm -rf $(DESTDIR)/$(doc_dir)
- @rm -rf $(DESTDIR)/$(html_dir)
- @rm -rf $(DESTDIR)/$(man_dir)
-
-
################################################################################
# Misc
################################################################################
@@ -553,3 +504,15 @@ ifeq ($(with_fauxton), 1)
@echo "Building Fauxton"
@cd src/fauxton && npm install --production && ./node_modules/grunt-cli/bin/grunt couchdb
endif
+
+
+derived:
+ @echo "COUCHDB_GIT_SHA: $(COUCHDB_GIT_SHA)"
+ @echo "COUCHDB_VERSION: $(COUCHDB_VERSION)"
+ @echo "COUCHDB_VERSION_SUFFIX: $(COUCHDB_VERSION_SUFFIX)"
+ @echo "DIRTY: $(DIRTY)"
+ @echo "IN_RC: $(IN_RC)"
+ @echo "IN_RELEASE: $(IN_RELEASE)"
+ @echo "ON_TAG: $(ON_TAG)"
+ @echo "REL_TAG: $(REL_TAG)"
+ @echo "SUB_VSN: $(SUB_VSN)"
diff --git a/Makefile.win b/Makefile.win
index a5e23d4..30ebe0e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -17,7 +17,9 @@
include version.mk
SHELL=cmd.exe
-REBAR?=$(shell where rebar.cmd)
+REBAR=bin\rebar.cmd
+MAKE=make -f Makefile.win
+# REBAR?=$(shell where rebar.cmd)
# Handle the following scenarios:
# 1. When building from a tarball, use version.mk.
@@ -28,6 +30,7 @@ REBAR?=$(shell where rebar.cmd)
# 4. When not on a clean tag, use version.mk + git sha + dirty status.
COUCHDB_GIT_SHA=$(git_sha)
+
IN_RELEASE = $(shell if not exist .git echo true)
ifeq ($(IN_RELEASE), true)
@@ -40,19 +43,19 @@ else
# Gather some additional information.
# We do it this way so we don't bake shell-isms into Makefile
# to make it easier to port to Windows. I know, I know. -jst
-# COUCHDB_GIT_SHA is our current git hash.
-COUCHDB_GIT_SHA=$(shell git rev-parse --short --verify HEAD)
# IN_RC contains the -RCx suffix in the name if present
IN_RC = $(shell git describe --tags --always --first-parent \
| grep -Eo -- '-RC[0-9]+' 2>nul)
# ON_TAG matches *ONLY* if we are on a release or RC tag
ON_TAG = $(shell git describe --tags --always --first-parent \
| grep -Eo -- '^[0-9]+\.[0-9]\.[0-9]+(-RC[0-9]+)?$$' 2>nul)
-# RELTAG contains the #.#.# from git describe, which might be used
-RELTAG = $(shell git describe --tags --always --first-parent \
+# REL_TAG contains the #.#.# from git describe, which might be used
+REL_TAG = $(shell git describe --tags --always --first-parent \
| grep -Eo -- '^[0-9]+\.[0-9]\.[0-9]+' 2>nul)
# DIRTY identifies if we're not on a commit
DIRTY = $(shell git describe --dirty | grep -Eo -- '-dirty' 2>nul)
+# COUCHDB_GIT_SHA is our current git hash.
+COUCHDB_GIT_SHA=$(shell git rev-parse --short=7 --verify HEAD)
ifeq ($(ON_TAG),)
# 4. Not on a tag.
@@ -60,7 +63,7 @@ COUCHDB_VERSION_SUFFIX = $(COUCHDB_GIT_SHA)$(DIRTY)
COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)-$(COUCHDB_VERSION_SUFFIX)
else
# 2 and 3. On a tag.
-COUCHDB_VERSION = $(RELTAG)$(DIRTY)
+COUCHDB_VERSION = $(REL_TAG)$(DIRTY)
endif
endif
@@ -73,7 +76,7 @@ DESTDIR=
# Rebar options
apps=
-skip_deps=folsom,meck,mochiweb,triq,snappy
+skip_deps=folsom,meck,mochiweb,triq,proper,snappy,bcrypt,hyper
suites=
tests=
@@ -83,6 +86,11 @@ DIALYZE_OPTS=skip_deps=$(skip_deps)
EXUNIT_OPTS=$(subst $(comma),$(space),$(tests))
+#ignore javascript tests
+ignore_js_suites=
+
+TEST_OPTS=-c startup_jitter=0 -c default_security=admin_local
+
################################################################################
# Main commands
################################################################################
@@ -99,9 +107,9 @@ all: couch fauxton docs
.PHONY: couch
-# target: couch - Build CouchDB core
+# target: couch - Build CouchDB core, use ERL_OPTS to provide custom compiler's options
couch: config.erl
- @set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) compile
+ @set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) compile $(COMPILE_OPTS)
@copy src\couch\priv\couchjs.exe bin
@@ -125,24 +133,27 @@ fauxton: share\www
.PHONY: check
# target: check - Test everything
-check: all
- @$(MAKE) -f Makefile.win test-cluster-with-quorum
- @$(MAKE) -f Makefile.win test-cluster-without-quorum
- @$(MAKE) -f Makefile.win eunit
- @$(MAKE) -f Makefile.win javascript
- @$(MAKE) -f Makefile.win python-black
- @$(MAKE) -f Makefile.win mango-test
-# @$(MAKE) -f Makefile.win elixir
-
+check: all python-black
+ @$(MAKE) eunit
+ @$(MAKE) javascript
+ @$(MAKE) mango-test
+ @$(MAKE) elixir
+
+ifdef apps
+subdirs = $(apps)
+else
+subdirs=$(shell dir /b src)
+endif
.PHONY: eunit
# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
-eunit: export ERL_AFLAGS = $(shell echo "-config rel/files/eunit.config")
eunit: export BUILDDIR = $(shell echo %cd%)
+eunit: export ERL_AFLAGS = $(shell echo "-config rel/files/eunit.config")
eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell echo %cd%)/bin/couchjs $(shell echo %cd%)/share/server/main.js
+eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
eunit: couch
- @$(REBAR) setup_eunit 2> nul
- @$(REBAR) -r eunit $(EUNIT_OPTS)
+ @set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) setup_eunit 2> nul
+ @cmd /c "FOR %d IN ($(subdirs)) DO set COUCHDB_VERSION=$(COUCHDB_VERSION) & set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) & $(REBAR) -r eunit $(EUNIT_OPTS) apps=%d"
.PHONY: exunit
# target: exunit - Run ExUnit tests
@@ -152,15 +163,15 @@ exunit: export ERL_LIBS = $(shell echo %cd%)\src
exunit: export ERL_AFLAGS = -config $(shell echo %cd%)/rel/files/eunit.config
exunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(shell echo %cd%)/bin/couchjs $(shell echo %cd%)/share/server/main.js
exunit: couch elixir-init setup-eunit elixir-check-formatted elixir-credo
- @mix test --trace $(EXUNIT_OPTS)
+ @mix test --cover --trace $(EXUNIT_OPTS)
setup-eunit: export BUILDDIR = $(shell pwd)
-setup-eunit: export ERL_AFLAGS = $(shell echo "-config rel/files/eunit.config")
+setup-eunit: export ERL_AFLAGS = "-config $(shell echo %cd%)/rel/files/eunit.config")
setup-eunit:
@$(REBAR) setup_eunit 2> nul
just-eunit: export BUILDDIR = $(shell pwd)
-just-eunit: export ERL_AFLAGS = $(shell echo "-config rel/files/eunit.config")
+just-eunit: export ERL_AFLAGS = "-config $(shell echo %cd%)/rel/files/eunit.config")
just-eunit:
@$(REBAR) -r eunit $(EUNIT_OPTS)
@@ -171,86 +182,60 @@ just-eunit:
# Python code formatter - only runs if we're on Python 3.6 or greater
python-black: .venv/bin/black
@python.exe -c "import sys; exit(1 if sys.version_info < (3,6) else 0)" || \
- echo "Python formatter not supported on Python < 3.6; check results on a newer platform"
+ echo 'Python formatter not supported on Python < 3.6; check results on a newer platform'
@python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
.venv\Scripts\black.exe --check \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- . dev\run rel\overlay\bin\couchup test\javascript\run
+ . dev\run test\javascript\run src\mango src\docs
python-black-update: .venv/bin/black
@python.exe -c "import sys; exit(1 if sys.version_info < (3,6) else 0)" || \
- echo "Python formatter not supported on Python < 3.6; check results on a newer platform"
+ echo 'Python formatter not supported on Python < 3.6; check results on a newer platform'
@python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
.venv\Scripts\black.exe \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- . dev\run rel\overlay\bin\couchup test\javascript\run
+ . dev\run test\javascript\run src\mango src\docs
.PHONY: elixir
+elixir: export MIX_ENV=integration
+elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
elixir: elixir-init elixir-check-formatted elixir-credo devclean
- @dev\run -a adm:pass --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+ @dev\run $(TEST_OPTS) -a adm:pass -n 1 --enable-erlang-views --no-eval 'mix test --trace --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
-elixir-init:
+elixir-init: MIX_ENV=test
+elixir-init: config.erl
@mix local.rebar --force && mix local.hex --force && mix deps.get
.PHONY: elixir-cluster-without-quorum
-elixir-cluster-without-quorum: elixir-check-formatted elixir-credo devclean
+elixir-cluster-without-quorum: export MIX_ENV=integration
+elixir-cluster-without-quorum: elixir-init elixir-check-formatted elixir-credo devclean
@dev\run -n 3 -q -a adm:pass \
- --degrade-cluster 2 \
- --no-eval 'mix test --trace --only without_quorum_test $(EXUNIT_OPTS)'
+ --degrade-cluster 2 \
+ --no-eval 'mix test --trace --only without_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-cluster-with-quorum
-elixir-cluster-with-quorum: elixir-check-formatted elixir-credo devclean
+elixir-cluster-with-quorum: export MIX_ENV=integration
+elixir-cluster-with-quorum: elixir-init elixir-check-formatted elixir-credo devclean
@dev\run -n 3 -q -a adm:pass \
- --degrade-cluster 1 \
- --no-eval 'mix test --trace --only with_quorum_test $(EXUNIT_OPTS)'
+ --degrade-cluster 1 \
+ --no-eval 'mix test --trace --only with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-check-formatted
-elixir-check-formatted:
+elixir-check-formatted: elixir-init
@mix format --check-formatted
# Credo is a static code analysis tool for Elixir.
# We use it in our tests
.PHONY: elixir-credo
-elixir-credo:
+elixir-credo: elixir-init
@mix credo
-.PHONY: test-cluster-with-quorum
-test-cluster-with-quorum: devclean
- -@mkdir share\www\script\test
-ifeq ($(IN_RELEASE), true)
- @copy test\javascript\tests\lorem*.txt share\www\script\test
-else
- -@mkdir src\fauxton\dist\release\test
- @copy test\javascript\tests\lorem*.txt src\fauxton\dist\release\test
-endif
- @dev\run -n 3 -q --with-admin-party-please \
- --enable-erlang-views --degrade-cluster 1 \
- -c "startup_jitter=0" \
- "python test\javascript\run --suites \"$(suites)\" \
- --ignore \"$(ignore_js_suites)\" \
- --path test\javascript\tests-cluster\with-quorum"
-
-.PHONY: test-cluster-without-quorum
-test-cluster-without-quorum: devclean
- -@mkdir share\www\script\test
-ifeq ($(IN_RELEASE), true)
- @copy test\javascript\tests\lorem*.txt share\www\script\test
-else
- -@mkdir src\fauxton\dist\release\test
- @copy test\javascript\tests\lorem*.txt src\fauxton\dist\release\test
-endif
- @dev\run -n 3 -q --with-admin-party-please \
- --enable-erlang-views --degrade-cluster 2 \
- -c "startup_jitter=0" \
- "python test\javascript\run --suites \"$(suites)\" \
- --ignore \"$(ignore_js_suites)\" \
- --path test\javascript\tests-cluster\without-quorum"
-
.PHONY: javascript
# target: javascript - Run JavaScript test suites or specific ones defined by suites option
-javascript:
+javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
+javascript: devclean
-@mkdir share\www\script\test
ifeq ($(IN_RELEASE), true)
@copy test\javascript\tests\lorem*.txt share\www\script\test
@@ -258,14 +243,21 @@ else
-@mkdir src\fauxton\dist\release\test
@copy test\javascript\tests\lorem*.txt src\fauxton\dist\release\test
endif
- -@rmdir /s/q dev\lib
@python dev\run -n 1 -q --with-admin-party-please \
- --enable-erlang-views \
- -c startup_jitter=0 \
- python test\javascript\run $(suites)
+ --enable-erlang-views \
+ $(TEST_OPTS) \
+ 'python test\javascript\run --suites "$(suites)" \
+ --ignore "$(ignore_js_suites)"'
+
+
+.PHONY: check-qs
+# target: check-qs - Run query server tests (ruby and rspec required!)
+check-qs:
+ @QS_LANG=js rspec test\view_server\query_server_spec.rb
.PHONY: mango-test
+mango-test: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
mango-test: devclean all
@cd src\mango && \
python.exe -m venv .venv && \
@@ -273,12 +265,6 @@ mango-test: devclean all
@cd src\mango && .venv\Scripts\python.exe ..\..\dev\run -n 1 --admin=testuser:testpass .venv\Scripts\nosetests
-.PHONY: check-qs
-# target: check-qs - Run query server tests (ruby and rspec required!)
-check-qs:
- @QS_LANG=js rspec test\view_server\query_server_spec.rb
-
-
################################################################################
# Developing
################################################################################
@@ -316,7 +302,7 @@ introspect:
.PHONY: dist
# target: dist - Make release tarball
-dist: all
+dist: all derived
@.\build-aux\couchdb-build-release.sh $(COUCHDB_VERSION)
@copy -r share\www apache-couchdb-$(COUCHDB_VERSION)\share
@@ -327,14 +313,14 @@ dist: all
@copy src\docs\build\man\apachecouchdb.1 apache-couchdb-$(COUCHDB_VERSION)\share\docs\man
@tar czf apache-couchdb-$(COUCHDB_VERSION).tar.gz apache-couchdb-$(COUCHDB_VERSION)
- @echo "Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz"
+ @echo 'Done: apache-couchdb-$(COUCHDB_VERSION).tar.gz'
.PHONY: release
# target: release - Create an Erlang release including CouchDB!
-include install.mk
release: all
- @echo Installing CouchDB into rel\couchdb\ ...
+ @echo 'Installing CouchDB into rel\couchdb\ ...'
-@rmdir /s/q rel\couchdb
@$(REBAR) generate
@copy src\couch\priv\couchjs.exe rel\couchdb\bin
@@ -364,13 +350,13 @@ endif
.PHONY: install
# target: install- install CouchDB :)
-install:
+install: release
@echo .
- @echo Notice: There is no 'make install' command for CouchDB 2.0 yet.
+ @echo Notice: There is no 'make install' command for CouchDB 2.x+.
@echo .
@echo To install CouchDB into your system, copy the rel\couchdb
@echo to your desired installation location. For example:
- @echo xcopy /E rel\couchdb \usr\local\lib
+ @echo xcopy /E rel\couchdb C:\CouchDB\
@echo .
################################################################################
@@ -421,19 +407,6 @@ devclean:
-@rmdir /s/q dev\lib\node3\data
-.PHONY: uninstall
-# target: uninstall - Uninstall CouchDB :-(
-uninstall:
- -@rmdir /s/q $(DESTDIR)\$(install_dir)
- -@del $(DESTDIR)\$(bin_dir)\couchdb
- -@rmdir /s/q $(DESTDIR)\$(libexec_dir)
- -@rmdir /s/q $(DESTDIR)\$(sysconf_dir)
- -@rmdir /s/q $(DESTDIR)\$(data_dir)
- -@rmdir /s/q $(DESTDIR)\$(doc_dir)
- -@rmdir /s/q $(DESTDIR)\$(html_dir)
- -@rmdir /s/q $(DESTDIR)\$(man_dir)
-
-
################################################################################
# Misc
################################################################################
@@ -450,7 +423,7 @@ config.erl:
src\docs\build:
- @echo Building docs...
+ @echo 'Building docs...'
ifeq ($(with_docs), 1)
@cd src\docs && make.bat html && make.bat man
endif
@@ -458,6 +431,17 @@ endif
share\www:
ifeq ($(with_fauxton), 1)
- @echo "Building Fauxton"
+ @echo 'Building Fauxton'
@cd src\fauxton && npm install --production && .\node_modules\.bin\grunt couchdb
endif
+
+derived:
+ @echo "COUCHDB_GIT_SHA: $(COUCHDB_GIT_SHA)"
+ @echo "COUCHDB_VERSION: $(COUCHDB_VERSION)"
+ @echo "COUCHDB_VERSION_SUFFIX: $(COUCHDB_VERSION_SUFFIX)"
+ @echo "DIRTY: $(DIRTY)"
+ @echo "IN_RC: $(IN_RC)"
+ @echo "IN_RELEASE: $(IN_RELEASE)"
+ @echo "ON_TAG: $(ON_TAG)"
+ @echo "REL_TAG: $(REL_TAG)"
+ @echo "SUB_VSN: $(SUB_VSN)"