955395 - Directory change in Makefile to locate app-license.html causes file path problems.

Status: RESOLVED FIXED

(Instantbird Graveyard :: Other, defect)

Description

[Will Nayes [:wnayes]]

*** Original post on bio 1957 at 2013-05-15 17:27:00 UTC ***

Compiling Instantbird with pymake with Mozilla 20/21 causes a 'FILE_NOT_FOUND' error when the /instantbird/app/app-license.html file is processed. This is due to how the /instantbird/content/Makefile.in changes directories, as a call to 'pwd' returns a filepath different than what is expected (tested on Windows).

Comment 1

[Will Nayes [:wnayes]]

Attachment: Moving the app-license.html to content.

*** Original post on bio 1957 as attmnt 2429 at 2013-05-15 17:51:00 UTC ***

This moves the app-license.html to content and adjusts the Makefile.in to work with directories similar to how comm-central does, as discussed on IRC.

Comment 2

[Will Nayes [:wnayes]]

Attachment: Moving the app-license.html to content/overrides

*** Original post on bio 1957 as attmnt 2430 at 2013-05-15 21:07:00 UTC ***

This patch moves the app-license.html to content/overrides, which matches more closely the Thunderbird directories (in particular, mail/base/content/overrides).

Comment 3

[Will Nayes [:wnayes]]

Comment on attachment 8354196 [details] [diff] [review]
Moving the app-license.html to content.

*** Original change on bio 1957 attmnt 2429 at 2013-05-15 21:07:41 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 4

[Florian Quèze [:florian]]

Comment on attachment 8354197 [details] [diff] [review]
Moving the app-license.html to content/overrides

*** Original change on bio 1957 attmnt 2430 at 2013-05-15 21:25:23 UTC ***

Looks good by code inspection. I would like to check that this works correctly on non-Windows before pushing the patch.

I'm also not sure if this is something we need for 1.4 or if we should wait for after the release to push it.

Comment 5

[Patrick Cloke [:clokep]]

*** Original post on bio 1957 at 2013-05-23 02:35:58 UTC ***

I guess I'm unsure whether this is checkin-needed or not...but I think without that it'll fall through the cracks.

Comment 6

[Instantbot]

*** Original post on bio 1957 by Emanuel Hoogeveen <emanuel.hoogeveen AT gmail.com> at 2013-05-23 03:45:24 UTC ***

I may be missing something, but I don't think the attached patch actually moves app-license.html to its new location. I still got the error after applying attachment 8354197 [details] [diff] [review] (bio-attmnt 2430) locally until I moved it myself.

Comment 7

[Patrick Cloke [:clokep]]

*** Original post on bio 1957 at 2013-05-23 03:47:19 UTC ***

(In reply to comment #5)
> I may be missing something, but I don't think the attached patch actually moves
> app-license.html to its new location. I still got the error after applying
> attachment 8354197 [details] [diff] [review] (bio-attmnt 2430) [details] locally until I moved it myself.

Sure it does:
> diff --git a/instantbird/app/app-license.html b/instantbird/content/overrides/app-license.html
> rename from instantbird/app/app-license.html
> rename to instantbird/content/overrides/app-license.html

If you apply the patch with patch instead of hg import (or are using git or something) this might not work.

Comment 8

[Instantbot]

*** Original post on bio 1957 by Emanuel Hoogeveen <emanuel.hoogeveen AT gmail.com> at 2013-05-23 04:01:31 UTC ***

Oh, I see - that part doesn't show up in the diff view for some reason. And then I missed it when glancing at the details view because there's no space between it and the makefile changes. Carry on :D

Comment 9

[Patrick Cloke [:clokep]]

*** Original post on bio 1957 at 2013-05-23 23:13:22 UTC ***

Thanks Will!

http://hg.instantbird.org/instantbird/rev/97a56cf95247