From bd344184294dcb6e6196ebde9626406403fe61fd Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 11 Jan 2021 07:42:10 +0000 Subject: [PATCH] 8258445: Move make/templates to make/data Reviewed-by: erikj --- make/{templates => data/license-templates}/bsd-header | 0 .../license-templates}/gpl-cp-header | 0 make/{templates => data/license-templates}/gpl-header | 0 make/scripts/lic_check.sh | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) rename make/{templates => data/license-templates}/bsd-header (100%) rename make/{templates => data/license-templates}/gpl-cp-header (100%) rename make/{templates => data/license-templates}/gpl-header (100%) diff --git a/make/templates/bsd-header b/make/data/license-templates/bsd-header similarity index 100% rename from make/templates/bsd-header rename to make/data/license-templates/bsd-header diff --git a/make/templates/gpl-cp-header b/make/data/license-templates/gpl-cp-header similarity index 100% rename from make/templates/gpl-cp-header rename to make/data/license-templates/gpl-cp-header diff --git a/make/templates/gpl-header b/make/data/license-templates/gpl-header similarity index 100% rename from make/templates/gpl-header rename to make/data/license-templates/gpl-header diff --git a/make/scripts/lic_check.sh b/make/scripts/lic_check.sh index c166115ebb6..d70d8914181 100644 --- a/make/scripts/lic_check.sh +++ b/make/scripts/lic_check.sh @@ -1,6 +1,6 @@ #! /bin/sh -f # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ # This script checks a copyright notice. # # The script should be located in the main jdk repository under make/scripts. -# It works with the templates in the make/templates directory of the jdk source. +# It works with the templates in the make/data/license-templates directory of the jdk source. # # Usage: "lic_check.sh [-gpl] or [-gplcp] or [-bsd] file(s)" @@ -61,12 +61,12 @@ D=`dirname "${script_directory}"` B=`basename "${script_directory}"` script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}" -# set up a variable for the templates directory -template_dir=${script_dir}/../templates +# set up a variable for the template directory +template_dir=${script_dir}/../data/license-templates # Check existence of the template directory. if [ ! -d ${template_dir} ] ; then - echo "ERROR: The templates directory "${template_dir}" doesn't exist." 1>&2 + echo "ERROR: The template directory "${template_dir}" doesn't exist." 1>&2 exit 1 fi