Fix bug 1160805 - Missing Windows and Linux nightly builds, build step set props: previous_buildid fails. r/a=philipp
authorStefan Sitter <ssitter@gmail.com>
Sat, 09 May 2015 14:18:29 +0200
changeset 26013 5f331d8e5a9f5e1a532344dff873ddbfc80a6091
parent 26012 28d5709c389ded4f4207d07d736c892b3c331dfa
child 26014 89722d50d1f15d676073dbea43fc8a31af87a1c8
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1160805
Fix bug 1160805 - Missing Windows and Linux nightly builds, build step set props: previous_buildid fails. r/a=philipp
calendar/lightning/Makefile.in
calendar/lightning/app.ini
calendar/lightning/application.ini
calendar/lightning/lightning-packager.mk
calendar/lightning/moz.build
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -6,17 +6,17 @@
 # Lightning.
 
 USE_EXTENSION_MANIFEST = 1
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 XPI_VERSION = $(LIGHTNING_VERSION)
 
 XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
 
-DIST_FILES = install.rdf application.ini
+DIST_FILES = install.rdf app.ini
 
 # Lighting version number
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 LIGHTNING_VERSION := $(shell $(PYTHON) $(srcdir)/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 GDATA_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
 
 # For extensions we require a max version that is compatible across security releases.
@@ -107,15 +107,15 @@ repack-process-extrafiles: lightning-ext
 lightning-extrafiles: LTN_ABCD_L10NJS=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)/lightning-l10n.js
 lightning-extrafiles: LTN_ANY_L10NJS=$(if $(wildcard $(LTN_ABCD_L10NJS)),$(LTN_ABCD_L10NJS),$(topsrcdir)/calendar/locales/en-US/lightning-l10n.js)
 lightning-extrafiles:
 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LTN_ANY_L10NJS) -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
 
 ident:
 	@printf 'comm_revision '
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/application.ini App SourceStamp
+	    $(FINAL_TARGET)/app.ini App SourceStamp
 	@printf 'moz_revision '
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/application.ini Build SourceStamp
+	    $(FINAL_TARGET)/app.ini Build SourceStamp
 	@printf 'buildid '
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/application.ini App BuildID
+	    $(FINAL_TARGET)/app.ini App BuildID
rename from calendar/lightning/application.ini
rename to calendar/lightning/app.ini
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -62,17 +62,17 @@ L10N_TARGET = $(XPI_STAGE_PATH)/$(XPI_NA
 # special case, so assume linux for everything else.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 SHORTOS = osx
 else
 SHORTOS = linux
 endif
 
 # function print_ltnconfig(section,configname)
-print_ltnconfig = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(XPI_STAGE_PATH)/$(XPI_NAME)/application.ini $1 $2)
+print_ltnconfig = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(XPI_STAGE_PATH)/$(XPI_NAME)/app.ini $1 $2)
 
 wget-en-US: FINAL_BINARY_URL = $(subst thunderbird,calendar/lightning,$(EN_US_BINARY_URL))
 wget-en-US: $(XPI_STAGE_PATH)
 	(cd $(XPI_STAGE_PATH) && $(WGET) -nv -N $(FINAL_BINARY_URL)/$(ENUS_PKGNAME).xpi)
 	@echo "Downloaded $(FINAL_BINARY_URL)/$(ENUS_PKGNAME) to $(XPI_ZIP_IN)"
 
 ensure-stage-dir: $(if $(wildcard $(XPI_STAGE_PATH)/$(XPI_NAME)/),,wget-en-US unpack)
 
@@ -150,17 +150,17 @@ libs-%:
 	$(MAKE) -C locales tools AB_CD=$* FINAL_TARGET=$(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
 	  XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_PKGNAME) USE_EXTENSION_MANIFEST=1
 
 # The calling makefile might need to process some extra files. Provide an empty
 # rule to overwrite
 repack-process-extrafiles:
 
 # When repackaging Lightning from the builder, platform.ini is not yet created.
-# Recreate it from the application.ini bundled with the downloaded xpi.
+# Recreate it from the app.ini bundled with the downloaded xpi.
 $(LIBXUL_DIST)/bin/platform.ini:
 	mkdir -p $(@D)
 	echo "[Build]" >> $(LIBXUL_DIST)/bin/platform.ini
 	echo "Milestone=$(call print_ltnconfig,Gecko,MaxVersion)" >> $(LIBXUL_DIST)/bin/platform.ini
 	echo "SourceStamp=$(call print_ltnconfig,Build,SourceStamp)" >> $(LIBXUL_DIST)/bin/platform.ini
 	echo "SourceRepository=$(call print_ltnconfig,Build,SourceRepository)" >> $(LIBXUL_DIST)/bin/platform.ini
 	echo "BuildID=$(call print_ltnconfig,App,BuildID)" >> $(LIBXUL_DIST)/bin/platform.ini
 
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -35,10 +35,10 @@ with Files('**'):
     BUG_COMPONENT = ('Calendar', 'Lightning Only')
 
 with Files('content/suite-*'):
     BUG_COMPONENT = ('Calendar', 'Lightning: SeaMonkey Integration')
 
 with Files('build/**'):
     BUG_COMPONENT = ('Calendar', 'Build Config')
 
-with Files('application.ini'):
+with Files('app.ini'):
     BUG_COMPONENT = ('Calendar', 'Build Config')