Changeset 285 in ProjectBuilder for devel/pb/bin

Timestamp:

Nov 15, 2007, 12:04:08 AM (17 years ago)

Author:

Bruno Cornec

Message:

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

File:

• devel/pb/bin/pb (modified) (4 diffs)

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";