diff options
Diffstat (limited to 'calendar/lightning/Makefile.in')
-rw-r--r-- | calendar/lightning/Makefile.in | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/calendar/lightning/Makefile.in b/calendar/lightning/Makefile.in index fb6d888ff..510c474b3 100644 --- a/calendar/lightning/Makefile.in +++ b/calendar/lightning/Makefile.in @@ -14,38 +14,8 @@ ifneq (,$(findstring a,$(LIGHTNING_VERSION))) DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1 endif -# Enable nightly updates on aurora and nightly channel -ifeq (nightly,$(subst aurora,nightly,$(MOZ_UPDATE_CHANNEL))) -DEFINES += -DLIGHTNING_UPDATE_LOCATION=https://calendar.mozilla.org/update.php -endif - -# Gecko milestone -GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone) -ifdef GRE_MILESTONE -DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -endif - -# comm-central source repo and stamp -SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null)) -ifdef SOURCE_STAMP -DEFINES += -DSOURCE_STAMP='$(SOURCE_STAMP)' -endif - -SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/') -ifdef SOURCE_REPO -DEFINES += -DSOURCE_REPO='$(SOURCE_REPO)' -endif - -# Mozilla source repo and stamps -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template='{node}\n' 2>/dev/null)) -ifdef MOZ_SOURCE_STAMP -DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)' -endif - -MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/') -ifdef MOZ_SOURCE_REPO -DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)' -endif +# Gecko milestone +DEFINES += -DGRE_MILESTONE=$(shell tail -1 $(topsrcdir)/config/milestone.txt) # Install as a global extension in # dist/bin/extensions/ @@ -60,8 +30,7 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \ -DXPI_EM_ID=$(XPI_EM_ID) \ $(NULL) -MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) -DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID) +DEFINES += -DMOZ_BUILDID=20100101 include $(topsrcdir)/config/rules.mk include $(srcdir)/versions.mk |