Changeset 93

Timestamp:

04/27/07 16:34:52 (17 years ago)

Author:

kdeugau

Message:

/trunk

Miscellaneous bugfixery and cosmetic cleanup

File:

• trunk/debbuild (modified) (9 diffs)

trunk/debbuild

@@ -1 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # debbuild script
 # Shamelessly steals interface from rpm's "rpmbuild" to create
@@ -57 +57 @@
 my $srcpkg;
 my $cmdbuildroot;
-my $tarballdir; # This should really be initialized, but the coding makes it, um, ugly.
+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.
 
@@ -307 +307 @@
           $cmdopts{type} = 'd'; # d for 'diagnostic' or 'debug' or 'dump'
         } else {
-          print "Long opt $_\n";
+          print "Long option $_ not handled\n";
         }
       } else {
@@ -414 +414 @@
 LINE: while (<SPECFILE>) {
     next if /^#/;       # Ignore comments...
-    next if /^\s+$/;    # ... and blank lines.
+    next if /^\s*$/;    # ... and blank lines.
 
     if (/^\%/) {
@@ -477 +477 @@
             if ( /\s+-n\s+([^\s]+)\s+/ ) {
               $tarballdir = $1;
-            } else {
-              $tarballdir = "$pkgdata{main}{name}-$pkgdata{main}{version}";
             }
             $tarballdir = expandmacros($tarballdir,'gp');
@@ -657 +655 @@
         }
       }
+# don't add any segments after this (%changelog), because something in the (Perl) parser gets
+# thoroughly confuzzled if it tries to manipulate file data after EOL.  Feh.
 
     } else {    # Data from the spec file "header"
@@ -737 +737 @@
   $prepscript = expandmacros($prepscript,'gp');
 
-#print $prepscript; exit 0;
-
   # create script filename
   my $prepscriptfile = "$tmpdir/deb-tmp.prep.".int(rand(99998)+1);
@@ -792 +790 @@
         or die $!;
   print INSTSCRIPT $scriptletbase;
-#  print INSTSCRIPT $cleanscript;       # Clean up our install target before installing into it.
   print INSTSCRIPT $installscript;
   close INSTSCRIPT;
@@ -1285 +1282 @@
 
     # 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 =~ /^\%\(eval.+\)$/) {
+    if ($macrostring =~ /^\%\(.+\)$/) {
       $macrostring =~ s/^\%\(//;
       $macrostring =~ s/\)$//;