382150 - Consolidate calendar makefiles

Status: RESOLVED FIXED

(Calendar :: Build Config, defect)

Description

[Simon Paquet [:sipaq]]

This is a followup to bug 380846 (and to what the Seamonkey folks did in bug 381776) to get the Calendar apps one step further into the brave new world of a more modular build system.

This should remove calendar/ Makefiles from allmakefiles.sh and put them into
calendar/makefiles.sh which gets called by allmakefiles automatically now when
--enable-application=calendar

One thing I'm not 100% sure about:
- allmakesfiles.sh knows two Calendar-related makefile targets
  - MAKEFILES_calendar 
    (see http://mxr.mozilla.org/seamonkey/source/allmakefiles.sh#1011)
  - MAKEFILES_sunbird
    (see http://mxr.mozilla.org/seamonkey/source/allmakefiles.sh#1028)

Should both of these be consolidated into calendar/makefiles.sh or should we create calendar/makefiles.sh and calendar/sunbird/makefiles.sh? 

Ben, could you please elaborate on that? I will then make a patch based on your statement. Thanks!

Comment 1

[Robert Kaiser]

I guess we also need to make sure that the right set is added when lightning is built as an extension with Thunderbird or SeaMonkey.

Comment 2

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Sorry, I was on a slightly extended vacation.

Hm, looking at the setup currently it seems that MAKEFILES_sunbird is only used if MOZ_SUNBIRD is defined. MAKEFILES_calendar is used if MOZ_CALENDAR is defined.

MOZ_SUNBIRD and MOZ_CALENDAR are both set in calendar/confvars.sh, and the mozconfig for sunbird sets --enable-application=calendar (which means that calendar/confvars.sh is being executed).

So I'm guessing that you can combine them.

Does that seem right?

Comment 3

[Simon Paquet [:sipaq]]

Attachment: Patch v1

Patch after IRC discussion with Ben Turner.

Comment 4

[Simon Paquet [:sipaq]]

Comment on attachment 266647 [details] [diff] [review]
Patch v1

Asking also for module-owner approval (moa). Please note, that this is a trunk-only patch.

Comment 5

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 266647 [details] [diff] [review]
Patch v1

Looks good to me.

Comment 6

[Simon Paquet [:sipaq]]

mvl, any estimate on when you might to the moa on the patch in this bug? Or should I ask daniel (when he gets back) or ause?

Comment 7

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 266647 [details] [diff] [review]
Patch v1

updating to reality: I won't be able to review this any time soon

Comment 8

[Simon Paquet [:sipaq]]

Comment on attachment 266647 [details] [diff] [review]
Patch v1

Moving review request to ause. 

Ause, this has already gotten review from a mozilla developer. I'd just like you to take a quick look at this, so that someone from the calendar team is aware of this.

Comment 9

[Simon Paquet [:sipaq]]

CC'ing ause, since he is the reviewer in this bug.

Comment 10

[ause]

although some directories may appear twice in MAKEFILES, the processing  perlscript looks smart enough  to check if there is still something to do
 (could sort out duplicates first, but anyway).
as lightning dirs are a subset of those for sunbird, isn't there a way to activate lightning extension when MOZ_BUILD_APP contains sunbird?

Comment 11

[ause]

what right am i missing now again? :(

 You are not authorised to edit attachment 266647 [details] [diff] [review].

Comment 12

[Stefan Sitter [:ssitter]]

(In reply to comment #10)
When building Sunbird you can also build Lightning at the same time by adding "ac_add_options --enable-extensions=lightning" to the mozconfig file. I hope this still works after the change.

Comment 13

[Simon Paquet [:sipaq]]

(In reply to comment #12)
> When building Sunbird you can also build Lightning at the same time by adding
> "ac_add_options --enable-extensions=lightning" to the mozconfig file. I hope
> this still works after the change.

It definitely should work.

Comment 14

[ause]

Attachment: move shared directory list to a shared script

this patch only leaves one place to maintain the directory list

Comment 15

[Simon Paquet [:sipaq]]

Ause, the patch for bug 381902 was checked in about a week ago. We need to update our patch.

Comment 16

[Simon Paquet [:sipaq]]

Attachment: Patch v2

Ause, this unbitrots the previous patch and incorporates your proposed changes. Please review.

Comment 17

[ause]

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

works. but it looks like these scripts are not mandatory. there is also some magic in config/rules.mk that creates these makefiles on the fly (search for SUBMAKEFILES). i'm not sure what the prefered way is in the moz project , but less scripts is less maintaing work...

Comment 18

[Simon Paquet [:sipaq]]

Patch checked in to trunk. Thanks ause! Thanks Ben!

Comment 19

[Martin Schröder [:mschroeder]]

Lightning Trunk Tinderboxen for Linux and Mac are burning. -> REOPEN

/builds/tinderbox/Lightning-Trunk/Darwin_8.8.1_Depend/mozilla/configure: line 36: 
: command not found
/builds/tinderbox/Lightning-Trunk/Darwin_8.8.1_Depend/mozilla/configure: line 37: /builds/tinderbox/Lightning-Trunk/Darwin_8.8.1_Depend/mozilla/calendar/shared_makefiles.sh
: No such file or directory

/builds/tinderbox/Lt-Trunk/Linux_2.6.9-42.ELsmp_Depend/mozilla/extensions/lightning/makefiles.sh: line 36: 
: command not found
/builds/tinderbox/Lt-Trunk/Linux_2.6.9-42.ELsmp_Depend/mozilla/extensions/lightning/makefiles.sh: line 37: /builds/tinderbox/Lt-Trunk/Linux_2.6.9-42.ELsmp_Depend/mozilla/calendar/shared_makefiles.sh
: No such file or directory

Comment 20

[ause]

mozilla/extensions/lightning/makemakefiles.sh got dos lineends on the tinderbox

Comment 21

[Martin Schröder [:mschroeder]]

Bustage fix by sipaq -> FIXED again :)