Support the %load macro

We use the includecallback to get the macro file content.

Author: mlschroe

Build.pm

@@ -599,17 +599,8 @@ sub read_config {
     s/=$// for @{$config->{'substitute'}->{$l}};
   }
   # add rawmacros to our macro list
-  if ($config->{'rawmacros'} ne '') {
-    for my $rm (split("\n", $config->{'rawmacros'})) {
-      if (@macros && $macros[-1] =~ /\\\z/s) {
-	$macros[-1] = substr($macros[-1], 0, -1)."\n$rm";
-      } elsif ($rm !~ /^%/) {
-	push @macros, $rm;
-      } else {
-	push @macros, "%define ".substr($rm, 1);
-      }
-    }
-  }
+  Build::Rpm::add_macros($config, $config->{'rawmacros'}) if $config->{'rawmacros'} ne '';
+
   # extract some helper hashes for the flags
   my %modules;
   for (@{$config->{'expandflags'} || []}) {

Build/Rpm.pm

@@ -340,10 +340,33 @@ sub builtinmacro {
   }
   return (exists($macros->{"with_$args[0]"}) ? 1 : 0) ^ ($macname eq 'without' ? 1 : 0) if $macname eq 'with' || $macname eq 'without';
   return (exists($macros->{$args[0]}) ? 1 : 0) ^ ($macname eq 'undefined' ? 1 : 0) if $macname eq 'defined' || $macname eq 'undefined';
+  if ($macname eq 'load' && ref($macros->{'load'}) eq 'ARRAY') {
+    my $l = $macros->{'load'};
+    my $c = {};
+    add_macros($c, $l->[0]->($args[0]));
+    initmacros($c, $l->[1], $l->[2]);
+    return '';
+  }
   do_warn($config, "unsupported builtin macro $macname");
   return '';
 }
 
+sub add_macros {
+  my ($config, $rawmacros) = @_;
+  $config->{'macros'} ||= [];
+  return unless defined $rawmacros;
+  my $macros = $config->{'macros'};
+  for my $rm (split("\n", $rawmacros)) {
+    if (@$macros && $macros->[-1] =~ /\\\z/s) {
+        $macros->[-1] = substr($macros->[-1], 0, -1)."\n$rm";
+    } elsif ($rm !~ /^%/) {
+      push @$macros, $rm;
+    } else {
+      push @$macros, "%define ".substr($rm, 1);
+    }
+  }
+}
+
 sub initmacros {
   my ($config, $macros, $macros_args) = @_;
   for my $line (@{$config->{'macros'} || []}) {
@@ -412,6 +435,7 @@ my %builtin_macros = (
   'dirname' => \&builtinmacro,
   'shrink' => \&builtinmacro,
   'suffix' => \&builtinmacro,
+  'load' => \&builtinmacro,
 
   'gsub' => \&luamacro,
   'len' => \&luamacro,
@@ -714,6 +738,12 @@ sub parse {
   my $multilinedefine;
   my $multilinecondition;
   my $substitute = $config->{'substitute'};
+
+  # setup load macro if we have an include callback
+  if ($includecallback && !$config->{'parsing_config'}) {
+    $macros{'load'} = [ $includecallback, \%macros, \%macros_args ];
+  }
+
   while (1) {
     my $line;
     my $doxspec = $xspec ? 1 : 0;

t/parse_spec.t

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 14;
+use Test::More tests => 15;
 
 use Build;
 use Build::Rpm;
@@ -396,3 +396,15 @@ $expected = {
 $result = Build::Rpm::parse($conf, [ split("\n", "%global foo 1\n%global bar 1\n$spec") ]);
 is_deeply($result, $expected, "multiline condition 4");
 
+$Build::Rpm::includecallback = sub { $_[0] eq 'xxx' ? "%mac_foo mac_bar\n": undef };
+$spec = q[
+%{load:xxx}
+Name: %mac_foo
+];
+$expected = {
+  'name' => 'mac_bar',
+  'deps' => [],
+  'subpacks' => ['mac_bar'],
+};
+$result = Build::Rpm::parse($conf, [ split("\n", $spec) ]);
+is_deeply($result, $expected, "multiline condition 4");