Changeset 77 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 3, 2007, 3:34:11 AM (17 years ago)

Author:

Bruno Cornec

Message:

transfer pb_fiter_file to Base and duplicate :-( for external call
Create sub functions per action

File:

• devel/pb/bin/pb (modified) (11 diffs)

devel/pb/bin/pb

@@ -29 +29 @@
 use ProjectBuilder::Changelog qw (pb_changelog);
 use ProjectBuilder::Version qw (pb_version_init);
-use ProjectBuilder::Base qw (pb_conf_read pb_cms_init pb_mkdir_p pb_system pb_rm_rf);
+use ProjectBuilder::Base qw (pb_conf_read pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb);
 
 my %opts;                   # CLI Options
@@ -38 +38 @@
 my $pbtag;                  # Global TAG variable
 my $pbver;                  # Global VERSION variable
+my %pbver;                  # per package
+my %pbtag;                  # per package
 my $pbrev;                  # Global REVISION variable
 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
@@ -87 +89 @@
 # Act depending on action
 if ($action =~ /^cms2build$/) {
-    my $ptr = get_pkg();
+    pb_cms2build();
+} elsif ($action =~ /^build2pkg$/) {
+    pb_build2pkg();
+} elsif ($action =~ /^cms2pkg$/) {
+    pb_cms2build();
+    pb_build2pkg();
+} else {
+    print $LOG "'$action' is not available\n";
+    pb_syntax();
+}
+
+sub pb_cms2build {
+
+    my $ptr = pb_get_pkg();
     @pkgs = @$ptr;
     pb_cms_init($ENV{'PBPROJ'});
@@ -190 +205 @@
 
             # Get all filters to apply
-            # They're cumulative from less specific to most specific
-            # suffix is .pbf
-            my @ffiles;
-            my ($ffile0, $ffile1, $ffile2, $ffile3);
-            if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
-                $ffile0 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf");
-                $ffile1 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf");
-                $ffile2 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir.pbf");
-                $ffile3 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf");
-                push @ffiles,$ffile0 if (defined $ffile0);
-                push @ffiles,$ffile1 if (defined $ffile1);
-                push @ffiles,$ffile2 if (defined $ffile2);
-                push @ffiles,$ffile3 if (defined $ffile3);
-            }
-            my $config = AppConfig->new({
-                            # Auto Create variables mentioned in Conf file
-                            CREATE => 1,
-                            DEBUG => 0,
-                            GLOBAL => {
-                                # Each conf item is a hash
-                                ARGCOUNT => AppConfig::ARGCOUNT_HASH
-                            }
-                        });
-            my $ptr;
-            if (@ffiles) {
-                print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
-                $config->file(@ffiles);
-                $ptr = $config->get("filter");
-                print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
-            } else {
-                $ptr = { };
-            }
+            my $ptr = pb_get_filters($pbpkg, $dtype, $dfam, $ddir, $dver);
 
             # Apply now all the filters on all the files concerned
@@ -227 +211 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    filter_file("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pbpkg,$dtype,$dsuf);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pbpkg,$dtype,$dsuf);
                 }
                 if (defined $filteredfiles{$dir}) {
                     foreach my $f (split(/,/,$filteredfiles{$dir})) {
-                        filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbpkg,$dtype,$dsuf);
+                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f");
                     }
                 }
@@ -258 +242 @@
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
         # Keep track of what is generated for default
-        open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
-        print LAST "pbroot $pbver-$pbtag = $ENV{'PBROOT'}\n";
-        close(LAST);
+        $pbver{$pbpkg} = $pbver;
+        $pbtag{$pbpkg} = $pbtag;
     }
-} elsif ($action =~ /^build2pkg$/) {
+    open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
+    foreach my $v (keys %pbver) {
+        print LAST "pbroot $v-_-$pbver{v}-$pbtag{v} = $ENV{'PBROOT'}\n";
+    }
+    close(LAST);
+}
+
+sub pb_build2pkg {
+
+    # Get list of packages to build
+    my $ptr = pb_get_pkg();
+    @pkgs = @$ptr;
+
     # Check whether we have a specific version to build
     my $vertag = shift @ARGV;
-    if (not defined $vertag) {
-        if (-f $pbrc{$ENV{'PBPROJ'}}) {
-            my $pbroot = pb_conf_read($pbrc{$ENV{'PBPROJ'}},"pbroot");
-            # There is only one line normaly
-            $vertag = (keys %$pbroot)[0];
-            $ENV{'PBROOT'} = (values %$pbroot)[0];
-        } else {
-            die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
-        }
-    }
-    ($pbver,$pbtag) = split(/-/,$vertag);
-
-    # Get list of packages to build
-    my $ptr = get_pkg();
-    @pkgs = @$ptr;
 
     # Get the running distro to build on
@@ -287 +267 @@
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
+        # get the version of the current package - maybe different
+        if (not defined $vertag) {
+            if (-f $pbrc{$ENV{'PBPROJ'}}) {
+                my $pbroot = pb_conf_read($pbrc{$ENV{'PBPROJ'}},"pbroot");
+                # All lines should point to the same pbroot so take the first
+                $ENV{'PBROOT'} = (values %$pbroot)[0];
+                foreach my $k (keys %$pbroot) {
+                        if ($k =~ /^$pbpkg-_-/) {
+                            ($ptr,$vertag) = split(/-_-/,$k);
+                            last;
+                        }
+                }
+                die "Unable to find $pbpkg in $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag" if (not defined $vertag);
+            } else {
+                die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
+            }
+        }
+        ($pbver,$pbtag) = split(/-/,$vertag);
+
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
         print $LOG "Source file: $src\n" if ($debug >= 0);
@@ -305 +304 @@
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             my @specfile;
-            @specfile = extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+            @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
 
             print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
@@ -324 +323 @@
         }
     }
-} else {
-    print $LOG "'$action' is not available\n";
-    pb_syntax();
-}
-
-# Function which applies filter on files
-sub filter_file {
-
-my $f=shift;
-my $ptr=shift;
-my %filter=%$ptr;
-my $destfile=shift;
-my $pbpkg=shift;
-my $dtype=shift;
-my $dsuf=shift;
-
-print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
-pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
-open(DEST,"> $destfile") || die "Unable to create $destfile";
-open(FILE,"$f") || die "Unable to open $f: $!";
-while (<FILE>) {
-    my $line = $_;
-    foreach my $s (keys %filter) {
-        # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
-        my $tmp = $filter{$s};
-        next if (not defined $tmp);
-        # Expand variables if any single one found
-        if ($tmp =~ /\$/) {
-            eval { $tmp =~ s/(\$\w+)/$1/eeg };
-        # special case for ChangeLog
-        } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            my $p = $defpkgdir{$pbpkg};
-            $p = $extpkgdir{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
-            $tmp = "";
-        }
-        $line =~ s|$s|$tmp|;
-    }
-    print DEST $line;
-}
-close(FILE);
-close(DEST);
-}
-
-sub get_pkg {
+}
+
+sub pb_get_pkg {
 
 my @pkgs;
@@ -391 +347 @@
 }
 
-sub extract_build_files {
+sub pb_extract_build_files {
 
 my $src=shift;
@@ -442 +398 @@
     print "\t           if not using default list\n";
     print "\n";
-    print "\n";
-}
+    print "\tcms2pkg:   cms2build + build2pkg\n";
+    print "\n";
+}