2009-09-04 Micah Cowan <micah@cowan.name>
+ * build-aux/build_info.pl: Moved from top directory.
+
* md5/*: Updated md5 from gnulib.
* configure.ac: Configured build-aux/ as auxiliarry directory.
build-aux/install-sh, build-aux/link-warning.h,
build-aux/mdate-sh, build-aux/missing, build-aux/mkinstalldirs,
build-aux/texinfo.tex, build-aux/useless-if-before-free,
- build-aux/vc-list-files, build-aux/ylwrap: Moved from base
+ build-aux/vc-list-files, build-aux/ylwrap: Moved from top
directory.
* build-aux/announce-gen: Imported from gnulib.
--- /dev/null
+#!/usr/bin/perl
+
+# Generate build_info.c.
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use FindBin qw($Bin);
+use File::Spec ();
+
+my $file = shift @ARGV;
+
+{
+ my $data = parse_config();
+ output_code($data);
+}
+
+sub parse_config
+{
+ my (%block, @defines, %feature);
+
+ open(my $fh, '<', $file) or die "Cannot open $file: $!";
+ my $cfg = do { local $/; <$fh> };
+ close($fh);
+
+ while ($cfg =~ /^\ *? (\w+) (?:\s+?)? (\w+?)? \s*$/gmx) {
+ $feature{$1} = $2 || '_MISSING';
+ push @defines, $1;
+ }
+ while ($cfg =~ /^(\ *? \#\w+? \s+? (\w+) .+ \#\w+)/gmsx) {
+ $block{$2} = $1;
+ }
+
+ my %data = (
+ block => \%block,
+ defines => \@defines,
+ feature => \%feature,
+ );
+
+ return \%data;
+}
+
+sub output_code
+{
+ my ($block, $defines, $feature) =
+ map $_[0]->{$_}, qw(block defines feature);
+
+ print do { local $/; <DATA> }, "\n";
+ print <<EOC;
+const char* (compiled_features[]) =
+{
+
+EOC
+ my @output;
+ foreach my $define (@$defines) {
+ if (!exists $block->{$define}) {
+ push @output, <<EOC;
+#ifdef $define
+ "+$feature->{$define}",
+#else
+ "-$feature->{$define}",
+#endif
+EOC
+ }
+ else {
+ push @output, <<EOC;
+$block->{$define}
+EOC
+ }
+ }
+ print join "\n", @output;
+ print <<EOC;
+
+ /* sentinel value */
+ NULL
+};
+
+
+EOC
+}
+
+__DATA__
+/* Autogenerated by build_info.pl - DO NOT EDIT */
+
+/* This stores global variables that are initialized with
+ preprocessor declarations for output with the --version flag.
+
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. */
+
+#include "wget.h"
+#include <stdio.h>
+++ /dev/null
-#!/usr/bin/perl
-
-# Generate build_info.c.
-
-# Copyright (C) 2009 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-use strict;
-use warnings;
-
-use FindBin qw($Bin);
-use File::Spec ();
-
-my $file = File::Spec->catfile($Bin, 'src', 'build_info.c.in');
-
-{
- my $data = parse_config();
- output_code($data);
-}
-
-sub parse_config
-{
- my (%block, @defines, %feature);
-
- open(my $fh, '<', $file) or die "Cannot open $file: $!";
- my $cfg = do { local $/; <$fh> };
- close($fh);
-
- while ($cfg =~ /^\ *? (\w+) (?:\s+?)? (\w+?)? \s*$/gmx) {
- $feature{$1} = $2 || '_MISSING';
- push @defines, $1;
- }
- while ($cfg =~ /^(\ *? \#\w+? \s+? (\w+) .+ \#\w+)/gmsx) {
- $block{$2} = $1;
- }
-
- my %data = (
- block => \%block,
- defines => \@defines,
- feature => \%feature,
- );
-
- return \%data;
-}
-
-sub output_code
-{
- my ($block, $defines, $feature) =
- map $_[0]->{$_}, qw(block defines feature);
-
- print do { local $/; <DATA> }, "\n";
- print <<EOC;
-const char* (compiled_features[]) =
-{
-
-EOC
- my @output;
- foreach my $define (@$defines) {
- if (!exists $block->{$define}) {
- push @output, <<EOC;
-#ifdef $define
- "+$feature->{$define}",
-#else
- "-$feature->{$define}",
-#endif
-EOC
- }
- else {
- push @output, <<EOC;
-$block->{$define}
-EOC
- }
- }
- print join "\n", @output;
- print <<EOC;
-
- /* sentinel value */
- NULL
-};
-
-
-EOC
-}
-
-__DATA__
-/* Autogenerated by build_info.pl - DO NOT EDIT */
-
-/* This stores global variables that are initialized with
- preprocessor declarations for output with the --version flag.
-
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. */
-
-#include "wget.h"
-#include <stdio.h>
+2009-09-04 Micah Cowan <micah@cowan.name>
+
+ * Makefile.am: Move build_info.c to wget_SOURCES from
+ nodist_wget_SOURCES, reduce dependencies, and invoke build_info.pl
+ in its new home, $(top_srcdir)/build-aux.
+
2009-09-03 Micah Cowan <micah@cowan.name>
* ftp-ls.c (ftp_parse_vms_ls): Replace use of localtime_r with
ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
http.c init.c log.c main.c netrc.c progress.c ptimer.c \
recur.c res.c retr.c snprintf.c spider.c url.c \
- utils.c exits.c $(IRI_OBJ) \
+ utils.c exits.c build_info.c $(IRI_OBJ) \
css-url.h css-tokens.h connect.h convert.h cookies.h \
ftp.h gen-md5.h hash.h host.h html-parse.h html-url.h \
http.h http-ntlm.h init.h log.h mswindows.h netrc.h \
options.h progress.h ptimer.h recur.h res.h retr.h \
spider.h ssl.h sysdep.h url.h utils.h wget.h iri.h \
exits.h gettext.h
-nodist_wget_SOURCES = build_info.c version.c
+nodist_wget_SOURCES = version.c
EXTRA_wget_SOURCES = mswindows.c iri.c
LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
../md5/libmd5.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
-build_info.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
- perl $(top_srcdir)/build_info.pl > $@
+build_info.c: $(srcdir)/Makefile.am $(srcdir)/build_info.c.in
+ $(PERL) $(top_srcdir)/build-aux/build_info.pl \
+ $(srcdir)/build_info.c.in > $@
ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
| $(ESCAPEQUOTE) >> $@
check_LIBRARIES = libunittest.a
-libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
-nodist_libunittest_a_SOURCES = build_info.c version.c
+libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h
+nodist_libunittest_a_SOURCES = version.c
libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib
libunittest_a_LIBADD = $(LIBOBJS)
EXTRA_DIST = build_info.c.in
projects / wget / commitdiff