Bug 1490867 - Build fixes for moz.configure. r=philipp
authorRob Lemley <rob@thunderbird.net>
Wed, 10 Oct 2018 18:45:14 +0000
changeset 33407 2506123465df5501cec105ead8607b241d1f4cbd
parent 33406 0a30492067741f0f6f458f165b570b0be4b72001
child 33408 fe6493684a2e0e019ef4d69800b7931db3d9845e
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersphilipp
bugs1490867
Bug 1490867 - Build fixes for moz.configure. r=philipp While completing the migration to moz.configure, a couple of build errors came up that may be related. This patch fixes the errors in question. Depends on D7629 Differential Revision: https://phabricator.services.mozilla.com/D8367
calendar/providers/gdata/Makefile.in
mail/branding/thunderbird/moz.build
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -2,25 +2,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPI_NAME = gdata-provider
 XPI_PKGNAME = gdata-provider.$(AB_CD)
 XPI_EM_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
 
+THUNDERBIRD_VERSION := $(shell cat $(commtopsrcdir)/mail/config/version.txt)
+SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
+
 ifdef MOZ_SUITE
 LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
 else
 LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 endif
 
 GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
-THUNDERBIRD_VERSION := $(shell cat $(commtopsrcdir)/mail/config/version.txt)
-SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
+
 
 DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DGDATA_VERSION=$(GDATA_VERSION) \
            $(NULL)
 
 include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
 
--- a/mail/branding/thunderbird/moz.build
+++ b/mail/branding/thunderbird/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['locales']
 
 JAR_MANIFESTS += ['jar.mn']
 
-include('../../../mail/branding/branding-common.mozbuild')
+include('../branding-common.mozbuild')
 ThunderbirdBranding()