892861 - Remove useless -D flags 'IMPL_THEBES,_IMPL_NS_GFX,...'

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Benoit Girard (:BenWa)]

Some (all?) of these are now useless and they clutter our build arguments. Should be an easy clean up:

http://mxr.mozilla.org/mozilla-central/source/config/config.mk#338

Comment 1

[Mike Hommey [:glandium]]

Off that list, only _IMPL_NS_COM, IMPL_XREAPI and IMPL_NS_NET are used in m-c.

Comment 2

[Mike Hommey [:glandium]]

Those three could be replaced by a single IMPL_LIBXUL or something.

Comment 3

[Benoit Girard (:BenWa)]

Attachment: patch

Since you've already looked at this I'm tentatively asking you to review bug feel free to delegate.

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 774500 [details] [diff] [review]
patch

Review of attachment 774500 [details] [diff] [review]:
-----------------------------------------------------------------

Most of the files where you're adding DEFINES += -DIMPL_LIBXUL would most probably be fine without it, but with LIBXUL_LIBRARY = 1 in the Makefile instead.

::: netwerk/mime/Makefile.in
@@ +17,5 @@
>  FORCE_STATIC_LIB = 1
>  
>  include $(topsrcdir)/config/rules.mk
>  
> +DEFINES += -DIMPL_LIBXUL

This file contains LIBXUL_LIBRARY=1, no need for this.

::: widget/windows/Makefile.in
@@ +17,5 @@
>  RESFILE		= widget.res
>  MODULE_NAME	= nsWidgetWinModule
>  LIBXUL_LIBRARY = 1
>  
> +DEFINES		+= -DMOZ_UNICODE 

Remove the trailing whitespace while you're here.

::: xpcom/build/Makefile.in
@@ +74,5 @@
>  include $(topsrcdir)/ipc/chromium/chromium-config.mk
>  include $(topsrcdir)/config/rules.mk
>  
>  DEFINES		+= \
> +		-DIMPL_LIBXUL \

This file contains LIBXUL_LIBRARY=1, no need for this.

::: xpcom/io/Makefile.in
@@ +39,5 @@
>  
>  include $(topsrcdir)/config/rules.mk
>  include $(topsrcdir)/ipc/chromium/chromium-config.mk
>  
> +DEFINES		+= -DIMPL_LIBXUL

Likewise.

::: xpcom/threads/Makefile.in
@@ +21,5 @@
>  
>  
>  include $(topsrcdir)/config/rules.mk
>  
> +DEFINES		+= -DIMPL_LIBXUL

Likewise.

Comment 5

[Benoit Girard (:BenWa)]

Attachment: patch

Comment 6

[Benoit Girard (:BenWa)]

Attachment: rebased on inbound

Fixed 16 conflicts

Comment 7

[Benoit Girard (:BenWa)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e6ebdb6069c7

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/e6ebdb6069c7