Changeset 30

Timestamp:

12/15/05 15:34:00 (18 years ago)

Author:

kdeugau

Message:

/trunk

checkpoint
%files support should be pretty much complete for basic cases

• still needs processing for %dir, %attr, and %defattr

File:

• trunk/debbuild (modified) (8 diffs)

trunk/debbuild

@@ -22 +22 @@
 # -> Parse/execute "user" config/macros (if any - *my* requirement is %_topdir)
 # -> Parse command line for options, spec file/tarball/.src.deb (NB - also accept .src.rpm)
+
+sub expandmacros;
 
 # User's prefs for dirs, environment, etc,etc,etc.
@@ -145 +147 @@
 if ($cmdopts{stage} =~ /[ilabs]/) {
   install();
+#foreach my $pkg (@pkglist) {
+#  print "files in $pkg:\n ".$filelist{$pkg}."\n";
+#}
+
 }
 # -> binpkg and srcpkg if -.a
@@ -412 +418 @@
           $cleanscript .= $_;
         }
-print "before:\n$cleanscript\n";
         $cleanscript = expandmacros($cleanscript,'gp');
-print "\nafter:\n$cleanscript\n";
-exit 0;
       }
 
@@ -458 +461 @@
 
           # and finally we can fall through %{_<FHS>}-prefixed locations...
-          $filelist{$pkgname} .= " $_" if /^\%\{_/;
+          if (/^\%\{_/) {
+            $filelist{$pkgname} .= " $_";
+            next;
+          }
+        # EW.  Necessary to clear up %define expansions before we exit with redo.
+          $_ = expandmacros $_, 'g';
 
           # ... unknown or "next section" % directives ...
@@ -466 +474 @@
           $filelist{$pkgname} .= " $_";
         }
+        $filelist{$pkgname} = expandmacros($filelist{$pkgname}, 'g');
       } # done %file section
 
@@ -619 +628 @@
   # Make sure we have somewhere to write the .deb file
   if (!-e "$topdir/DEBS/i386") {
-#       "if [ -e $topdir/DEBS/i386 ]; then\n\tmkdir $topdir/DEBS/i386\nfi\n".
     mkdir "$topdir/DEBS/i386";
   }
@@ -628 +636 @@
     # Gotta do this first, otherwise we don't have a place to move files from %files
     mkdir "$buildroot/$pkg";
+
+    # Eliminate any lingering % macros
+    $filelist{$pkg} = expandmacros $filelist{$pkg}, 'g';
 
     my @pkgfilelist = split ' ', $filelist{$pkg};
@@ -828 +839 @@
     $macrostring =~ s'%{_docdir}'/usr/share/doc'g;
 
+    # Standard FHS locations
+    $macrostring =~ s'%{_bindir}'/usr/bin'g;
+    $macrostring =~ s'%{_sbindir}'/usr/bin'g;
+    $macrostring =~ s'%{_mandir}'/usr/share/man'g;
+    $macrostring =~ s'%{_includedir}'/usr/include'g;
+
     # %define's
     foreach my $key (keys %specglobals) {