Changeset 285 in ProjectBuilder
- Timestamp:
- Nov 15, 2007, 12:04:08 AM (17 years ago)
- Location:
- devel
- Files:
-
- 1 added
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r283 r285 204 204 pb_cms_export($cms,$pbdatecvs,"$ENV{'PBROOT'}/$dir",$dest); 205 205 206 # Get project info on authors and log file 207 my $chglog = "$ENV{'PBCONF'}/$pbpkg/pbcl"; 208 $chglog = "$ENV{'PBCONF'}/pbcl" if (! -f $chglog); 209 $chglog = undef if (! -f $chglog); 210 211 my $authors = "$ENV{'PBCONF'}/$pbpkg/pbauthors"; 212 $authors = "$ENV{'PBCONF'}/pbauthors" if (! -f $authors); 213 $authors = "/dev/null" if (! -f $authors); 214 206 215 # Extract cms log history and store it 207 pb_cms_log($cms,"$ENV{'PBROOT'}/$dir","$dest/$ENV{'PBCMSLOGFILE'}"); 216 if ((defined $chglog) && (! -f "$dest/NEWS")) { 217 print $LOG "Generating NEWS file from $chglog\n"; 218 copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS"; 219 } 220 pb_cms_log($cms,"$ENV{'PBROOT'}/$dir",$dest,$chglog,$authors); 208 221 209 222 my %build; … … 269 282 if (defined $ptr) { 270 283 foreach my $f (values %bfiles) { 271 pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager );284 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); 272 285 } 273 286 } … … 364 377 365 378 my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz"; 366 # Suse 10.0 forces tar.bz2 usage :-(367 #if (($ddir eq "suse") && ($dver eq "10.0")) {368 # print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";369 # my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";370 # system "gzip -cd $src | bzip2 -c6 > $newsrc";371 # $src = $newsrc;372 #}373 379 print $LOG "Source file: $src\n" if ($debug >= 0); 374 380 … … 919 925 print "\n"; 920 926 print "\tscript2vm: Launch one virtual machine if needed \n"; 921 print "\t 927 print "\t and executes a script on it \n"; 922 928 print "\n"; 923 929 print "\tnewvm: Create a new virtual machine\n"; -
devel/pb/lib/ProjectBuilder/Base.pm
r273 r285 803 803 $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`; 804 804 chomp($ENV{'PBREVISION'}); 805 $ENV{'PBCMSLOG'}="svn log";806 805 $ENV{'PBCMSLOGFILE'}="svn.log"; 807 806 } elsif ($cms->{$proj} eq "flat") { 808 807 $ENV{'PBREVISION'}="flat"; 809 $ENV{'PBCMSLOG'}="/bin/true";810 808 $ENV{'PBCMSLOGFILE'}="flat.log"; 811 809 } elsif ($cms->{$proj} eq "cvs") { … … 814 812 #chomp($ENV{'PBREVISION'}); 815 813 $ENV{'PBREVISION'}="CVS"; 816 $ENV{'PBCMSLOG'}="cvs log";817 814 $ENV{'PBCMSLOGFILE'}="cvs.log"; 818 815 # … … 868 865 } 869 866 867 868 sub pb_create_authors { 869 870 my $authors=shift; 871 my $dest=shift; 872 my $cms=shift; 873 874 return if ((not defined $authors) || (! -f $authors)); 875 open(AUT,$authors) || die "Unable to open $authors"; 876 open(DAUTH,"> $dest/AUTHORS") || die "Unable to create $dest/AUTHORS"; 877 print DAUTH "Authors of the project are:\n"; 878 print DAUTH "===========================\n"; 879 while (<AUT>) { 880 my ($nick,$gcos) = split(/:/); 881 print DAUTH "$gcos"; 882 print DAUTH " ($nick under $cms)\n" if (defined $cms); 883 } 884 close(DAUTH); 885 close(AUTH); 886 } 887 870 888 sub pb_cms_log { 871 889 my $cms = shift; 872 890 my $pkgdir = shift; 873 my $destfile = shift; 891 my $dest = shift; 892 my $authors = shift; 893 894 pb_create_authors($authors,$dest,$cms->{$ENV{'PBPROJ'}}); 874 895 875 896 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 876 pb_system("svn log -v $pkgdir > $destfile","Extracting log info from 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"); 900 } 877 901 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 878 902 # Nothing to do … … 880 904 my $tmp=basename($pkgdir); 881 905 # CVS needs a relative path ! 882 pb_system("cvs log $tmp > $destfile","Extracting log info from CVS"); 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"); 909 } 883 910 } else { 884 911 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; … … 1055 1082 my $extpkgdir = shift; 1056 1083 my $pbpackager = shift; 1084 my $chglog = shift || undef; 1057 1085 1058 1086 # For the moment not dynamic … … 1079 1107 my $p = $defpkgdir->{$pbpkg}; 1080 1108 $p = $extpkgdir->{$pbpkg} if (not defined $p); 1081 pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp );1109 pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp, $chglog); 1082 1110 $tmp = ""; 1083 1111 } -
devel/pb/lib/ProjectBuilder/Changelog.pm
r273 r285 22 22 my $OUTPUT = shift; 23 23 my $doit = shift; 24 my $chglog = shift || undef; 24 25 25 26 my $log = ""; … … 28 29 $ENV{LANG}="C"; 29 30 30 return("\n")if ((not (defined $dtype)) || ($dtype eq "") ||31 if ((not (defined $dtype)) || ($dtype eq "") || 31 32 (not (defined $pkg)) || ($pkg eq "") || 32 33 (not (defined $pbver)) || ($pbver eq "") || … … 35 36 (not (defined $path)) || ($path eq "") || 36 37 (not (defined $OUTPUT)) || ($OUTPUT eq "") || 37 (not (defined $doit)) || ($doit eq "")); 38 (not (defined $doit)) || ($doit eq "")) { 39 print $OUTPUT "\n"; 40 return; 41 } 38 42 39 my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog"; 40 if ((! -f $chglog) && ($doit eq "yes")) { 43 if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) { 41 44 #print "No ChangeLog file ($chglog) for $pkg\n"; 42 return("\n"); 45 print $OUTPUT "\n"; 46 return; 43 47 } 44 48 … … 50 54 my ($packager) = pb_conf_get("packager"); 51 55 52 # If we don't need to do it, fake something53 if ( $doit ne "yes") {56 # If we don't need to do it, or don't have it fake something 57 if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) { 54 58 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst()); 55 59 $date = strftime("%Y-%m-%d", @date);
Note:
See TracChangeset
for help on using the changeset viewer.