295482 - WinCE w/ XUL makefile changes

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Doug Turner (:dougt)]

I need a few makefile changes to make XUL work with Minimo/CE

Comment 1

[Doug Turner (:dougt)]

Attachment: patch v.1

Comment 2

[Benjamin Smedberg]

Comment on attachment 184509 [details] [diff] [review]
patch v.1

> MAKEFILES_minimo="
> embedding/minimo/Makefile
> embedding/minimo/app/Makefile
>-embedding/minimo/chromelite/Makefile
> embedding/minimo/popuplite/Makefile
>+embedding/minimo/chromelite/Makefile
>+chrome/Makefile
>+chrome/public/Makefile
>+chrome/src/Makefile
> "

Can't you create a MAKEFILES_chrome var instead of duplicating these?

>Index: Makefile.in

> ifdef MOZ_XUL
> ifdef MOZ_XUL_APP
> tier_50_dirs += chrome
> else
>+ifdef MINIMO
>+tier_50_dirs += chrome
>+else
> tier_50_dirs += rdf/chrome
> endif
>+endif

learn your makefile-fu! instead of multiple ifdefs, just make it

ifneq (,$(MOZ_XUL_APP)$(MINIMO))

In addition, you should probably add a comment here about minimo using
different chrome registry impls depending on whether --disable-xul was
specified, as it's not obvious to the casual reader.

Comment 3

[Doug Turner (:dougt)]

Attachment: patch v.2

i am backing off on making Minimo/XUL using mozilla/chrome for now.

Comment 4

[Doug Turner (:dougt)]

Attachment: Patch v.3

* This moves most of the configuration options of minimo into configure.in.

* This makes minimo use the same toolkit that ff uses.

* This makes toolkit build on WINCE.  (makefile love only)

* This moves all default configuration options above where we enable
applications in configure.in

Comment 5

[Doug Turner (:dougt)]

Attachment: Patch v.4

For Minimo, we don't use the XRE.  So, i have moved the following under a
#ifndef MINIMO:  "nsXULAppAPI" "nsIXULAppInfo", "nsIXULRuntime"

This means that we don't have a safemode (no worries), or dont' have a appid or
appname to parse with (don't think this is a worry).

Comment 6

[Doug Turner (:dougt)]

Comment on attachment 190621 [details] [diff] [review]
Patch v.3

new patch coming.

Comment 7

[Doug Turner (:dougt)]

Comment on attachment 190626 [details] [diff] [review]
Patch v.4

new patch coming.

Comment 8

[Doug Turner (:dougt)]

Attachment: Patch v.5

This includes the two above patches and a few toolkit changes I needed to make
to build minimo.  This also include a small fix to config/Makefile.in that
dbaron pointed out in 291229.

Comment 9

[Benjamin Smedberg]

Comment on attachment 190654 [details] [diff] [review]
Patch v.5

This is frazzinly awesome. Only a few nits:

I would prefer that there be no minimo #ifdefs in the chrome code, and instead
have minimo export (but not libs) in toolkit/xre

so in toolkit/Makefile.in

leave the DIRS ifdef as it is, but add at the bottom of the makefile

export::
<tab>@$(MAKE) -C xre export

also in that makefile, whitespace nit
DIRS = \
  xre \

instead of on one line.

In toolkit/components/build/nsToolkitCompsModule.cpp, kindly replace all the
#if defined(MOZ_PHOENIX) || defined(MOZ_SUNBIRD) || defined(MINIMO)

with #ifndef MOZ_THUNDERBIRD (thunderbird is the only odd-man-out).

I'd like to see a new patch, but this is awesone.

Comment 10

[Doug Turner (:dougt)]

Attachment: patch v.6

this includes benjamin's comments.

Comment 11

[Benjamin Smedberg]

Comment on attachment 190756 [details] [diff] [review]
patch v.6

Please don't check in the chrome/* bits.

Comment 12

[Doug Turner (:dougt)]

i will not include chrome/src/nsChromeRegistry.cpp.

Comment 13

[Doug Turner (:dougt)]

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.240; previous revision: 1.239
done
Checking in configure.in;
/cvsroot/mozilla/configure.in,v  <--  configure.in
new revision: 1.1499; previous revision: 1.1498
done
Checking in modules/libjar/Makefile.in;
/cvsroot/mozilla/modules/libjar/Makefile.in,v  <--  Makefile.in
new revision: 1.50; previous revision: 1.49
done
Checking in toolkit/Makefile.in;
/cvsroot/mozilla/toolkit/Makefile.in,v  <--  Makefile.in
new revision: 1.27; previous revision: 1.26
done
Checking in toolkit/components/Makefile.in;
/cvsroot/mozilla/toolkit/components/Makefile.in,v  <--  Makefile.in
new revision: 1.42; previous revision: 1.41
done
Checking in toolkit/components/build/Makefile.in;
/cvsroot/mozilla/toolkit/components/build/Makefile.in,v  <--  Makefile.in
new revision: 1.23; previous revision: 1.22
done
Checking in toolkit/components/build/nsToolkitCompsModule.cpp;
/cvsroot/mozilla/toolkit/components/build/nsToolkitCompsModule.cpp,v  <-- 
nsToolkitCompsModule.cpp
new revision: 1.18; previous revision: 1.17
done
Checking in toolkit/components/downloads/src/Makefile.in;
/cvsroot/mozilla/toolkit/components/downloads/src/Makefile.in,v  <--  Makefile.in
new revision: 1.10; previous revision: 1.9
done
Checking in toolkit/components/startup/src/Makefile.in;
/cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v  <--  Makefile.in
new revision: 1.7; previous revision: 1.6
done

marking fixed.