Changeset 285

Timestamp:

11/15/07 00:04:08 (6 years ago)

Author:

bruno

Message:

Adds support of NEWS, AUTHORS, svn|cvs.log, ChangeLog? files and changelog info from single files under pbconf

Location:

devel

Files:

• pb/bin/pb (modified) (4 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (6 diffs)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (4 diffs)
• pbconf/pbauthors (added)
• pbconf/project-builder/pbcl (moved) (moved from devel/pb/ChangeLog)

devel/pb/bin/pb

@@ -204 +204 @@
         pb_cms_export($cms,$pbdatecvs,"$ENV{'PBROOT'}/$dir",$dest);
 
+        # Get project info on authors and log file
+        my $chglog = "$ENV{'PBCONF'}/$pbpkg/pbcl";
+        $chglog = "$ENV{'PBCONF'}/pbcl" if (! -f $chglog);
+        $chglog = undef if (! -f $chglog);
+
+        my $authors = "$ENV{'PBCONF'}/$pbpkg/pbauthors";
+        $authors = "$ENV{'PBCONF'}/pbauthors" if (! -f $authors);
+        $authors = "/dev/null" if (! -f $authors);
+
         # Extract cms log history and store it
-        pb_cms_log($cms,"$ENV{'PBROOT'}/$dir","$dest/$ENV{'PBCMSLOGFILE'}");
+        if ((defined $chglog) && (! -f "$dest/NEWS")) {
+            print $LOG "Generating NEWS file from $chglog\n";
+            copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
+        }
+        pb_cms_log($cms,"$ENV{'PBROOT'}/$dir",$dest,$chglog,$authors);
 
         my %build;
@@ -269 +282 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager,$chglog);
                 }
             }
@@ -364 +377 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        # Suse 10.0 forces tar.bz2 usage :-(
-        #if (($ddir eq "suse") && ($dver eq "10.0")) {
-        #   print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
-        #   my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
-        #   system "gzip -cd $src | bzip2 -c6 > $newsrc";
-        #   $src = $newsrc;
-        #}
         print $LOG "Source file: $src\n" if ($debug >= 0);
 
@@ -919 +925 @@
     print "\n";
     print "\tscript2vm: Launch one virtual machine if needed        \n";
-    print "\t           and executes a script on it                 \n";
+    print "\t           and executes a script on it                 \n";
     print "\n";
     print "\tnewvm:     Create a new virtual machine\n";

devel/pb/lib/ProjectBuilder/Base.pm

@@ -803 +803 @@
     $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
     chomp($ENV{'PBREVISION'});
-    $ENV{'PBCMSLOG'}="svn log";
     $ENV{'PBCMSLOGFILE'}="svn.log";
 } elsif ($cms->{$proj} eq "flat") {
     $ENV{'PBREVISION'}="flat";
-    $ENV{'PBCMSLOG'}="/bin/true";
     $ENV{'PBCMSLOGFILE'}="flat.log";
 } elsif ($cms->{$proj} eq "cvs") {
@@ -814 +812 @@
     #chomp($ENV{'PBREVISION'});
     $ENV{'PBREVISION'}="CVS";
-    $ENV{'PBCMSLOG'}="cvs log";
     $ENV{'PBCMSLOGFILE'}="cvs.log";
     #
@@ -868 +865 @@
 }
 
+
+sub pb_create_authors {
+
+my $authors=shift;
+my $dest=shift;
+my $cms=shift;
+
+return if ((not defined $authors) || (! -f $authors));
+open(AUT,$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>) {
+    my ($nick,$gcos) = split(/:/);
+    print DAUTH "$gcos";
+    print DAUTH " ($nick under $cms)\n" if (defined $cms);
+}
+close(DAUTH);
+close(AUTH);
+}
+
 sub pb_cms_log {
 my $cms = shift;
 my $pkgdir = shift;
-my $destfile = shift;
+my $dest = shift;
+my $authors = shift;
+
+pb_create_authors($authors,$dest,$cms->{$ENV{'PBPROJ'}});
 
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
-    pb_system("svn log -v $pkgdir > $destfile","Extracting log info from 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");
+    }
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
     # Nothing to do
@@ -880 +904 @@
     my $tmp=basename($pkgdir);
     # CVS needs a relative path !
-    pb_system("cvs log $tmp > $destfile","Extracting log info from CVS");
+    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");
+    }
 } else {
     die "cms $cms->{$ENV{'PBPROJ'}} unknown";
@@ -1055 +1082 @@
 my $extpkgdir = shift;
 my $pbpackager = shift;
+my $chglog = shift || undef;
 
 # For the moment not dynamic
@@ -1079 +1107 @@
             my $p = $defpkgdir->{$pbpkg};
             $p = $extpkgdir->{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp);
+            pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp, $chglog);
             $tmp = "";
         }

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -22 +22 @@
 my $OUTPUT = shift;
 my $doit = shift;
+my $chglog = shift || undef;
 
 my $log = "";
@@ -28 +29 @@
 $ENV{LANG}="C";
 
-return("\n") if ((not (defined $dtype)) || ($dtype eq "") || 
+if ((not (defined $dtype)) || ($dtype eq "") || 
         (not (defined $pkg)) || ($pkg eq "") || 
         (not (defined $pbver)) || ($pbver eq "") || 
@@ -35 +36 @@
         (not (defined $path)) || ($path eq "") || 
         (not (defined $OUTPUT)) || ($OUTPUT eq "") ||
-        (not (defined $doit)) || ($doit eq ""));
+        (not (defined $doit)) || ($doit eq "")) {
+    print $OUTPUT "\n";
+    return;
+}
 
-my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog";
-if ((! -f $chglog) && ($doit eq "yes")) {
+if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
     #print "No ChangeLog file ($chglog) for $pkg\n";
-    return("\n");
+    print $OUTPUT "\n";
+    return;
 }
 
@@ -50 +54 @@
 my ($packager) = pb_conf_get("packager");
 
-# If we don't need to do it, fake something
-if ($doit ne "yes") {
+# If we don't need to do it, or don't have it fake something
+if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
     my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
     $date = strftime("%Y-%m-%d", @date);