452851 - Icon files have problems being copied when source code is read-only

Status: RESOLVED FIXED

(Other Applications :: DOM Inspector, defect)

Description

[Jeff Beckley]

Attachment: Updated makefile

Some of the icons installed during a build use the "cp" command.  This causes a problem in setups where the source files are marked as read-only (our source control tool does that) and cp leaves the files as read-only.  Then a subsequent build fails because the read-only files can't be copied over.

Included is a patch to the makefile to solve this problem, which uses the "-f" option to force the copy.

Comment 1

[Mark Banner (:standard8)]

Comment on attachment 336102 [details] [diff] [review]
Updated makefile

sdwilsh is better to review this.

Comment 2

[[e-mail]]

Comment on attachment 336102 [details] [diff] [review]
Updated makefile

> ifdef MOZ_XUL_APP
This is now always true, so remove this instead of patching the else part.

>+	cp -f $(srcdir)/resources/content/res/winInspectorMainOS2.ico $(FINAL_TARGET)/platform/OS2/chrome/icons/default/winInspectorMain.ico
Stupid rename :-( Maybe we can hg move all these icons into their own dirs?

Comment 3

[Shawn Wilsher :sdwilsh]

Comment on attachment 336102 [details] [diff] [review]
Updated makefile

> >+	cp -f $(srcdir)/resources/content/res/winInspectorMainOS2.ico $(FINAL_TARGET)/platform/OS2/chrome/icons/default/winInspectorMain.ico
> Stupid rename :-( Maybe we can hg move all these icons into their own dirs?
r=sdwilsh with this change

Comment 4

[Mark Banner (:standard8)]

(In reply to comment #2)
> (From update of attachment 336102 [details] [diff] [review])
> > ifdef MOZ_XUL_APP
> This is now always true, so remove this instead of patching the else part.

Note: I've just checked in a patch from bug 451909 which has removed this ifdef

Comment 5

[Jeff Beckley]

Attachment: Move icon files to separate OS directories

Moved the icons files in to sub-directories based on OS.  Makefile was updated for the new location, and can now use $(INSTALL) for the OS2 icon.

Continuing r=sdwilsh, sr=neil.

Comment 6

[Mark Banner (:standard8)]

Checked in, changeset id: 659:20e2c7875806

Comment 7

[Mark Banner (:standard8)]

I applied the patch incorrectly and missed moving the files first time round, this is now fixed with changeset id: 660:0c6184ed119c