X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fgenconf;h=30e8896c3a58901e5085880ed6628d0e5600665d;hb=ffa3899cef4ebd2ad051ad84f397e7110e67bd56;hp=0d7bc7370e24dd0b423a940c5265cf0e2dd385fb;hpb=d37e2191a6a82dbe6ed2cce7164cb4dd9c0d636a;p=libucw.git

diff --git a/build/genconf b/build/genconf
index 0d7bc737..30e8896c 100755
--- a/build/genconf
+++ b/build/genconf
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # Configuration file and script preprocessor
-# (c) 2004 Martin Mares <mj@ucw.cz>
+# (c) 2004--2007 Martin Mares <mj@ucw.cz>
 
 use strict;
 use warnings;
@@ -9,12 +9,30 @@ use warnings;
 
 open CF, $ARGV[2] or die "Unable to open $ARGV[2]";
 my %options = ();
+my %vars = ();
+sub opt {
+	my ($k,$v) = @_;
+	$vars{$k} = $v;
+	$options{$k} = 1 if ($k =~ /^CONFIG_/);
+}
+foreach my $k (keys %ENV) {
+	opt($k, $ENV{$k});
+}
 while (<CF>) {
-	/^(CONFIG_\w+)=[^0]/ || next;
-	$options{$1} = 1;
+	chomp;
+	if (my ($k,$v) = /^(\w+)=(.*)/) {
+		$v =~ s/\s+$//;
+		opt($k, $v);
+	}
 }
 close CF;
 
+sub eval_expr {
+	$_ = shift @_;
+	s/\b(CONFIG_\w+)\b/defined($options{$1}) ? 1 : 0/ge;
+	return eval $_;
+}
+
 open IN, $ARGV[0] or die "Unable to open $ARGV[0]";
 open OUT, ">$ARGV[1]" or die "Unable to create $ARGV[1]";
 my @ifs = ();	# stack of conditions, 1=satisfied, -1=unsatisfied, 0=shadowed
@@ -24,12 +42,18 @@ while (<IN>) {
 		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (defined $options{$1}) ? 1 : -1;
 	} elsif (/^#ifndef\s+(\w+)/) {
 		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (defined $options{$1}) ? -1 : 1;
+	} elsif (/^#if\s(.*)$/) {
+		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (eval_expr $1) ? 1 : -1;
 	} elsif (/^#endif/) {
 		defined pop @ifs || die "Improper nesting of conditionals";
 	} elsif (/^#else/) {
 		my $x = pop @ifs;
 		defined $x || die "Improper nesting of conditionals";
-		push @ifs, -$x;
+		push @ifs, $x >= 0 ? 0 : 1;
+	} elsif (/^#elsif\s(.*)$/) {
+		my $x = pop @ifs;
+		defined $x || die "Improper nesting of conditionals";
+		push @ifs, $x >= 0 ? 0 : (eval_expr $1) ? 1 : -1;
 	} else {
 		@ifs && $ifs[$#ifs] <= 0 && next;
 		if (/^$/) {
@@ -37,8 +61,20 @@ while (<IN>) {
 			$empty = 1;
 		} else { $empty = 0; }
 		if (/^#pipe\s+(.+)/) {
+			my $cmd = $1;
+			my $val = `$cmd`;
+			die "Piped command '$cmd' failed" if $?;
 			print OUT `$1`;
 		} else {
+			sub repl($);
+			sub repl($) {
+				my $v = shift @_;
+				exists $vars{$v} or die "Cannot substitute $v: variable not set";
+				my $x = $vars{$v};
+				while ($x =~ s/\$\((\w+)\)/repl($1)/ge) { }
+				return $x;
+			}
+			s/@(\w+)@/repl($1)/ge;
 			print OUT;
 		}
 	}