Closed Bug 1047289 Opened 6 years ago Closed 2 years ago

Port remaining parts of bug 525438 if any (l10n-merge doesn't merge all files required to build)

Categories

(SeaMonkey :: Build Config, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED WONTFIX

People

(Reporter: philip.chee, Assigned: ewong)

References

()

Details

Attachments

(1 file, 1 obsolete file)

Thunderbird changeset: http://hg.mozilla.org/comm-central/rev/1c846ed38e1b

> Port remaining parts of bug 525438 - l10n-merge doesn't merge all files, 
> make targets work with PRETTY_NAMES, too. Adding a l10n-checks target for 
> a dummy repack - r=port-by-build-system-peer CLOSED TREE
Status: NEW → ASSIGNED
Attached patch port patch (v1) (obsolete) — Splinter Review
Attachment #8500183 - Flags: review?(bugspam.Callek)
Comment on attachment 8500183 [details] [diff] [review]
port patch (v1)

> uninstaller::
> 	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
> 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_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) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> 	  --preprocess-locale $(MOZILLA_SRCDIR) \
>-	  $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
>+	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONF_DIR)
Why the change from $(CONFIG_DIR) to $(CONF_DIR)?
> 
> $(CONFIG_DIR)/setup.exe::
> 	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
> 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
> 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
> 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> 	  --convert-utf8-utf16le $(topsrcdir)/suite/installer/license.txt $(CONFIG_DIR)/license.txt
> 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
> 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
> 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> 	  --preprocess-locale $(MOZILLA_SRCDIR) \
>-	  $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
>+	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONF_DIR)
Why the change from $(CONFIG_DIR) to $(CONF_DIR)?
Flags: needinfo?(ewong)
(In reply to Ian Neal from comment #2)
> Comment on attachment 8500183 [details] [diff] [review]
> port patch (v1)
> 
> > uninstaller::
> > 	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
> > 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_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) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> > 	  --preprocess-locale $(MOZILLA_SRCDIR) \
> >-	  $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
> >+	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONF_DIR)
> Why the change from $(CONFIG_DIR) to $(CONF_DIR)?
> > 
> > $(CONFIG_DIR)/setup.exe::
> > 	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
> > 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
> > 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
> > 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> > 	  --convert-utf8-utf16le $(topsrcdir)/suite/installer/license.txt $(CONFIG_DIR)/license.txt
> > 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
> > 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
> > 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
> > 	  --preprocess-locale $(MOZILLA_SRCDIR) \
> >-	  $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows $(AB_CD) $(CONFIG_DIR)
> >+	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONF_DIR)
> Why the change from $(CONFIG_DIR) to $(CONF_DIR)?

Simple: PEBKAC
Flags: needinfo?(ewong)
Attached patch port patch (v2)Splinter Review
Attachment #8500183 - Attachment is obsolete: true
Attachment #8500183 - Flags: review?(bugspam.Callek)
Attachment #8500795 - Flags: review?(bugspam.Callek)
Comment on attachment 8500795 [details] [diff] [review]
port patch (v2)

Review of attachment 8500795 [details] [diff] [review]:
-----------------------------------------------------------------

at a glance looks good, but I want to get a chance to look closer once we're out of the woods on a few other issues first, l10n is so finicky.
Attachment #8500795 - Flags: feedback+
patch has been bitrotted the l10n repack/merge process is just fubard w/
the add-ons.
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → WONTFIX
Attachment #8500795 - Flags: review?(bugspam.Callek)
You need to log in before you can comment on or make changes to this bug.