Changeset 99


Ignore:
Timestamp:
Sep 4, 2007, 1:19:23 AM (12 years ago)
Author:
bruno
Message:

topdir also fixed for delivery

Location:
devel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r98 r99  
    167167            my ($name,$ver) = split(/_/,$d);
    168168            chomp($ver);
    169             my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init($name,$ver);
    170             print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
     169            my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
     170            print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n" if ($debug >= 1);
    171171            print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
    172172
     
    223223            if (defined $ptr) {
    224224                foreach my $f (values %bfiles) {
    225                     pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
     225                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
    226226                }
    227227                if (defined $filteredfiles{$pbpkg}) {
    228228                    foreach my $f (split(/,/,$filteredfiles{$pbpkg})) {
    229                         pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
     229                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
    230230                    }
    231231                }
     
    286286
    287287    # Get the running distro to build on
    288     my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
    289     print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
     288    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
     289    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
    290290
    291291    # Get content saved in cms2build
     
    353353
    354354    # Get the running distro to build on
    355     my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
    356     print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
     355    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
     356    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
    357357
    358358    # Get content saved in cms2build
     
    371371        } elsif ($cmt eq "Packages") {
    372372            if ($dtype eq "rpm") {
    373                 # rpm has its own standard build directory
    374                 my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
    375                 chomp($tmp);
    376                 $ENV{'PBBUILDDIR'}=$tmp;
    377                 $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$dsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$dsuf.src.rpm"
     373                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm"
    378374            } elsif ($dtype eq "deb") {
    379375                my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
     
    401397    }
    402398    $src = join(' ',@src);
    403     pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src 2> /dev/null\"","Preparing $dir on $mac");
     399    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src 2>&1 > /dev/null\"","Preparing $dir on $mac");
    404400    pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
    405401}
  • devel/pb/lib/ProjectBuilder/Base.pm

    r98 r99  
    334334my $destfile=shift;
    335335my $dtype=shift;
    336 my $dsuf=shift;
     336my $pbsuf=shift;
    337337my $pbpkg=shift;
    338338my $pbver=shift;
     
    361361            my $p = $defpkgdir{$pbpkg};
    362362            $p = $extpkgdir{$pbpkg} if (not defined $p);
    363             pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
     363            pb_changelog($dtype, $pbpkg, $pbtag, $pbsuf, $p, \*DEST);
    364364        }
    365365        $line =~ s|$s|$tmp|;
     
    378378my %filter=%$ptr;
    379379my $destfile=shift;
     380my $pbsuf=shift;
    380381my $pbpkg=shift;
    381382my $pbver=shift;
  • devel/pbconf/pb.pb

    r98 r99  
    1818#pkgver project-builder = devel
    1919#pkgtag project-builder = 1
     20pkgver nil
     21pkgtag nil
    2022
    2123# Hash of default package/package directory
  • devel/pbconf/project-builder/pbfilter/rpm.pbf

    r81 r99  
    3030# PBPKG is replaced by the package name ($pbpkg in code)
    3131filter PBPKG = $pbpkg
     32
     33# PBSUF is replaced by the package name ($pbpkg in code)
     34filter PBSUF = $pbsuf
  • devel/pbconf/project-builder/rpm/pb.spec

    r74 r99  
    88Name:       PBPKG
    99Version:    PBVER
    10 Release:    PBTAG
     10Release:    PBTAGPBSUF
    1111License:    GPL
    1212Group:      PBGRP
Note: See TracChangeset for help on using the changeset viewer.