Changeset 96

Timestamp:

05/03/07 15:45:34 (18 years ago)

Author:

kdeugau

Message:

/trunk

Bugfixery and add a "fixme" note re: %if constructs outside of preamble

• Cosmetic cleanup: swap (undef,undef...) = (function) for $var=(function)[n]
• Expand macro defs from ~/.debmacros
• Move expansion of %(...) constructs lower in expandmacros so that %{macro} expansions get done before the shell call

File:

• trunk/debbuild (modified) (5 diffs)

trunk/debbuild

@@ -266 +266 @@
 # Needs to handle "other files"
 sub load_userconfig {
-  my (undef,undef,undef,undef,undef,undef,undef,$homedir,undef) = getpwuid($<);
+  my $homedir = (getpwuid($<))[7];
   if (-e "$homedir/.debmacros") {
     open USERMACROS,"<$homedir/.debmacros";
@@ -274 +274 @@
         my (undef,$tmp) = split /\s+/, $_;
         $topdir = $tmp;
+      }
+      next if /^\%_/;
+      # Allow arbitrary definitions.  Note that we're only doing simple defs here for now.
+      if (/^\%([a-z0-9]+)\s+(.+)$/) {
+        $specglobals{$1} = $2;
       }
     }
@@ -497 +502 @@
       }
 
+##fixme:  need to allow %if contructs to work in subsections like %prep
       if (/^\%prep/) {
         # %prep section.  May have %setup macro;  may include %patch tags,
@@ -1318 +1324 @@
   if ($section =~ /g/) {
 
-    # special %define's.  Handle the general case where we eval anything.
-    # Even more general:  %(...) is a spec-parse-time shell code wrapper.
-    # Prime example:
-    #%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-    if ($macrostring =~ /^\%\(.+\)$/) {
-      $macrostring =~ s/^\%\(//;
-      $macrostring =~ s/\)$//;
-      # Oy vey this gets silly for the perl bits.  Executing a shell to
-      # call Perl to get the vendorlib/sitelib/whatever "core" globals.
-      # This can do more, but...  eww.
-      # Next line is non-optimal - what if $macrostring contains ' characters?
-      $macrostring = qx { /bin/sh -c '$macrostring' };
-    }
-
     $macrostring =~ s|%{_builddir}|%{_topdir}/BUILD|g;
     $macrostring =~ s|%{_topdir}|$topdir|g;
@@ -1352 +1344 @@
     foreach my $key (keys %specglobals) {
       $macrostring =~ s|%{$key}|$specglobals{$key}|g;
+    }
+
+    # special %define's.  Handle the general case where we eval anything.
+    # Even more general:  %(...) is a spec-parse-time shell code wrapper.
+    # Prime example:
+    #%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
+    if ($macrostring =~ /\%\((.+)\)/) {
+      my $shellstr = $1;
+      # Oy vey this gets silly for the perl bits.  Executing a shell to
+      # call Perl to get the vendorlib/sitelib/whatever "core" globals.
+      # This can do more, but...  eww.
+      $shellstr = qx { /bin/sh -c '$shellstr' };        # Yay!  ' characters apparently get properly exscapededed.
+      $macrostring =~ s/\%\(.+\)/$shellstr/;
     }