Backed out changeset 082978a77728 (bug 1385227) for breaking L10n nightlies on Windows. r=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 22 Aug 2017 15:09:42 +0200
changeset 376104 1867d7931c0a70ab90edf4aa84876525773a7139
parent 376103 bdf687e404dc68503e668328dbcaf76667d794fe
child 376105 61ad0d26040d1aa348b9519e36a35a689d12f33d
child 376175 50011d4e73fa704b42590bf9bcd6892a2fd35af0
child 376208 347cc95a1e8bd6c2b1721e9eb38a5bafdbbe96b4
push id94027
push userarchaeopteryx@coole-files.de
push dateTue, 22 Aug 2017 13:14:49 +0000
treeherdermozilla-inbound@61ad0d26040d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1385227
milestone57.0a1
backs out082978a7772879754e5b8de39efe9062cd7e2cf5
first release with
nightly linux32
1867d7931c0a / 57.0a1 / 20170822142709 / files
nightly linux64
1867d7931c0a / 57.0a1 / 20170822142709 / files
nightly mac
1867d7931c0a / 57.0a1 / 20170822142709 / files
nightly win32
1867d7931c0a / 57.0a1 / 20170822142709 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Backed out changeset 082978a77728 (bug 1385227) for breaking L10n nightlies on Windows. r=backout a=backout MozReview-Commit-ID: 2q0X3BWpJWP
browser/installer/windows/Makefile.in
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -49,17 +49,17 @@ installer::
 	$(MAKE) $(CONFIG_DIR)/setup.exe
 
 # For building the uninstaller during the application build so it can be
 # included for mar file generation.
 uninstaller::
 	$(RM) -r $(CONFIG_DIR)
 	$(MKDIR) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
+	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(topsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 
 # For building the maintenanceservice installer
 ifdef MOZ_MAINTENANCE_SERVICE
@@ -71,17 +71,17 @@ maintenanceservice_installer::
 	  --preprocess-locale $(topsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 endif
 
 $(CONFIG_DIR)/setup.exe::
 	$(RM) -r $(CONFIG_DIR)
 	$(MKDIR) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
+	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(topsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-single-file $(topsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(CONFIG_DIR) \