diff options
author | Richard Levitte <levitte@openssl.org> | 2015-05-18 22:35:23 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-01-22 23:12:22 +0100 |
commit | 291e94df90aa085ae53b43e52e1cef02efc0ff10 (patch) | |
tree | 0611f97c5443ae3efc73bf5835648ce20ff2b726 /tools | |
parent | Refactor config - consolidate and refresh print_table_entry (diff) | |
download | openssl-291e94df90aa085ae53b43e52e1cef02efc0ff10.tar.xz openssl-291e94df90aa085ae53b43e52e1cef02efc0ff10.zip |
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 8 | ||||
-rw-r--r-- | tools/c_rehash.in | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index d6c224a022..b52b45f7d3 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,7 +15,9 @@ GENERAL=Makefile APPS= c_rehash MISC_APPS= c_hash c_info c_issuer c_name -all: +all: apps + +apps: $(APPS) install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @@ -56,4 +58,8 @@ clean: errors: +c_rehash: c_rehash.in + $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl < c_rehash.in > c_rehash.new + mv c_rehash.new c_rehash + # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/tools/c_rehash.in b/tools/c_rehash.in index 834de780ca..912618c230 100644 --- a/tools/c_rehash.in +++ b/tools/c_rehash.in @@ -1,10 +1,10 @@ -#!/usr/local/bin/perl +#!{- $config{perl} -} # Perl c_rehash script, scan all files in a directory # and add symbolic links to their hash values. -my $dir; -my $prefix; +my $dir = {- quotify1($config{openssldir}) -}; +my $prefix = {- quotify1($config{prefix}) -}; my $errorcount = 0; my $openssl = $ENV{OPENSSL} || "openssl"; |