Closed Bug 547521 Opened 10 years ago Closed 9 years ago

enable building for windows mobile with --disable-libxul

Categories

(Firefox Build System :: General, defect)

ARM
Windows Mobile 6 Professional
defect
Not set

Tracking

(Not tracked)

RESOLVED WONTFIX

People

(Reporter: blassey, Unassigned)

Details

Attachments

(1 file)

Attached patch patchSplinter Review
we may need this to work around some difficulties with the HTC HD2
Attachment #428027 - Flags: review?(ted.mielczarek)
Comment on attachment 428027 [details] [diff] [review]
patch

>diff --git a/gfx/thebes/src/Makefile.in b/gfx/thebes/src/Makefile.in
>--- a/gfx/thebes/src/Makefile.in
>+++ b/gfx/thebes/src/Makefile.in
>@@ -53,34 +53,37 @@ CPPSRCS	+= 	gfxWindowsPlatform.cpp \
> 		gfxWindowsSurface.cpp \
> 		gfxWindowsNativeDrawing.cpp \
> 		nsUnicodeRange.cpp \
> 		$(NULL)
> 
> ifdef WINCE
> CPPSRCS	+= gfxFT2Fonts.cpp \
> 	   gfxFT2FontBase.cpp \
> 	   gfxFT2Utils.cpp \
> 	   gfxDDrawSurface.cpp \
> 	   gfxFT2FontList.cpp \
> 	   $(NULL)
>-EXTRA_DSO_LDOPTS += ddraw.lib
>+
>+EXTRA_DSO_LDOPTS += $(FT2_LIBS)
>+
>+OS_LIBS		+= $(call EXPAND_LIBNAME,ddraw)

Don't put literal tabs in a Makefile unless you actually need them (in the rule list of commands).

> else
> CPPSRCS	+= gfxWindowsFonts.cpp \
> 	   gfxGDIFontList.cpp \
> 	   $(NULL)
>+_OS_LIBS	= usp10 msimg32

Same here. (I realize there are tabs in context, but let's try to stop proliferating.)

>diff --git a/modules/freetype2/Makefile.in b/modules/freetype2/Makefile.in
>--- a/modules/freetype2/Makefile.in
>+++ b/modules/freetype2/Makefile.in
>@@ -38,24 +38,25 @@
> DEPTH		= ../..
> topsrcdir	= @top_srcdir@
> srcdir		= @srcdir@
> VPATH		= @srcdir@
> 
> include $(DEPTH)/config/autoconf.mk
> 
> MODULE	= freetype2
> LIBRARY_NAME	= freetype2
> GRE_MODULE	= 1
> LIBXUL_LIBRARY = 1
> DIST_INSTALL = 1
>+FORCE_STATIC_LIB=1

Put a space on either side of the equals.

> 
> VPATH += @srcdir@/src/autofit 	\
> 	@srcdir@/src/base 	\
> 	@srcdir@/src/bdf/ 	\
> 	@srcdir@/src/cache	\
> 	@srcdir@/src/cff 	\
> 	@srcdir@/src/cid 	\
> 	@srcdir@/src/lzw 	\
> 	@srcdir@/src/pcf 	\
> 	@srcdir@/src/pfr 	\
> 	@srcdir@/src/psaux 	\
> 	@srcdir@/src/pshinter 	\
>@@ -70,25 +71,24 @@ VPATH += @srcdir@/src/autofit 	\
> 	@srcdir@/src/sfnt 	\
> 	@srcdir@/src/autofit 	\
> 	@srcdir@/src/sfnt 	\
> 	$(NULL)
> 
> CSRCS = \
> 	afangles.c	\
> 	ftbase.c	\
> 	ftbbox.c	\
> 	ftbitmap.c	\
> 	ftdebug.c	\
> 	ftgasp.c	\
>-	ftgloadr.c	\

What's this change for?

>diff --git a/modules/libpr0n/decoders/icon/Makefile.in b/modules/libpr0n/decoders/icon/Makefile.in
>--- a/modules/libpr0n/decoders/icon/Makefile.in
>+++ b/modules/libpr0n/decoders/icon/Makefile.in
>@@ -106,21 +106,21 @@ EXTRA_DSO_LDOPTS += \
> 		$(EXTRA_DSO_LIBS) \
> 		$(MOZ_COMPONENT_LIBS) \
> 		$(NULL)
> else
> EXTRA_DSO_LDOPTS += \
> 		$(XPCOM_GLUE_LDOPTS) \
> 		$(NSPR_LIBS) \
> 		$(NULL)
> endif
> 
> LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)
> 
>-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
>+ifeq (,$(filter-out WINNT, $(OS_ARCH)))

Just make this ifeq ($(OS_ARCH),WINNT)

>diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in
>--- a/widget/src/build/Makefile.in
>+++ b/widget/src/build/Makefile.in
>@@ -54,36 +54,39 @@ LIBXUL_LIBRARY = 1
> CPPSRCS		= nsWinWidgetFactory.cpp
> 
> EXTRA_DSO_LIBS	= gkgfx \
> 		  thebes \
> 		  $(NULL)
> 
> LOCAL_INCLUDES	= \
> 		-I$(srcdir) \
> 		-I$(srcdir)/../xpwidgets \
> 		-I$(srcdir)/../windows \
> 		$(NULL)
> 
>-OS_LIBS		+= $(call EXPAND_LIBNAME, uuid ole32 oleaut32 winspool)
>+OS_LIBS		+= $(call EXPAND_LIBNAME, uuid ole32 oleaut32)

Kill the tabs while you're here.

>diff --git a/widget/src/build/widget.rc b/widget/src/build/widget.rc
>--- a/widget/src/build/widget.rc
>+++ b/widget/src/build/widget.rc
>@@ -28,25 +28,31 @@
>  * in which case the provisions of the GPL or the LGPL are applicable instead
>  * of those above. If you wish to allow use of your version of this file only
>  * under the terms of either the GPL or the LGPL, and not to allow others to
>  * use your version of this file under the terms of the MPL, indicate your
>  * decision by deleting the provisions above and replace them with the notice
>  * and other provisions required by the GPL or the LGPL. If you do not delete
>  * the provisions above, a recipient may use your version of this file under
>  * the terms of any one of the MPL, the GPL or the LGPL.
>  *
>  * ***** END LICENSE BLOCK ***** */
> 
> #include "resource.h"
>+#if OSARCH == WINCE

This looks weird. Can't you just #ifdef WINCE ?

>diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
>--- a/xpcom/build/Makefile.in
>+++ b/xpcom/build/Makefile.in
>@@ -65,24 +65,28 @@ CSRCS		= \
> 
> CPPSRCS		= \
> 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
> 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \
> 		nsXPComInit.cpp \
> 		nsXPCOMStrings.cpp \
> 		$(NULL)
> 
> ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
> CPPSRCS		+= dlldeps.cpp
> endif
> 
>+ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINCE)
>+CPPSRCS		+= dlldeps.cpp
>+endif
>+
> ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),OS2)
> CPPSRCS		+= dlldeps.cpp
> endif

Just combine these three blocks into something like:
ifdef MOZ_ENABLE_LIBXUL
ifeq(,$(filter-out WINNT WINCE OS2,$(OS_ARCH))
CPPSRCS += dlldeps.cpp
endif
endif

r=me with those nits fixed.
Attachment #428027 - Flags: review?(ted.mielczarek) → review+
Assignee: nobody → bugmail
Assignee: blassey.bugs → nobody
WONTFIX in favor of bug 589148 anyway.
Status: NEW → RESOLVED
Closed: 9 years ago
Resolution: --- → WONTFIX
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.