Robert Kaiser Assignee
	Description • 16 years ago

bug 458014 did some restructuring of the Firefox locales/Makefile.in, we should do the same for the comm-central locale Makefiles.

	Robert Kaiser Assignee
	Comment 1 • 16 years ago

note to self: we should include attachment 348192 [details] [diff] [review] work here.

	Robert Kaiser Assignee
	Comment 2 • 16 years ago

This patch updates the locales Makefiles in comm-central to the structure in browser/Makefile.in - Mark, if you want Axel and/or someone else as additional reviewers, I'd be happy to add those.

	Robert Kaiser Assignee
	Comment 3 • 16 years ago

In bug 456351 work, I saw we probably also want to wrap the file path/names in the mv commands for packages and installers in prepare-repackages-% with quotes to allow spaces in the "pretty" filenames. If you think you want to review a patch with those, I'd like to wait for review on the patch there first.

	Mark Banner (:standard8)
	Comment 4 • 16 years ago

Comment on attachment 349093 [details] [diff] [review]
patch v1: update all our locales Makefiles

>+ifdef MOZ_PKG_PRETTYNAMES
>+ifneq (,$(filter WINNT Linux,$(OS_ARCH)))
>+# Linux and Windows unpack to a directory named after the MOZ_APP_NAME
>+# they were built with. This is fine when when MOZ_PKG_PRETTYNAMES
>+# isn't defined, because MOZ_PKG_APPNAME will be the same as MOZ_APP_NAME.
>+# However, when MOZ_PKG_PRETTYNAMES is passed MOZ_PKG_APPNAME inherits
>+# from MOZ_PKG_DISPLAYNAME, which is not always the same as MOZ_APP_NAME.
>+	cd $(DIST)/l10n-stage && \
>+      mv $(MOZ_APP_NAME) $(MOZ_PKG_APPNAME)

nit: the cd line is prefixed with a tab, the mv line with spaces (plus other places where this occurs).

I've tested the Thunderbird code on mac and it seems to work fine. I've looked at the interdiffs to the others as well as looking at the patch and they seem fine.

	Robert Kaiser Assignee
	Comment 5 • 16 years ago

In most cases where we have spaces there, it's one tab + spaces for indentation. As the tab is needed on the line actually starting the command or it's invalid Makefile code, I think that's the best we can do, and I changed that line in all three files to that. I also incorporated the minor fix noted in comment #3 and pushed as http://hg.mozilla.org/comm-central/rev/dd85da276da7