Changeset 95

Timestamp:

04/27/07 17:10:19 (18 years ago)

Author:

kdeugau

Message:

/trunk

Add support for basic %if constructs:

%if <expression>
<parse this bit of spec file>
%else
<parse this bit of spec file>
%endif

<expression> will usually be %{?macro:0}%{?!macro:1}, but the
"execute-shell-code" %(<shell code>) expansion can also be used if the
output is suitable. %else is optional. %if's should be nestable
very deeply - probably 2^{31-1 at least.}

Also includes a bugfix on the initialization of $tarballdir.

File:

• trunk/debbuild (modified) (4 diffs)

trunk/debbuild

@@ -57 +57 @@
 my $srcpkg;
 my $cmdbuildroot;
-my $tarballdir; = '%{name}-%{version}'; # We do this in case of a spec file not using %setup...
+my $tarballdir = '%{name}-%{version}';  # We do this in case of a spec file not using %setup...
 my %specglobals;        # For %define's in specfile, among other things.
 
@@ -418 +418 @@
   open SPECFILE,"<$specfile" or die "specfile ($specfile) barfed: $!";
 
+  my $iflevel = 0;
   my $buildarch = $hostarch;
   $pkgdata{main}{arch} = $hostarch;
@@ -430 +431 @@
       if (my ($key, $def) = (/^\%define\s+([^\s]+)\s+(.+)$/) ) {
         $specglobals{$key} = expandmacros($def,'g');
+      }
+
+      if (/^\%if/) {
+        s/^\%if//;
+        my $expr = expandmacros($_, 'g');
+        $iflevel++;
+        next LINE if $expr != 0;        # This appears to be the only case we call false.
+        while (<SPECFILE>) {
+          if (/^\%endif/) {
+            $iflevel--;
+            next LINE;
+          } elsif (/^\%else/) {
+            next LINE;
+          }
+        }
+      }
+      if (/^\%else/) {
+       while (<SPECFILE>) {
+         if (/^\%endif/) {
+           $iflevel--;
+           next LINE;
+         }
+       }
+      }
+      if (/^\%endif/) {
+        $iflevel--;
+        next LINE;
       }
 
@@ -1326 +1354 @@
     }
 
+    # support for **some** %if constructs.  Note that this breaks somewhat if
+    # there's no value specified...  but so does rpm.
+    while ($macrostring =~ /\%\{\?(\!)?([a-z0-9_.-]+)(?:\:([a-z0-9_.-]+))?\}/) {       #Whew....
+      my $neg = $1;
+      my $macro = $2;
+      my $value = $3;
+      if ($specglobals{$macro}) {
+        $value = '' if $neg;
+      } else {
+        $value = '' if !$neg;
+      }
+      $macrostring =~ s/\%\{\?\!?[a-z0-9_.-]+(?:\:[a-z0-9_.-]+)?\}/$value/;
+    }
+
     # system programs.  RPM uses a global config file for these;  we'll just
     # ASS-U-ME and make life a little simpler.