summaryrefslogtreecommitdiffstats
path: root/application/palemoon
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-29 13:09:36 +0200
committerGitHub <noreply@github.com>2018-04-29 13:09:36 +0200
commitfc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb (patch)
treef9498cb605d0e850294f7968edd736ac1165edab /application/palemoon
parenteb6c09c5ebef9e59ffbe575e9605c7bbcea6454f (diff)
parent8ffaf513ee64e14179d7fa0b7e893eb144286b82 (diff)
downloadUXP-fc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb.tar
UXP-fc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb.tar.gz
UXP-fc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb.tar.lz
UXP-fc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb.tar.xz
UXP-fc8634a7fcee1c324fc1fdc3b9e3ab9d5fbf92bb.zip
Merge pull request #291 from adeshkp/buildid-mac
[Pale Moon] Fix buildid on Mac
Diffstat (limited to 'application/palemoon')
-rw-r--r--application/palemoon/app/Makefile.in2
-rw-r--r--application/palemoon/app/macversion.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/palemoon/app/Makefile.in b/application/palemoon/app/Makefile.in
index 6f9bbfaf0..c0f01212c 100644
--- a/application/palemoon/app/Makefile.in
+++ b/application/palemoon/app/Makefile.in
@@ -76,7 +76,7 @@ AB := $(firstword $(subst -, ,$(AB_CD)))
clean clobber repackage::
$(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
tools repackage:: $(PROGRAM)
diff --git a/application/palemoon/app/macversion.py b/application/palemoon/app/macversion.py
index 8c360368e..839aac1ff 100644
--- a/application/palemoon/app/macversion.py
+++ b/application/palemoon/app/macversion.py
@@ -28,7 +28,7 @@ if not options.version:
# 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)
-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")
majorVersion = re.match(r'^(\d+)[^\d].*', options.version).group(1)