diff options
author | Paul Smith <psmith@gnu.org> | 2022-10-16 15:13:41 -0400 |
---|---|---|
committer | Paul Smith <psmith@gnu.org> | 2022-10-18 14:20:44 -0400 |
commit | 2d943d3d2e5b69d6b635314a46d20e55cfbd255a (patch) | |
tree | eb272d7661251ee0aecdf5357519c734110cbea1 /prepare_vms.com | |
parent | b16913a67e1d0f651293d24f10ccca54a8cc0d08 (diff) | |
download | make-git-2d943d3d2e5b69d6b635314a46d20e55cfbd255a.tar.gz |
Remove template files to simplify distribution creation
The README templates were not useful since the replacement step
didn't have anything to replace: rename them.
Rather than creating template files for the config variants, create
mkconfig.h.in containg PACKAGE_* variables to be replaced, and have
config variant header files include it. Note on POSIX we don't use
this, and continue to generate a single config.h.in file.
Use config.status to convert the README.in and mkconfig.h.in files
during distribution creation.
Modify all users of VERSION to use PACKAGE_VERSION instead.
* configure.ac: Use GNU Make not GNU make as the package name.
* README.in: Use GNU Make not GNU make.
* README.git: Remove references to README.W32.template.
* .gitignore: Update for new behavior.
* Basic.mk.template: Remove unused posix_SOURCES and VERSION, and
references to unshipped mk/Posix.mk
* Makefile.am: Add src/mkconfig.h as an extra dist file.
* bootstrap.bat: Rewrite mkconfig.h.in to mkconfig.h
* maintMakefile: Remove obsolete template files; add mkconfig.h.in.
* prepare_vms.com: Rewrite mkconfig.h.in to mkconfig.h
* mk/VMS.mk: Fix incorrect header file prerequisite.
* src/mkconfig.h.in: New file containing PACKAGE variables.
* src/config.ami: Include mkconfig.h.
* src/config.h.W32: Ditto.
* src/configh.dos: Ditto.
* src/config.h-vms: Ditto.
* src/version.c: Use PACKAGE_VERSION not VERSION.
Diffstat (limited to 'prepare_vms.com')
-rw-r--r-- | prepare_vms.com | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/prepare_vms.com b/prepare_vms.com index 04f581f5..16ccbc3c 100644 --- a/prepare_vms.com +++ b/prepare_vms.com @@ -4,28 +4,27 @@ $! $! This is used for building off the master instead of a release tarball. $! $! -$! $! First try ODS-5, Pathworks V6 or UNZIP name. $! -$ config_template = f$search("sys$disk:[]config*h-vms.template") +$ config_template = f$search("sys$disk:[.src]mkconfig*h.in") $ if config_template .eqs. "" $ then $! $! Try NFS, VMStar, or Pathworks V5 ODS-2 encoded name. $! -$ config_template = f$search("sys$disk:[]config.h-vms*template") +$ config_template = f$search("sys$disk:[.src]mkconfig.h*in") $ if config_template .eqs. "" $ then -$ write sys$output "Could not find config.h-vms*template!" +$ write sys$output "Could not find mkconfig.h.in!" $ exit 44 $ endif $ endif $ config_template_file = f$parse(config_template,,,"name") $ config_template_type = f$parse(config_template,,,"type") -$ config_template = "sys$disk:[]" + config_template_file + config_template_type +$ config_template = "sys$disk:[.src]" + config_template_file + config_template_type $! $! -$! Pull the package and version from configure.ac +$! Pull the version from configure.ac $! $ open/read ac_file sys$disk:[]configure.ac $ac_read_loop: @@ -39,21 +38,26 @@ $ version = f$element (0,"]",version) $ac_read_loop_end: $ close ac_file $! -$ if (package .eqs. "") .or. (version .eqs. "") +$ if (version .eqs. "") $ then -$ write sys$output "Unable to determine package and/or version!" +$ write sys$output "Unable to determine version!" $ exit 44 $ endif $! $! -$ outfile = "sys$disk:[]config.h-vms" +$ outfile = "sys$disk:[.src]mkconfig.h" $! $! Note the pipe command is close to the length of 255, which is the $! maximum token length prior to VMS V8.2: $! %DCL-W-TKNOVF, command element is too long - shorten -$ pipe (write sys$output "sub/%PACKAGE%/''package'/WHOLE/NOTYPE" ;- - write sys$output "sub/%VERSION%/''version'/WHOLE/NOTYPE" ;- +$! PDS: Blown out; someone else will have to figure this out +$ pipe (write sys$output "sub,@PACKAGE@,make,WHOLE/NOTYPE" ;- + write sys$output "sub,@PACKAGE_BUGREPORT@,bug-make@gnu.org,WHOLE/NOTYPE" ;- + write sys$output "sub,@PACKAGE_NAME@,GNU Make,WHOLE/NOTYPE" ;- + write sys$output "sub,@PACKAGE_TARNAME@,make,WHOLE/NOTYPE" ;- + write sys$output "sub,@PACKAGE_URL@,https://www.gnu.org/software/make/,WHOLE/NOTYPE" ;- + write sys$output "sub,@PACKAGE_VERSION@,''version',WHOLE/NOTYPE" ;- write sys$output "exit") |- edit/edt 'config_template'/out='outfile'/command=sys$pipe >nla0: $! -$ write sys$output package, ", version: ", version, " prepared for VMS" +$ write sys$output "GNU Make version: ", version, " prepared for VMS" |