mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-22 15:17:29 +09:00
[Pale Moon] Fix buildid on Mac
This commit is contained in:
parent
3991e27340
commit
b4e59a234c
2 changed files with 2 additions and 2 deletions
|
|
@ -76,7 +76,7 @@ AB := $(firstword $(subst -, ,$(AB_CD)))
|
||||||
clean clobber repackage::
|
clean clobber repackage::
|
||||||
$(RM) -r $(dist_dest)
|
$(RM) -r $(dist_dest)
|
||||||
|
|
||||||
MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/config/buildid)
|
MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h)
|
||||||
|
|
||||||
.PHONY: repackage
|
.PHONY: repackage
|
||||||
tools repackage:: $(PROGRAM)
|
tools repackage:: $(PROGRAM)
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ if not options.version:
|
||||||
# builds), but also so that newly-built older versions (e.g. beta build) aren't
|
# builds), but also so that newly-built older versions (e.g. beta build) aren't
|
||||||
# considered "newer" than previously-built newer versions (e.g. a trunk nightly)
|
# considered "newer" than previously-built newer versions (e.g. a trunk nightly)
|
||||||
|
|
||||||
buildid = open(options.buildid, 'r').read()
|
define, MOZ_BUILDID, buildid = open(options.buildid, 'r').read().split()
|
||||||
|
|
||||||
# extract only the major version (i.e. "14" from "14.0b1")
|
# extract only the major version (i.e. "14" from "14.0b1")
|
||||||
majorVersion = re.match(r'^(\d+)[^\d].*', options.version).group(1)
|
majorVersion = re.match(r'^(\d+)[^\d].*', options.version).group(1)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue