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

Fix mac builddate-unifying logic from bug 383167

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@228695 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us 2007-06-25 17:58:21 +00:00
parent 4fce3b6263
commit ab43510f4e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/client.mk
View File

@ -457,6 +457,7 @@ ifndef MAKE
MAKE := gmake
endif
PERL ?= perl
PYTHON ?= python
CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
ifdef CONFIG_GUESS_SCRIPT
@ -940,7 +941,7 @@ else
ifdef MOZ_UNIFY_BDATE
ifndef MOZ_BUILD_DATE
ifdef MOZ_BUILD_PROJECTS
MOZ_BUILD_DATE = $(shell $(PERL) -I$(TOPSRCDIR)/config $(TOPSRCDIR)/config/bdate.pl)
MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOPSRCDIR)/toolkit/xre/make-platformini.py --print-buildid)
export MOZ_BUILD_DATE
endif
endif

14
mozilla/toolkit/xre/make-platformini.py
View File

@ -3,9 +3,19 @@
from optparse import OptionParser
from datetime import datetime
import sys
import os
(milestoneFile,) = sys.argv[1:]
o = OptionParser()
o.add_option("--print-buildid", action="store_true", dest="print_buildid")
(options, args) = o.parse_args()
buildid = os.environ.get('MOZ_BUILD_DATE', datetime.now().strftime('%Y%m%d%H'))
if options.print_buildid:
print buildid
sys.exit(0)
(milestoneFile,) = args
for line in open(milestoneFile, 'r'):
if line[0] == '#':
continue
@ -18,4 +28,4 @@ for line in open(milestoneFile, 'r'):
print """[Build]
BuildID=%s
Milestone=%s""" % (datetime.now().strftime('%Y%m%d%H'), milestone)
Milestone=%s""" % (buildid, milestone)