VOL-4926 - godownloader no longer available.
Makefile
makefiles/include.mk
makefiles/commands/kail.mk
--------------------
o Refactor Makefile to reduce content.
o Move defauilt makefile librarie includes into makefiles/include.mk
o Move kail target dependency into makefiles/commands/kail.
o Add 'kail' as a phony target to simplify installation use.
etc/godownloader.sh
-------------------
o Inline a stub "copyright ccyy" to short-circuit lint-license checking.
Misc
----
o Update copyright notices to +2023
Change-Id: I8d9bff6f1b535991cc7d100f28c1821f6bca2964
diff --git a/Makefile b/Makefile
index 9c9b8da..d3cf302 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# -*- makefile -*-
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -26,8 +26,7 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-include $(MAKEDIR)/consts.mk
-include $(MAKEDIR)/help.mk
+include $(MAKEDIR)/include.mk
include $(MAKEDIR)/patches/include.mk
# Configuration and lists of files for linting/testing
@@ -781,10 +780,8 @@
@echo
##----------------##
-##---] LINT [---##
+##---] TEST [---##
##----------------##
-include $(MAKEDIR)/lint.mk
-
test: lint
# tidy target will be more useful once issue with removing leading comments
@@ -793,16 +790,6 @@
source ./$</bin/activate ; set -u ;\
python -m robot.tidy --inplace $(ROBOT_FILES);
-# -----------------------------------------------------------------------
-# Install the 'kail' tool if needed: https://github.com/boz/kail
-# -----------------------------------------------------------------------
-KAIL_PATH ?= /usr/local/bin
-kail-cmd ?= $(KAIL_PATH)/kail
-$(kail-cmd):
- etc/godownloader.sh -b .
- rsync -v --checksum kail "$@"
- $(RM) kail
-
## Variables for gendocs
TEST_SOURCE := $(wildcard tests/*/*.robot)
TEST_BASENAME := $(basename $(TEST_SOURCE))
diff --git a/etc/godownloader.sh b/etc/godownloader.sh
index ef08407..77ad5bf 100755
--- a/etc/godownloader.sh
+++ b/etc/godownloader.sh
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
# Code generated by godownloader on 2019-05-28T19:49:53Z. DO NOT EDIT.
+# Copyright 2019 - (disable makefiles/lint/license.mk)
#
usage() {
@@ -57,6 +58,7 @@
srcdir="${tmpdir}"
(cd "${tmpdir}" && untar "${TARBALL}")
test ! -d "${BINDIR}" && install -d "${BINDIR}"
+# shellcheck disable=SC2043
for binexe in "kail" ; do
if [ "$OS" = "windows" ]; then
binexe="${binexe}.exe"
@@ -343,6 +345,7 @@
PROJECT_NAME="kail"
OWNER=boz
REPO="kail"
+# shellcheck disable=SC2034
BINARY=kail
FORMAT=tar.gz
OS=$(uname_os)
diff --git a/makefiles/commands/kail.mk b/makefiles/commands/kail.mk
new file mode 100644
index 0000000..5cb7e6a
--- /dev/null
+++ b/makefiles/commands/kail.mk
@@ -0,0 +1,41 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+
+MAKEDIR ?= $(error MAKEDIR= is required)
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+help::
+ @echo " kail Install the kail command"
+ifdef VERBOSE
+ @echo " make kail KAIL_PATH="
+endif
+
+# -----------------------------------------------------------------------
+# Install the 'kail' tool if needed: https://github.com/boz/kail
+# -----------------------------------------------------------------------
+KAIL_PATH ?= /usr/local/bin
+kail-cmd ?= $(KAIL_PATH)/kail
+$(kail-cmd):
+ etc/godownloader.sh -b .
+ rsync -v --checksum kail "$@"
+ $(RM) kail
+
+.PHONY: kail
+kail : $(kail-cmd)
+
+# [EOF]
diff --git a/makefiles/consts.mk b/makefiles/consts.mk
index c34d119..043ec65 100644
--- a/makefiles/consts.mk
+++ b/makefiles/consts.mk
@@ -1,6 +1,6 @@
# -*- makefile -*-
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/makefiles/include.mk b/makefiles/include.mk
new file mode 100644
index 0000000..f0219eb
--- /dev/null
+++ b/makefiles/include.mk
@@ -0,0 +1,29 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+MAKEDIR ?= $(error MAKEDIR= is required)
+
+include $(MAKEDIR)/consts.mk
+include $(MAKEDIR)/help.mk
+
+include $(MAKEDIR)/commands/kail.mk
+include $(MAKEDIR)/lint/include.mk
+
+# [EOF]
diff --git a/makefiles/lint.mk b/makefiles/lint/include.mk
similarity index 100%
rename from makefiles/lint.mk
rename to makefiles/lint/include.mk
diff --git a/makefiles/lint/license/include.mk b/makefiles/lint/license/include.mk
index 61b0cfb..a88f0ba 100644
--- a/makefiles/lint/license/include.mk
+++ b/makefiles/lint/license/include.mk
@@ -1,6 +1,6 @@
# -*- makefile -*-
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/makefiles/lint/license/license-check.sh b/makefiles/lint/license/license-check.sh
index 10d3376..bbf560e 100755
--- a/makefiles/lint/license/license-check.sh
+++ b/makefiles/lint/license/license-check.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/makefiles/lint/license/license-check.sh.safe b/makefiles/lint/license/license-check.sh.safe
index cd82c11..9037ae5 100755
--- a/makefiles/lint/license/license-check.sh.safe
+++ b/makefiles/lint/license/license-check.sh.safe
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/makefiles/lint/license/license-helper.sh b/makefiles/lint/license/license-helper.sh
index 499f854..0f690e4 100755
--- a/makefiles/lint/license/license-helper.sh
+++ b/makefiles/lint/license/license-helper.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/makefiles/patches/include.mk b/makefiles/patches/include.mk
index 58a7c73..541f756 100644
--- a/makefiles/patches/include.mk
+++ b/makefiles/patches/include.mk
@@ -1,6 +1,6 @@
# -*- makefile -*-
# -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.