Changeset 60

Timestamp:

06/05/06 15:53:07 (18 years ago)

Author:

kdeugau

Message:

/trunk

Extend %define capability - can now use %(eval ...) as the
"value", where the stuff in brackets is eval'ed by /bin/sh (aka
/bin/{bash,ash,bsh} and a number of others). Note that it will
likely barf and break for a *csh.

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -371 +371 @@
       # A macro that needs further processing.
 
-      if (/^\%define\s+([^\s]+)\s+([^\s]+)/) {
-        $specglobals{$1} = expandmacros($2,'g');
+      if (my ($key, $def) = (/^\%define\s+([^\s]+)\s+(.+)$/) ) {
+        $specglobals{$key} = expandmacros($def,'g');
       }
 
@@ -1152 +1152 @@
   # Globals, and not-so-globals
   if ($section =~ /g/) {
+
+    # special %define's.  Handle the general case where we eval anything.
+    # Prime example:
+    #%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
+    if ($macrostring =~ /^\%\(eval.+\)$/) {
+      $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;