Changeset 11

Timestamp:

11/04/05 14:21:55 (19 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint
made expandmacros() more flexible; can now replace macros from
any section instead of just one.

File:

• trunk/debbuild (modified) (6 diffs)

trunk/debbuild

@@ -339 +339 @@
 BUILDSCRIPT: while (<SPECFILE>) {
           if (/^\%configure/) {
-            my $tmp = expandmacros($_,'configure');
+            my $tmp = expandmacros($_,'cg');
             $buildscript .= $tmp;
           } else {
@@ -414 +414 @@
 
   # Expand macros as necessary.
-  $scriptletbase = expandmacros($scriptletbase,'globals');
+  $scriptletbase = expandmacros($scriptletbase,'g');
 
   $buildroot = $cmdbuildroot if $cmdbuildroot;
-  $buildroot = expandmacros($buildroot,'pkgdata');
+  $buildroot = expandmacros($buildroot,'pg');
 
 } # end parse_spec()
@@ -458 +458 @@
   print BUILDSCRIPT $scriptletbase;
 
-  $buildscript = expandmacros($buildscript,'configure');
+  $buildscript = expandmacros($buildscript,'cg');
   print BUILDSCRIPT $buildscript;
   close BUILDSCRIPT;
@@ -568 +568 @@
   my $section = shift;  # We'll want to split things up a bit eventually.
 
-  if ($section eq 'configure') {
+  if ($section =~ /c/) {
     # %configure-ish macros
     # Note that these are processed in reverse order to get the substitution order right
@@ -613 +613 @@
   } # done with config section
 
-  if ($section eq 'globals') {
+  if ($section =~ /g/) {
     $macrostring =~ s/\%\{_topdir\}/$topdir/g;
 
@@ -625 +625 @@
   } # done with globals section
 
-  if ($section eq 'pkgdata') {
+  if ($section =~ /p/) {
     $macrostring =~ s/\%\{name\}/$pkgdata{main}{name}/g;
     $macrostring =~ s/\%\{version\}/$pkgdata{main}{version}/g;