593159 - Remove version.nsh dependency from installer code

Status: RESOLVED FIXED

(SeaMonkey :: Installer, defect)

Description

[Frank Wein [:mcsmurf]]

See Bug 593148, version.nsh code should be moved into defines.nsi.in

Comment 1

[Frank Wein [:mcsmurf]]

Attachment: Patch

Comment 2

[Justin Wood (:Callek)]

Comment on attachment 471640 [details] [diff] [review]
Patch

>+#ifdef MOZ_OFFICIAL_BRANDING
>+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
>+#endif

Looks good, but since we use "SeaMonkey" both in official and unofficial branding (unless someone marks a different branding dir) I want this to stay in our default builds, so please drop the ifdef.  If it becomes a problem in practice we can revisit this along with a cleaner implementation of branding on our end, imo.

Comment 3

[Justin Wood (:Callek)]

Also for posterity, in current uses of version.nsh this is not ifdef'd, so we are not regressing anything.

Comment 4

[Justin Wood (:Callek)]

WOA, did this never land?????

I didn't check if it still applies, but we should probably check and land!

Comment 5

[Serge Gautherie (:sgautherie)]

(In reply to Justin Wood (:Callek) from comment #4)
> I didn't check if it still applies, but we should probably check and land!

It looks like comment 2 should be addressed first...

Comment 6

[Philip Chee]

> It looks like comment 2 should be addressed first...
It can surely be fixed on check-in.

Comment 7

[Frank Wein [:mcsmurf]]

Attachment: Patch for check-in

Comment 8

[Ryan VanderMeulen [:RyanVM]]

http://hg.mozilla.org/comm-central/rev/e77c99d747c9

To make life easier for those checking in patches for you, please follow the instructions below in your future patches. Thanks!
https://developer.mozilla.org/en/Mercurial_FAQ#How_can_I_generate_a_patch_for_somebody_else_to_check-in_for_me.3F

Comment 9

[Frank Wein [:mcsmurf]]

Sorry, Ratty added the chechin-needed keyword, not myself ;-). I actually wanted to check it in myself.But of course it's ok that you did the check-in.

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Sorry :)