Changeset 409 for devel/pb/bin/pb


Ignore:
Timestamp:
Apr 25, 2008, 3:13:55 PM (12 years ago)
Author:
Bruno Cornec
Message:
  • Document all reusable functions in pb
  • remove the useless pbproj parameter from pb_filter functions
  • Addition and use of pb_conf_init and pb_conf_add in pb
  • Addition and use of pb_conf_fromfile_if in Conf.pm
  • preparation for 0.9.1
  • Update of pbinit files for mondo to support the new interface of pb_filter functions
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r405 r409  
    551551            if (defined $ptr) {
    552552                foreach my $f (values %bfiles,values %pkgfiles) {
    553                     pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
     553                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
    554554                }
    555555            }
     
    573573        if (defined $filteredfiles->{$pbpkg}) {
    574574            foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
    575                 pb_filter_file_inplace($ptr,"$dest/$f",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
     575                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
    576576                $liste = "$f $liste";
    577577            }
     
    581581        # Prepare the dest directory for archive
    582582        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
    583             pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
     583            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
    584584            chmod 0755,"$ENV{'PBTMP'}/pbinit";
    585585            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
     
    16501650$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
    16511651
     1652# We only have one configuration file for now.
     1653pb_conf_init("$ENV{'PBETC'}");
     1654
    16521655#
    16531656# Check project name
     
    18301833    }
    18311834
    1832     return  if ($action =~ /^newver$/);
     1835    # Adds that conf file to the list to consider
     1836    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
     1837
     1838    return if ($action =~ /^newver$/);
    18331839
    18341840    my %version = ();
     
    18391845   
    18401846    if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") and (not defined $pbinit)) {
     1847
    18411848        # List of pkg to build by default (mandatory)
    18421849        my ($defpkgdir,$pbpackager, $pkgv, $pkgt) = pb_conf_get("defpkgdir","pbpackager","projver","projtag");
Note: See TracChangeset for help on using the changeset viewer.