Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding method to distinguish between nightly & milestone builds via GRE_BUILD_ID.

Browse Source 
Bug #195840 r=dougt


git-svn-id: svn://10.0.0.236/trunk@139237 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com 2003-03-11 00:31:29 +00:00
parent c0d2295c8f
commit a03f105604
4 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/config/Makefile.in
View File

@ -141,7 +141,7 @@ build_number: FORCE
nsBuildID.h: nsBuildID.h.in build_number
$(RM) $@
$(PERL) -I$(srcdir) $(srcdir)/aboutime.pl $@ build_number $(srcdir)/nsBuildID.h.in
$(PERL) -I$(srcdir) $(srcdir)/aboutime.pl -m $(srcdir)/milestone.txt $@ build_number $(srcdir)/nsBuildID.h.in
ifndef CROSS_COMPILE
ifdef USE_ELF_DYNSTR_GC

16
mozilla/config/aboutime.pl
View File

@ -1,12 +1,24 @@
use strict;
use mozBDate;
use Getopt::Std;
require mozBDate;
require "Moz/Milestone.pm";
my $mfile;
getopts('m:');
if (defined($::opt_m)) {
$mfile = $::opt_m;
}
my $outfile = $ARGV[0];
my $build_num_file = $ARGV[1];
my $infile = "";
$infile = $ARGV[2] if ("$ARGV[2]" ne "");
if (defined($mfile)) {
my $milestone = &Moz::Milestone::getOfficialMilestone($mfile);
&mozBDate::SetMilestone($milestone);
}
&mozBDate::SubstituteBuildNumber($outfile, $build_num_file, $infile);

22
mozilla/config/mozBDate.pm
View File

@ -26,15 +26,17 @@ use IO::File;
BEGIN {
use Exporter ();
use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $milestone);
$VERSION = 1.00;
@ISA = qw(Exporter);
@EXPORT = qw(&UpdateBuildNumber &SubstituteBuildNumber);
@EXPORT = qw(&UpdateBuildNumber &SubstituteBuildNumber &SetMilestone);
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
}
local $mozBDate::milestone = "0.0";
sub write_number($) {
my ($file, $num) = @_;
unlink($file);
@ -95,7 +97,7 @@ sub SubstituteBuildNumber($$$) {
my ($outfile, $build_num, $infile) = @_;
my $INFILE = new IO::File;
my $OUTFILE = new IO::File;
open $INFILE, "<$build_num";
my $build = <$INFILE>;
close $INFILE;
@ -122,6 +124,15 @@ sub SubstituteBuildNumber($$$) {
$id =~ s/NS_BUILD_ID\s\d+/$temp/;
print $OUTFILE $id;
}
elsif ($id =~ "GRE_BUILD_ID") {
if (defined($ENV{'MOZ_MILESTONE_RELEASE'})) {
$temp = "GRE_BUILD_ID " . $milestone;
} else {
$temp = "GRE_BUILD_ID " . "${milestone}_${build}";
}
$id =~ s/GRE_BUILD_ID\s\d+/$temp/;
print $OUTFILE $id;
}
else {
print $OUTFILE $_;
}
@ -134,6 +145,11 @@ sub SubstituteBuildNumber($$$) {
rename "${outfile}.old", "$outfile";
}
sub SetMilestone($) {
my ($mstone) = (@_);
$milestone = $mstone if ($mstone ne "");
}
END {};
1;

10
mozilla/config/nsBuildID.h.in
View File

@ -9,5 +9,15 @@
*/
#define NS_BUILD_ID 0000000000
/* GRE_BUILD_ID - GRE build version identifier
*
* If creating a release build (eg, MOZILLA_OFFICIAL is set), then
* GRE_BUILD_ID will be updated to contain <milestone>_<build id>.
* If building a milestone build (eg, MOZ_MILESTONE_RELEASE is set), then
* GRE_BUILD_ID will just contain <milestone>.
*
*/
#define GRE_BUILD_ID 00000000000
#endif /* _NSBUILDID_H_ */