Changeset 28

Timestamp:

12/12/05 18:10:42 (19 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint
Tweaks to %files handling, cruft cleanup

File:

• trunk/debbuild (modified) (5 diffs)

trunk/debbuild

@@ -142 +142 @@
 }
 # -> install if -.[ilabs]
-if ($cmdopts{stage} eq 'i' || ($cmdopts{stage} =~ /[labs]/ && $cmdopts{short} ne 'y')) {
-#if ($cmdopts{stage} =~ /[ilabs]/) {
+#if ($cmdopts{stage} eq 'i' || ($cmdopts{stage} =~ /[labs]/ && $cmdopts{short} ne 'y')) {
+if ($cmdopts{stage} =~ /[ilabs]/) {
   install();
 }
@@ -259 +259 @@
   if ($cmdopts{short} eq 'y' && $cmdopts{stage} =~ /[labs]/) {
     warn "Can't use --short-circuit for $targets{$cmdopts{stage}} stage.  Ignoring.\n";
-##temp  Allow short-circuit on full builds so we can experiment
-# with apache pkg without spending hours recompiling repeatedly
-#    $cmdopts{short} = 'n';
+    $cmdopts{short} = 'n';
   }
 
@@ -617 +615 @@
   }
 
-print "\n\nmoving files for subpackages...\n";
 ##work
   foreach my $pkg (@pkglist) {
-#next if $pkg eq 'sources';
-print "got here, trying to move files for $pkg...\n";
 
     # Gotta do this first, otherwise we don't have a place to move files from %files
     mkdir "$buildroot/$pkg";
+
     my @pkgfilelist = split ' ', $filelist{$pkg};
     foreach my $pkgfile (@pkgfilelist) {
-#print "finding path for $pkgfile\n";
       my @filepath = ($pkgfile =~ /(.+)\/([a-zA-Z0-9_\.\+\-]+)$/);
       qx { mkdir -p $buildroot/$pkg$filepath[0] }
         if $filepath[0] ne '';
-#print "mkdir -p $buildroot/$pkg$filepath[0]\n";
-#print "$filepath[0]\n";
       qx { mv $buildroot$pkgfile $buildroot/$pkg$filepath[0] };
-#print "mv $buildroot$pkgfile $buildroot/$pkg$filepath[0]\n";
-    }
-#exit 0;
+    }
+
     # Gotta do this next, otherwise the control file has nowhere to go.  >:(
     mkdir "$buildroot/$pkg/DEBIAN";
@@ -650 +642 @@
     close DEBSCRIPT;
 
-#my $control;
-#eval {
     my $control = "Package: $pkgdata{$pkg}{name}\n".
         "Version: $pkgdata{$pkg}{version}-$pkgdata{main}{release}\n".
@@ -660 +650 @@
         "Description: $pkgdata{$pkg}{summary}\n";
     $control .= "$pkgdata{$pkg}{desc}\n";
-#};
-#die "control: $control\n\n $@ \n" if $@;
 
     open CONTROL, ">$buildroot/$pkg/DEBIAN/control";