Changeset 286


Ignore:
Timestamp:
Nov 15, 2007, 12:22:09 AM (12 years ago)
Author:
bruno
Message:

Fixes remaining issues with overall ChangeLog? support

Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Base.pm

    r285 r286  
    872872my $cms=shift;
    873873
    874 return if ((not defined $authors) || (! -f $authors));
    875 open(AUT,$authors) || die "Unable to open $authors";
     874return if ($authors eq "/dev/null");
     875open(SAUTH,$authors) || die "Unable to open $authors";
    876876open(DAUTH,"> $dest/AUTHORS") || die "Unable to create $dest/AUTHORS";
    877877print DAUTH "Authors of the project are:\n";
    878878print DAUTH "===========================\n";
    879 while (<AUT>) {
     879while (<SAUTH>) {
    880880    my ($nick,$gcos) = split(/:/);
     881    chomp($gcos);
    881882    print DAUTH "$gcos";
    882     print DAUTH " ($nick under $cms)\n" if (defined $cms);
     883    if (defined $cms) {
     884        print DAUTH " ($nick under $cms)\n";
     885    } else {
     886        print DAUTH "\n";
     887    }
    883888}
    884889close(DAUTH);
    885 close(AUTH);
     890close(SAUTH);
    886891}
    887892
     
    890895my $pkgdir = shift;
    891896my $dest = shift;
     897my $chglog = shift;
    892898my $authors = shift;
    893899
     
    895901
    896902if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
    897     pb_system("svn log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
    898     if ((-x "/usr/bin/svn2cl") && (! -f $dest/ChangeLog)) {
    899         pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
     903    if (! -f "$dest/ChangeLog") {
     904        if (-x "/usr/bin/svn2cl") {
     905            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
     906        } else {
     907            # To be written from pbcl
     908            pb_system("svn log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
     909        }
    900910    }
    901911} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
     
    904914    my $tmp=basename($pkgdir);
    905915    # CVS needs a relative path !
    906     pb_system("cvs log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
    907     if ((-x "/usr/bin/svn2cl") && (! -f $dest/ChangeLog)) {
    908         pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
     916    if (! -f "$dest/ChangeLog") {
     917        if (-x "/usr/bin/cvs2cl") {
     918            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
     919        } else {
     920            # To be written from pbcl
     921            pb_system("cvs log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
     922        }
    909923    }
    910924} else {
  • devel/pbconf/project-builder/rpm/project-builder.spec

    r283 r286  
    4848%files
    4949%defattr(-,root,root)
    50 %doc ChangeLog svn.log
     50%doc ChangeLog
    5151%doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
    5252
Note: See TracChangeset for help on using the changeset viewer.