From b893a2b2f70346f9d204d1050a0ad32fd98fdd56 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Fri, 8 Dec 2023 15:46:02 +0000 Subject: [PATCH] 8321597: Use .template consistently for files treated as templates by the build Reviewed-by: erikj --- make/CompileDemos.gmk | 2 +- make/JrtfsJar.gmk | 2 +- make/MacBundles.gmk | 4 ++-- make/autoconf/{Makefile.in => Makefile.template} | 0 make/autoconf/basic.m4 | 10 +++++----- ...otcycle-spec.gmk.in => bootcycle-spec.gmk.template} | 0 ...buildjdk-spec.gmk.in => buildjdk-spec.gmk.template} | 0 make/autoconf/{compare.sh.in => compare.sh.template} | 0 make/autoconf/{spec.gmk.in => spec.gmk.template} | 0 make/common/modules/LauncherCommon.gmk | 2 +- .../bundle/{JDK-Info.plist => JDK-Info.plist.template} | 0 .../bundle/{JRE-Info.plist => JRE-Info.plist.template} | 0 ...{cmdline-Info.plist => cmdline-Info.plist.template} | 0 .../mainmanifest/{manifest.mf => manifest.mf.template} | 0 make/hotspot/gensrc/GenerateSources.gmk | 2 +- make/scripts/{hotspot.sh => hotspot.sh.template} | 0 16 files changed, 11 insertions(+), 11 deletions(-) rename make/autoconf/{Makefile.in => Makefile.template} (100%) rename make/autoconf/{bootcycle-spec.gmk.in => bootcycle-spec.gmk.template} (100%) rename make/autoconf/{buildjdk-spec.gmk.in => buildjdk-spec.gmk.template} (100%) rename make/autoconf/{compare.sh.in => compare.sh.template} (100%) rename make/autoconf/{spec.gmk.in => spec.gmk.template} (100%) rename make/data/bundle/{JDK-Info.plist => JDK-Info.plist.template} (100%) rename make/data/bundle/{JRE-Info.plist => JRE-Info.plist.template} (100%) rename make/data/bundle/{cmdline-Info.plist => cmdline-Info.plist.template} (100%) rename make/data/mainmanifest/{manifest.mf => manifest.mf.template} (100%) rename make/scripts/{hotspot.sh => hotspot.sh.template} (100%) diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk index 4d8a9598da7..dfe30c70173 100644 --- a/make/CompileDemos.gmk +++ b/make/CompileDemos.gmk @@ -58,7 +58,7 @@ DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf # This rule will be depended on due to the MANIFEST line in SetupBuildDemo # and SetupBuildJvmtiDemo. $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \ - SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \ + SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf.template, \ OUTPUT_FILE := $(DEMO_MANIFEST), \ REPLACEMENTS := \ @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk index 50ae82ca565..b0b7ed6ce08 100644 --- a/make/JrtfsJar.gmk +++ b/make/JrtfsJar.gmk @@ -33,7 +33,7 @@ include TextFileProcessing.gmk # This rule will be depended on due to the MANIFEST line $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \ - SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \ + SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf.template, \ OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \ REPLACEMENTS := \ @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ diff --git a/make/MacBundles.gmk b/make/MacBundles.gmk index c1c51570a1d..39da6c9cdb3 100644 --- a/make/MacBundles.gmk +++ b/make/MacBundles.gmk @@ -69,7 +69,7 @@ ifeq ($(call isTargetOs, macosx), true) )) $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \ - SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \ + SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist.template, \ OUTPUT_FILE := $(JDK_MACOSX_CONTENTS_DIR)/Info.plist, \ REPLACEMENTS := \ @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jdk ; \ @@ -82,7 +82,7 @@ ifeq ($(call isTargetOs, macosx), true) )) $(eval $(call SetupTextFileProcessing, BUILD_JRE_PLIST, \ - SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist, \ + SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist.template, \ OUTPUT_FILE := $(JRE_MACOSX_CONTENTS_DIR)/Info.plist, \ REPLACEMENTS := \ @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jre ; \ diff --git a/make/autoconf/Makefile.in b/make/autoconf/Makefile.template similarity index 100% rename from make/autoconf/Makefile.in rename to make/autoconf/Makefile.template diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4 index af963359583..5a1fbc07952 100644 --- a/make/autoconf/basic.m4 +++ b/make/autoconf/basic.m4 @@ -448,17 +448,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) # The spec.gmk file contains all variables for the make system. - AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) + AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.template]) # The bootcycle-spec.gmk file contains support for boot cycle builds. - AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) + AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.template]) # The buildjdk-spec.gmk file contains support for building a buildjdk when cross compiling. - AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.in]) + AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.template]) # The compare.sh is used to compare the build output to other builds. - AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.in]) + AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.template]) # The generated Makefile knows where the spec.gmk is and where the source is. # You can run make from the OUTPUTDIR, or from the top-level Makefile # which will look for generated configurations - AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.in]) + AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.template]) ]) ############################################################################### diff --git a/make/autoconf/bootcycle-spec.gmk.in b/make/autoconf/bootcycle-spec.gmk.template similarity index 100% rename from make/autoconf/bootcycle-spec.gmk.in rename to make/autoconf/bootcycle-spec.gmk.template diff --git a/make/autoconf/buildjdk-spec.gmk.in b/make/autoconf/buildjdk-spec.gmk.template similarity index 100% rename from make/autoconf/buildjdk-spec.gmk.in rename to make/autoconf/buildjdk-spec.gmk.template diff --git a/make/autoconf/compare.sh.in b/make/autoconf/compare.sh.template similarity index 100% rename from make/autoconf/compare.sh.in rename to make/autoconf/compare.sh.template diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.template similarity index 100% rename from make/autoconf/spec.gmk.in rename to make/autoconf/spec.gmk.template diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk index 21d2b9a9300..8041e9fe681 100644 --- a/make/common/modules/LauncherCommon.gmk +++ b/make/common/modules/LauncherCommon.gmk @@ -112,7 +112,7 @@ define SetupBuildLauncherBody $1_PLIST_FILE := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$1/Info.plist $$(eval $$(call SetupTextFileProcessing, BUILD_PLIST_$1, \ - SOURCE_FILES := $(TOPDIR)/make/data/bundle/cmdline-Info.plist, \ + SOURCE_FILES := $(TOPDIR)/make/data/bundle/cmdline-Info.plist.template, \ OUTPUT_FILE := $$($1_PLIST_FILE), \ REPLACEMENTS := \ @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).$1 ; \ diff --git a/make/data/bundle/JDK-Info.plist b/make/data/bundle/JDK-Info.plist.template similarity index 100% rename from make/data/bundle/JDK-Info.plist rename to make/data/bundle/JDK-Info.plist.template diff --git a/make/data/bundle/JRE-Info.plist b/make/data/bundle/JRE-Info.plist.template similarity index 100% rename from make/data/bundle/JRE-Info.plist rename to make/data/bundle/JRE-Info.plist.template diff --git a/make/data/bundle/cmdline-Info.plist b/make/data/bundle/cmdline-Info.plist.template similarity index 100% rename from make/data/bundle/cmdline-Info.plist rename to make/data/bundle/cmdline-Info.plist.template diff --git a/make/data/mainmanifest/manifest.mf b/make/data/mainmanifest/manifest.mf.template similarity index 100% rename from make/data/mainmanifest/manifest.mf rename to make/data/mainmanifest/manifest.mf.template diff --git a/make/hotspot/gensrc/GenerateSources.gmk b/make/hotspot/gensrc/GenerateSources.gmk index 9b42493f628..c92408b7d54 100644 --- a/make/hotspot/gensrc/GenerateSources.gmk +++ b/make/hotspot/gensrc/GenerateSources.gmk @@ -48,7 +48,7 @@ $(eval $(call IncludeCustomExtension, hotspot/gensrc/GenerateSources.gmk)) # Setup the hotspot launcher script for developer use $(eval $(call SetupTextFileProcessing, CREATE_HOTSPOT_LAUNCHER, \ - SOURCE_FILES := $(TOPDIR)/make/scripts/hotspot.sh, \ + SOURCE_FILES := $(TOPDIR)/make/scripts/hotspot.sh.template, \ OUTPUT_FILE := $(JVM_OUTPUTDIR)/hotspot, \ REPLACEMENTS := \ @@LIBARCH@@ => $(OPENJDK_TARGET_CPU_LEGACY_LIB) ; \ diff --git a/make/scripts/hotspot.sh b/make/scripts/hotspot.sh.template similarity index 100% rename from make/scripts/hotspot.sh rename to make/scripts/hotspot.sh.template