331788 - CalExt-only files should not be packaged in calendar/resources/jar.mn when Sunbird is built

Status: RESOLVED FIXED

(Calendar :: Internal Components, defect)

Description

[Simon Paquet [:sipaq]]

As discussed with mvl on IRC I'm putting this into a bug for future reference.

http://lxr.mozilla.org/seamonkey/source/calendar/resources/jar.mn#109 should move into the #ifndef MOZ_SUNBIRD block since it will be overridden during the build process by calendar/sunbird/themes/[w/p]instripe/sunbird anyway.

Comment 1

[Simon Paquet [:sipaq]]

Attachment: Patch v1

jminta already gave r+ via IRC.

Comment 2

[Matthew (lilmatt) Willis]

Add to the list the following files in both *instripe themes:

calendarviews.css
pageupdown.png
prevnextarrow.png
datetimepickers/minimonth.css

Comment 3

[Simon Paquet [:sipaq]]

> calendarviews.css

I don't see this used in calendar/resources/jar.mn

> pageupdown.png

Same here.

> prevnextarrow.png
> datetimepickers/minimonth.css

Here you are right.

Comment 4

[Simon Paquet [:sipaq]]

Attachment: Patch v2

Patch incorporates some of lilmatt's suggestions.

Comment 5

[Joey Minta]

Comment on attachment 216338 [details] [diff] [review]
Patch v2

r=jminta  Now my build will finish in 59:59.90 instead of 1 hour. :-)  Gonna hold off on landing this until post 0.3a2, since it's non-zero risk for very little gain.  Please ping me about it then.

Comment 6

[Matthew (lilmatt) Willis]

Sorry for the confusion.
calendarviews.css and pageupdown.png are actually in both themes directories, however they aren't in jar.mn

Comment 7

[Joey Minta]

(In reply to comment #6)
> Sorry for the confusion.
> calendarviews.css and pageupdown.png are actually in both themes directories,
> however they aren't in jar.mn
> 
calendarviews.css became obsolete at the switch to the new views.

Comment 8

[Simon Paquet [:sipaq]]

>> calendarviews.css and pageupdown.png are actually in both themes directories,
>> however they aren't in jar.mn
>> 
> calendarviews.css became obsolete at the switch to the new views.

Shouldn't we just cvs remove those two files (pageupdown.png and calendar-views.css) in Sunbird Pinstripe and Winstripe?

Comment 9

[Matthew (lilmatt) Willis]

(In reply to comment #8)
> Shouldn't we just cvs remove those two files (pageupdown.png and
> calendar-views.css) in Sunbird Pinstripe and Winstripe?

I'd say so. From what I can see, we don't use pageupdown.png in the new themes at all. 

Comment 10

[Matthew (lilmatt) Willis]

Patch checked in on trunk and MOZILLA_1_8_BRANCH