Skip to content

Commit

Permalink
licence: remove the GPL as an alternative licence (#118)
Browse files Browse the repository at this point in the history
We only license Speedb under the Apache 2.0 licence, so we need to remove
the GPL text from the repository. Since GNU Parallel is currently
vendored in the repo and requires having a copy of the GPL text, remove
it as well and depend on the system installed binary if exists (out build
instructions ask users to install it anyway, and it's installed in CI).
  • Loading branch information
isaac-io committed Aug 19, 2022
1 parent 97b9bfd commit 8ad67d4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8,313 deletions.
339 changes: 0 additions & 339 deletions COPYING

This file was deleted.

7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ prioritize_long_running_tests = \
# See "man parallel" for its "-j ..." option.
J ?= 100%

PARALLEL ?= build_tools/gnu_parallel
PARALLEL ?= parallel
PARALLEL_OK := $(shell command -v "$(PARALLEL)" 2>&1 >/dev/null && \
("$(PARALLEL)" --gnu --version 2>/dev/null | grep -q 'Ole Tange') && \
echo 1)
Expand All @@ -940,9 +940,8 @@ else ifeq ($(QUIET_PARALLEL_TESTS), 1)
parallel_redir = >& t/$(test_log_prefix)log-{/}
else
# Default: print failure output only, as it happens
# Note: gnu_parallel --eta is now always used, but has been modified to provide
# only infrequent updates when not connected to a terminal. (CircleCI will
# kill a job if no output for 10min.)
# Note: parallel --eta is now always used because CircleCI will
# kill a job if no output for 10min.
parallel_redir = >& t/$(test_log_prefix)log-{/} || bash -c "cat t/$(test_log_prefix)log-{/}; exit $$?"
endif

Expand Down
Loading

0 comments on commit 8ad67d4

Please sign in to comment.