Changeset 286

Timestamp:

11/15/07 00:22:09 (6 years ago)

Author:

bruno

Message:

Fixes remaining issues with overall ChangeLog? support

Location:

devel

Files:

• pb/lib/ProjectBuilder/Base.pm (modified) (4 diffs)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -872 +872 @@
 my $cms=shift;
 
-return if ((not defined $authors) || (! -f $authors));
-open(AUT,$authors) || die "Unable to open $authors";
+return if ($authors eq "/dev/null");
+open(SAUTH,$authors) || die "Unable to open $authors";
 open(DAUTH,"> $dest/AUTHORS") || die "Unable to create $dest/AUTHORS";
 print DAUTH "Authors of the project are:\n";
 print DAUTH "===========================\n";
-while (<AUT>) {
+while (<SAUTH>) {
     my ($nick,$gcos) = split(/:/);
+    chomp($gcos);
     print DAUTH "$gcos";
-    print DAUTH " ($nick under $cms)\n" if (defined $cms);
+    if (defined $cms) {
+        print DAUTH " ($nick under $cms)\n";
+    } else {
+        print DAUTH "\n";
+    }
 }
 close(DAUTH);
-close(AUTH);
+close(SAUTH);
 }
 
@@ -890 +895 @@
 my $pkgdir = shift;
 my $dest = shift;
+my $chglog = shift;
 my $authors = shift;
 
@@ -895 +901 @@
 
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
-    pb_system("svn log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
-    if ((-x "/usr/bin/svn2cl") && (! -f $dest/ChangeLog)) {
-        pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+    if (! -f "$dest/ChangeLog") {
+        if (-x "/usr/bin/svn2cl") {
+            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+        } else {
+            # To be written from pbcl
+            pb_system("svn log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
+        }
     }
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
@@ -904 +914 @@
     my $tmp=basename($pkgdir);
     # CVS needs a relative path !
-    pb_system("cvs log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
-    if ((-x "/usr/bin/svn2cl") && (! -f $dest/ChangeLog)) {
-        pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+    if (! -f "$dest/ChangeLog") {
+        if (-x "/usr/bin/cvs2cl") {
+            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+        } else {
+            # To be written from pbcl
+            pb_system("cvs log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
+        }
     }
 } else {

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -48 +48 @@
 %files
 %defattr(-,root,root)
-%doc ChangeLog svn.log
+%doc ChangeLog
 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu