Changeset 1363 in ProjectBuilder

Timestamp:

Nov 21, 2011, 2:34:56 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix to support directories under the debian dir (such as source/format)
• Fix to apply build files really from generic to specific
• Add initial support for quilt patches on Debian

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -335 +335 @@
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
     }
+    pb_log(1,"PBROOTDIR=$ENV{'PBROOTDIR'}\n");
 
     # Adds that conf file to the list to consider

devel/pb/bin/pb

@@ -913 +913 @@
                 # Used in Filter.pm by pb_filter_file
 
-                $build{$v} = "yes";
+                $build{$v} = "no";
                 if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'os'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'os'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}") {
+                    $build{$v} = "yes";
+                } 
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}") {
+                    $build{$v} = "yes";
+                } 
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}") {
+                    $build{$v} = "yes";
+                } 
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}") {
+                    $build{$v} = "yes";
+                } 
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
+                    $build{$v} = "yes";
+                } 
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } else {
-                    $build{$v} = "no";
+                    $build{$v} = "yes";
                 }
                 pb_log(2,"DEBUG($v) bfiles: ".Dumper(\%bfiles)."\n");
@@ -961 +970 @@
                     }
                     # Filter build files at the end, as they depend on patches and sources
-                    foreach my $f (values %bfiles,values %pkgfiles) {
-                        pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$v/".basename($f),$pb);
+                    foreach my $f (keys %bfiles) {
+                        pb_filter_file("$ENV{'PBROOTDIR'}/$bfiles{$f}",$ptr,"$dest/pbconf/$v/$f",$pb);
+                    }
+                    foreach my $f (keys %pkgfiles) {
+                        pb_filter_file("$ENV{'PBROOTDIR'}/$pkgfiles{$f}",$ptr,"$dest/pbconf/$v/$f",$pb);
                     }
                 }
@@ -1248 +1260 @@
 
             # We need to handle potential patches to upstream sources
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/debian/patches");
-            my @f = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","$ENV{'PBBUILDDIR'}/debian/patches","patch");
-            # Generate Debian patch series
-            open(SERIE,"> $ENV{'PBBUILDDIR'}/debian/series") || die "Unable to write in $ENV{'PBBUILDDIR'}/debian/series";
-            foreach my $f (@f) {
+            pb_mkdir_p("debian/patches");
+            my @f = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","debian/patches","patch");
+
+            # If we use quilt to manage patches, we then setup the env correctly as per http://pkg-perl.alioth.debian.org/howto/quilt.html
+            # Generate Debian patch series for quilt
+            # If we use dpatch to manage patches, we then setup the 00list file as well
+            open(SERIE,"> debian/patches/series") || die "Unable to write in debian/patches/series";
+            open(LIST,"> debian/patches/00list") || die "Unable to write in debian/patches/00list";
+            foreach my $f (sort @f) {
+                # We also need to ncompress them
                 print SERIE "$f\n";
+                print LIST "$f\n";
             }
             close(SERIE);
+            close(LIST);
+            $ENV{'QUILT_PATCHES'}="debian/patches";
 
             # We need to handle potential additional sources to upstream sources
@@ -3450 +3470 @@
 my $pkgfiles = shift;
 my $supfiles = shift;
-
-pb_log(2,"DEBUG: entering pb_list_bfiles: ".Dumper($bfiles)."\n");
+# subdir to keep if recursive mode, empty by default
+my $subdir = shift || "";
+
+pb_log(2,"DEBUG: entering pb_list_bfiles in $dir: ".Dumper($bfiles)."\n");
 opendir(BDIR,"$dir") || die "Unable to open dir $dir: $!";
 foreach my $f (readdir(BDIR)) {
+    pb_log(3,"DEBUG: pb_list_bfiles found $f\n");
     next if ($f =~ /^\./);
-    if (-d $f) {
+    if (-d "$dir/$f") {
         # Recurse for directories (Debian 3.0 format e.g.)
-        pb_list_bfiles($f,$pbpkg,$bfiles,$pkgfiles,$supfiles);
+        pb_log(2,"DEBUG: pb_list_bfiles recurse in $dir/$f\n");
+        pb_list_bfiles("$dir/$f",$pbpkg,$bfiles,$pkgfiles,$supfiles,$f);
         next;
     }
-    $bfiles->{$f} = "$dir/$f";
-    $bfiles->{$f} =~ s~$ENV{'PBROOTDIR'}~~;
+
+    my $key = $f;
+    # if recursive then store also the subdir
+    $key = "$subdir/$f" if ($subdir ne "");
+    $bfiles->{$key} = "$dir/$f";
+    $bfiles->{$key} =~ s~$ENV{'PBROOTDIR'}~~;
     if (defined $supfiles->{$pbpkg}) {
-        $pkgfiles->{$f} = "$dir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+        $pkgfiles->{$key} = "$dir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
     }
 }