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>
2015-05-18 20:35:23 +00:00
|
|
|
#! /usr/bin/perl
|
|
|
|
#
|
|
|
|
# Reads one or more template files and runs it through Text::Template
|
|
|
|
#
|
|
|
|
# It is assumed that this scripts is called with -Mconfigdata, a module
|
|
|
|
# that holds configuration data in %config
|
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
2016-01-22 11:40:49 +00:00
|
|
|
|
2016-01-25 20:19:59 +00:00
|
|
|
use Getopt::Std;
|
|
|
|
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
# We actually expect to get the following hash tables from configdata:
|
|
|
|
#
|
|
|
|
# %config
|
|
|
|
# %target
|
|
|
|
# %withargs
|
2016-01-30 02:21:39 +00:00
|
|
|
# %unified_info
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
#
|
|
|
|
# We just do a minimal test to see that we got what we expected.
|
|
|
|
# $config{target} must exist as an absolute minimum.
|
|
|
|
die "You must run this script with -Mconfigdata\n" if !exists($config{target});
|
|
|
|
|
2016-01-30 02:21:39 +00:00
|
|
|
# Make a subclass of Text::Template to override append_text_to_result,
|
|
|
|
# as recommended here:
|
|
|
|
#
|
|
|
|
# http://search.cpan.org/~mjd/Text-Template-1.46/lib/Text/Template.pm#Automatic_postprocessing_of_template_hunks
|
|
|
|
|
|
|
|
package OpenSSL::Template;
|
|
|
|
|
|
|
|
# Because we know that Text::Template isn't a core Perl module, we use
|
|
|
|
# a fallback in case it's not installed on the system
|
|
|
|
use File::Basename;
|
|
|
|
use File::Spec::Functions;
|
|
|
|
use lib catdir(dirname(__FILE__));
|
|
|
|
use with_fallback qw(Text::Template);
|
|
|
|
|
2016-02-21 21:43:29 +00:00
|
|
|
#use parent qw/Text::Template/;
|
|
|
|
use vars qw/@ISA/;
|
|
|
|
push @ISA, qw/Text::Template/;
|
2016-01-30 02:21:39 +00:00
|
|
|
|
|
|
|
# Override constructor
|
|
|
|
sub new {
|
|
|
|
my ($class) = shift;
|
|
|
|
|
|
|
|
# Call the constructor of the parent class, Person.
|
|
|
|
my $self = $class->SUPER::new( @_ );
|
|
|
|
# Add few more attributes
|
|
|
|
$self->{_output_off} = 0; # Default to output hunks
|
|
|
|
bless $self, $class;
|
|
|
|
return $self;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub append_text_to_output {
|
|
|
|
my $self = shift;
|
|
|
|
|
|
|
|
if ($self->{_output_off} == 0) {
|
|
|
|
$self->SUPER::append_text_to_output(@_);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub output_reset_on {
|
|
|
|
my $self = shift;
|
|
|
|
$self->{_output_off} = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub output_on {
|
|
|
|
my $self = shift;
|
|
|
|
if (--$self->{_output_off} < 0) {
|
|
|
|
$self->{_output_off} = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sub output_off {
|
|
|
|
my $self = shift;
|
|
|
|
$self->{_output_off}++;
|
|
|
|
}
|
|
|
|
|
|
|
|
# Come back to main
|
|
|
|
|
|
|
|
package main;
|
|
|
|
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
# Helper functions for the templates #################################
|
|
|
|
|
|
|
|
# It might be practical to quotify some strings and have them protected
|
|
|
|
# from possible harm. These functions primarly quote things that might
|
|
|
|
# be interpreted wrongly by a perl eval.
|
|
|
|
|
|
|
|
# quotify1 STRING
|
|
|
|
# This adds quotes (") around the given string, and escapes any $, @, \,
|
|
|
|
# " and ' by prepending a \ to them.
|
|
|
|
sub quotify1 {
|
|
|
|
my $s = shift @_;
|
|
|
|
$s =~ s/([\$\@\\"'])/\\$1/g;
|
|
|
|
'"'.$s.'"';
|
|
|
|
}
|
|
|
|
|
|
|
|
# quotify_l LIST
|
|
|
|
# For each defined element in LIST (i.e. elements that aren't undef), have
|
|
|
|
# it quotified with 'quotofy1'
|
|
|
|
sub quotify_l {
|
|
|
|
map {
|
|
|
|
if (!defined($_)) {
|
|
|
|
();
|
|
|
|
} else {
|
|
|
|
quotify1($_);
|
|
|
|
}
|
|
|
|
} @_;
|
|
|
|
}
|
|
|
|
|
|
|
|
# Error reporter #####################################################
|
|
|
|
|
|
|
|
# The error reporter uses %lines to figure out exactly which file the
|
|
|
|
# error happened and at what line. Not that the line number may be
|
|
|
|
# the start of a perl snippet rather than the exact line where it
|
|
|
|
# happened. Nothing we can do about that here.
|
|
|
|
|
|
|
|
my %lines = ();
|
|
|
|
sub broken {
|
|
|
|
my %args = @_;
|
|
|
|
my $filename = "<STDIN>";
|
|
|
|
my $deducelines = 0;
|
|
|
|
foreach (sort keys %lines) {
|
|
|
|
$filename = $lines{$_};
|
|
|
|
last if ($_ > $args{lineno});
|
|
|
|
$deducelines += $_;
|
|
|
|
}
|
|
|
|
print STDERR $args{error}," in $filename, fragment starting at line ",$args{lineno}-$deducelines;
|
|
|
|
undef;
|
|
|
|
}
|
|
|
|
|
2016-01-25 20:19:59 +00:00
|
|
|
# Check options ######################################################
|
|
|
|
|
|
|
|
my %opts = ();
|
|
|
|
|
|
|
|
# -o ORIGINATOR
|
|
|
|
# declares ORIGINATOR as the originating script.
|
|
|
|
getopt('o', \%opts);
|
|
|
|
|
|
|
|
my @autowarntext = ("WARNING: do not edit!",
|
|
|
|
"Generated"
|
|
|
|
. (defined($opts{o}) ? " by ".$opts{o} : "")
|
|
|
|
. (scalar(@ARGV) > 0 ? " from ".join(", ",@ARGV) : ""));
|
|
|
|
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
# Template reading ###################################################
|
|
|
|
|
|
|
|
# Read in all the templates into $text, while keeping track of each
|
|
|
|
# file and its size in lines, to try to help report errors with the
|
|
|
|
# correct file name and line number.
|
|
|
|
|
|
|
|
my $prev_linecount = 0;
|
|
|
|
my $text =
|
|
|
|
@ARGV
|
2016-01-30 02:21:39 +00:00
|
|
|
? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
my $linecount = $x =~ tr/\n//;
|
|
|
|
$prev_linecount = ($linecount += $prev_linecount);
|
|
|
|
$lines{$linecount} = $_;
|
|
|
|
$x } @ARGV)
|
|
|
|
: join("", <STDIN>);
|
|
|
|
|
|
|
|
# Engage! ############################################################
|
|
|
|
|
|
|
|
# Load the full template (combination of files) into Text::Template
|
|
|
|
# and fill it up with our data. Output goes directly to STDOUT
|
|
|
|
|
2016-01-30 02:21:39 +00:00
|
|
|
my $template = OpenSSL::Template->new(TYPE => 'STRING', SOURCE => $text );
|
|
|
|
|
|
|
|
sub output_reset_on {
|
|
|
|
$template->output_reset_on();
|
|
|
|
"";
|
|
|
|
}
|
|
|
|
sub output_on {
|
|
|
|
$template->output_on();
|
|
|
|
"";
|
|
|
|
}
|
|
|
|
sub output_off {
|
|
|
|
$template->output_off();
|
|
|
|
"";
|
|
|
|
}
|
|
|
|
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
$template->fill_in(OUTPUT => \*STDOUT,
|
|
|
|
HASH => { config => \%config,
|
|
|
|
target => \%target,
|
2016-02-22 18:17:06 +00:00
|
|
|
disabled => \%disabled,
|
2015-05-20 18:03:20 +00:00
|
|
|
withargs => \%withargs,
|
2016-01-30 02:21:39 +00:00
|
|
|
unified_info => \%unified_info,
|
2016-01-25 20:19:59 +00:00
|
|
|
autowarntext => \@autowarntext,
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
quotify1 => \"ify1,
|
2016-01-30 02:21:39 +00:00
|
|
|
quotify_l => \"ify_l,
|
|
|
|
output_reset_on => \&output_reset_on,
|
|
|
|
output_on => \&output_on,
|
|
|
|
output_off => \&output_off },
|
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>
2015-05-18 20:35:23 +00:00
|
|
|
DELIMITERS => [ "{-", "-}" ],
|
|
|
|
BROKEN => \&broken);
|