391409 - Cleaning up all OS widget makefiles

Status: RESOLVED FIXED

(Core :: Widget, defect)

Description

[Jonathan Steele]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9a8pre) Gecko/2007080805 Firefox/3.0a7pre
Build Identifier: 

Cleaning up all OS makefiles that will remove MOZ_ENABLE_CAIRO_GFX checks. Also, I found there is gfxwin that is under requires in the windows makefiles. Maybe, there is still requires old gfx folder in another makefiles. 

Reproducible: Always

Steps to Reproduce:
1.
2.
3.

Comment 1

[Jonathan Steele]

Attachment: windows makefiles

removed gfxwin and MOZ_ENABLE_CAIRO_GFX checks.

Comment 2

[Jonathan Steele]

Comment on attachment 276081 [details] [diff] [review]
windows makefiles

>Index: Makefile.in
>===================================================================
>RCS file: /cvsroot/mozilla/widget/src/windows/Makefile.in,v
>retrieving revision 3.48
>diff -u -8 -p -r3.48 Makefile.in
>--- Makefile.in	25 Jan 2007 21:13:32 -0000	3.48
>+++ Makefile.in	8 Aug 2007 18:48:11 -0000
>@@ -48,38 +48,35 @@ LIBXUL_LIBRARY = 1
> 
> REQUIRES	= xpcom \
> 			string \
> 			dom \
> 			accessibility \
> 			content \
> 			content_xul \
> 			gfx \
>-			gfxwin \
> 			necko \
> 			pref \
> 			plugin \
> 			timer \
> 			uconv \
> 			intl \
> 			locale \
> 			webshell \
> 			docshell \
> 			layout \
> 			xuldoc \
> 			view \
> 			imglib2 \
> 			uriloader \
> 			webbrowserpersist \
> 			unicharutil \
>+			thebes \
>+                      cairo  \
> 			$(NULL)
> 
>-ifdef MOZ_ENABLE_CAIRO_GFX
>-REQUIRES += thebes cairo
>-endif
> 
> CPPSRCS		= \
> 	L_Ienumfe.cpp  \
> 	nsWindow.cpp         \
> 	nsAppShell.cpp       \
> 	nsLookAndFeel.cpp    \
> 	nsToolkit.cpp        \
> 	nsKeyboardLayout.cpp \

Comment 3

[Robert O'Callahan (:roc) (email my personal email if necessary)]

+			thebes \
+     cairo  \

Put tabs before "cairo".

Comment 4

[Jonathan Steele]

Attachment: Patch v1.1

Comment 5

[Jonathan Steele]

Attachment: Patch v1.2

Comment 6

[Jonathan Steele]

Attachment: Patch v1.3

Comment 7

[Jonathan Steele]

Attachment: Remove CAIRO_Checks from OS2

Comment 8

[Jonathan Steele]

Attachment: Remove Cairo Checks from XP Widgets

Comment 9

[Jonathan Steele]

Attachment: Remove Cairo checks from few widgets directory

Comment 10

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Can you fix the lines with "no newline at end of file"?

Comment 11

[Peter Weilbacher]

Jonathan, are you sure you want to do these removals one type of file at a time? We have non-cairo removal bugs for the whole of widget for the platforms already, just waiting to get in. (E.g. bug 389729 for OS/2.)

Comment 12

[Jonathan Steele]

(In reply to comment #11)
> Jonathan, are you sure you want to do these removals one type of file at a
> time? We have non-cairo removal bugs for the whole of widget for the platforms
> already, just waiting to get in. (E.g. bug 389729 for OS/2.)
> 

Yes, I don't want too much patch in same bugs since it can be confusing which one to get check-in or not.

Comment 13

[Jonathan Steele]

Attachment: r

Comment 14

[Jonathan Steele]

Attachment: Remove GFX from widget directory in makefiles

Comment 15

[Jonathan Steele]

Attachment: 279865: Remove GFX from widget directory in makefiles v3

Comment 16

[Reed Loden [:reed]]

Comment on attachment 279866 [details]
279865: Remove GFX from widget directory in makefiles v3

>Index: os2/Makefile.in

Bug 389729 already took care of the os2 parts.

Comment 17

[Reed Loden [:reed]]

Checked-in without os2 changes:

Checking in widget/src/beos/Makefile.in;
/cvsroot/mozilla/widget/src/beos/Makefile.in,v  <--  Makefile.in
new revision: 1.56; previous revision: 1.55
done
Checking in widget/src/build/Makefile.in;
/cvsroot/mozilla/widget/src/build/Makefile.in,v  <--  Makefile.in
new revision: 1.72; previous revision: 1.71
done
Checking in widget/src/windows/Makefile.in;
/cvsroot/mozilla/widget/src/windows/Makefile.in,v  <--  Makefile.in
new revision: 3.49; previous revision: 3.48
done
Checking in widget/src/xpwidgets/Makefile.in;
/cvsroot/mozilla/widget/src/xpwidgets/Makefile.in,v  <--  Makefile.in
new revision: 1.82; previous revision: 1.81
done