Changeset 254 in ProjectBuilder
- Timestamp:
- Oct 25, 2007, 2:22:19 AM (17 years ago)
- Location:
- devel/pb/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Base.pm
r242 r254 595 595 # special case for ChangeLog only for pb 596 596 } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) { 597 $tmp = "";598 597 my $p = $defpkgdir->{$pbpkg}; 599 598 $p = $extpkgdir->{$pbpkg} if (not defined $p); 600 pb_changelog($dtype, $pbpkg, $pbtag, $pbsuf, $p, \*DEST); 599 pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp); 600 $tmp = ""; 601 601 } 602 602 $line =~ s|$s|$tmp|; -
devel/pb/lib/ProjectBuilder/Changelog.pm
r227 r254 16 16 my $dtype = shift; 17 17 my $pkg = shift; 18 my $pbver = shift; 18 19 my $pbtag = shift; 19 20 my $dsuf = shift; 20 21 my $path = shift; 21 22 my $OUTPUT = shift; 23 my $doit = shift; 22 24 23 25 my $log = ""; … … 28 30 return("\n") if ((not (defined $dtype)) || ($dtype eq "") || 29 31 (not (defined $pkg)) || ($pkg eq "") || 32 (not (defined $pbver)) || ($pbver eq "") || 30 33 (not (defined $pbtag)) || ($pbtag eq "") || 31 34 (not (defined $dsuf)) || ($dsuf eq "") || 32 35 (not (defined $path)) || ($path eq "") || 33 36 (not (defined $OUTPUT)) || ($OUTPUT eq "")); 37 (not (defined $doit)) || ($doit eq "")); 34 38 35 39 my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog"; 36 if ( ! -f $chglog) {40 if ((! -f $chglog) && ($doit eq "yes")) { 37 41 #print "No ChangeLog file ($chglog) for $pkg\n"; 38 42 return("\n"); 43 } 44 45 # If we don't need to do it, fake something 46 if ($doit ne "yes") { 47 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst()); 48 my $date = strftime("%Y-%m-%d", @date); 49 my $ndate = UnixDate($date,"%a", "%b", "%d", "%Y"); 50 my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z"); 51 if (($dtype eq "rpm") || ($dtype eq "fc")) { 52 my $ver2 = "$pbver-$pbtag$dsuf"; 53 print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n"; 54 print $OUTPUT "- Updated to $pbver\n"; 55 } 56 if ($dtype eq "deb") { 57 print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n"; 58 print $OUTPUT "\n"; 59 print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}} $n2date\n\n\n"; 60 } 61 return; 39 62 } 40 63
Note:
See TracChangeset
for help on using the changeset viewer.