Add win32 support to xpcom Makefile.ins

Bug #58981 r=bryner

xpcom/Makefile.in

@@ -26,7 +26,25 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= typelib glue base ds io components threads reflect proxy build tools
+DIRS		= \
+		typelib \
+		glue \
+		base \
+		ds \
+		io \
+		components \
+		threads \
+		reflect \
+		proxy \
+		build \
+		tools \
+		$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+ifdef MOZ_DEBUG
+DIRS		+= windbgdlg
+endif
+endif
 
 ifdef ENABLE_TESTS
 DIRS		+= \

xpcom/base/Makefile.in

@@ -84,6 +84,13 @@ EXPORTS         += nsTraceMalloc.h
 DEFINES         += -DNS_TRACE_MALLOC
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef MOZ_DEBUG
+CSRCS		+= pure_api.c
+EXPORTS		+= pure.h
+endif
+endif
+
 XPIDLSRCS	= \
 		nsrootidl.idl \
 		nsISupports.idl \
@@ -103,8 +110,6 @@ ifdef GC_LEAK_DETECTOR
 XPIDLSRCS       += nsILeakDetector.idl
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -118,3 +123,7 @@ DEFINES		+= -D_IMPL_NS_COM
 ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
+
+ifeq ($(OS_ARCH), WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/build/Makefile.in

@@ -44,25 +44,33 @@ endif
 
 CPPSRCS		= nsXPComInit.cpp
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= dlldeps.cpp
+endif
+
 ifdef XPCOM_USE_LEA
 CSRCS += malloc.c
 endif
 
+ifdef GC_LEAK_DETECTOR
+EXTRA_DSO_LIBS = boehm
+endif
+
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libxpcomds_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcomio_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomio_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcomcomponents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomcomponents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcomthreads_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomthreads_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcomproxy_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomproxy_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcombase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcombase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxptcall.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xptcall.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxptinfo.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xptinfo.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpt.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxptcmd.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xptcmd.$(LIB_SUFFIX) \
-		$(DIST)/lib/libmozreg_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libstring_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libstring_obsolete_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxpcomglue.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
@@ -80,10 +88,6 @@ ifdef MOZ_DEMANGLE_SYMBOLS
 EXTRA_DSO_LDOPTS += -liberty
 endif
 
-ifdef GC_LEAK_DETECTOR
-EXTRA_DSO_LDOPTS += -lboehm
-endif
-
 # pull in MoreFiles for MacOSX
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 EXTRA_DSO_LDOPTS += $(DEPTH)/dist/lib/libmacmorefiles_s.a
@@ -101,7 +105,18 @@ FORCE_SHARED_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+DEFINES		+= \
+		-D_IMPL_NS_COM \
+		-D_IMPL_NS_BASE \
+		-DEXPORT_XPT_API \
+		-DEXPORT_XPTC_API \
+		-DEXPORT_XPTI_API
+
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
+
+ifdef GC_LEAK_DETECTOR
+DEFINES += -DGC_LEAK_DETECTOR
+endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 CXXFLAGS	+= $(TK_CFLAGS)
@@ -112,5 +127,11 @@ ifeq ($(OS_ARCH),BeOS)
 EXTRA_DSO_LDOPTS += -lbe
 endif
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
+ifeq ($(OS_ARCH),WINNT)
+DEFINES += -DWIN32_LEAN_AND_MEAN
+EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
+ifneq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC))
+EXTRA_DSO_LDOPTS += imagehlp.lib
+endif
+endif # WINNT
 

xpcom/components/Makefile.in

@@ -84,3 +84,6 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE
+ifeq ($(OS_ARCH), WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/ds/Makefile.in

@@ -135,3 +135,6 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/glue/Makefile.in

@@ -57,5 +57,8 @@ FORCE_USE_PIC	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_COM
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE 
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/io/Makefile.in

@@ -67,9 +67,13 @@ CPPSRCS		+= nsLocalFileOS2.cpp
 #CPPSRCS     += nsLocalFileMac.cpp
 #CSRCS       += macDirectoryCopy.c
 else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS		+= nsLocalFileWin.cpp
+else
 CPPSRCS		+= nsLocalFileUnix.cpp
-endif
+endif # windows
 #endif
+endif # OS2
 
 EXPORTS		= \
 		nsAppDirectoryServiceDefs.h \
@@ -97,9 +101,13 @@ else
 #ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 #EXPORTS     += nsLocalFileMac.h nsILocalFileMac.h
 #else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+EXPORTS		+= nsLocalFileWin.h
+else
 EXPORTS		+= nsLocalFileUnix.h
-endif
+endif # windows
 #endif
+endif # os2
 
 XPIDLSRCS	= \
 		nsIBinaryInputStream.idl \
@@ -140,4 +148,7 @@ DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
 ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 

xpcom/proxy/public/Makefile.in

@@ -38,7 +38,5 @@ XPIDLSRCS	= nsIProxyCreateInstance.idl \
                   nsIProxyObjectManager.idl  \
                   $(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

xpcom/proxy/src/Makefile.in

@@ -49,3 +49,6 @@ FORCE_USE_PIC	= 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/reflect/xptcall/public/Makefile.in

@@ -34,7 +34,5 @@ EXPORTS		= \
 		xptcstubsdef.inc \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

xpcom/reflect/xptcall/src/Makefile.in

@@ -44,3 +44,7 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DEXPORT_XPTC_API
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+

xpcom/reflect/xptcall/src/md/Makefile.in

@@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 DIRS = os2
 else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+DIRS = win32
+else
 DIRS = unix
 endif
- 
+endif
+
 include $(topsrcdir)/config/rules.mk
 

xpcom/reflect/xptcall/src/md/win32/Makefile.in

@@ -0,0 +1,60 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+LIBRARY_NAME	= xptcmd
+
+#
+# The default is this buildable, but non-functioning code.
+#
+CPPSRCS		:= xptcinvoke.cpp xptcstubs.cpp
+
+# Force use of PIC
+FORCE_USE_PIC	= 1
+
+include $(topsrcdir)/config/config.mk
+
+ifeq ($(CPU),ALPHA)
+CPPSRCS 	:= xptcinvoke_alpha.cpp xptcstubs_alpha.cpp
+ASFILES		:= xptcinvoke_asm_alpha.s xptcstubs_asm_alpha.s
+AS		:= asaxp
+ASFLAGS		+= /I../../..public
+endif
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DEXPORT_XPTC_API
+
+LOCAL_INCLUDES	= -I$(srcdir)/../..
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/reflect/xptcall/tests/Makefile.in

@@ -40,10 +40,15 @@ LIBS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS		+= -DJS_THREADSAFE
+DEFINES		+= -DUSE_NSREG
 
 # For _write().
 ifeq ($(OS_ARCH),BSD_OS)
 OS_LIBS		+= -lgcc
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+

xpcom/reflect/xptinfo/src/Makefile.in

@@ -53,3 +53,6 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DEXPORT_XPTI_API -DEXPORT_XPT_API
+ifeq ($(OS_ARCH), WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/reflect/xptinfo/tests/Makefile.in

@@ -39,3 +39,7 @@ LIBS		= \
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES += -DUSE_NSREG -DEXPORT_XPTI_API
+ifeq ($(OS_ARCH), WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

xpcom/tests/Makefile.in

@@ -28,6 +28,10 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 DIRS		= dynamic services
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= windows
+endif
+
 REQUIRES	= necko \
 		  string \
 		  uconv \
@@ -37,6 +41,7 @@ CPPSRCS		= \
 		FilesTest.cpp \
 		nsIFileEnumerator.cpp \
 		nsIFileTest.cpp \
+		PropertiesTest.cpp \
 		TestArray.cpp \
 		TestAtoms.cpp \
 		TestAutoLock.cpp \
@@ -55,6 +60,8 @@ CPPSRCS		= \
 		TestXPIDLString.cpp \
 		$(NULL)
 
+#CPPSRCS		+= TimerTest.cpp
+
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
@@ -67,9 +74,7 @@ CPPSRCS		+= \
 endif
 
 LIBS		+= \
-		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
-		$(TK_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
@@ -81,11 +86,15 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
                 -I$(srcdir)/../ds \
 		-I$(srcdir)/services \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CXXFLAGS	+= -GX
+endif
+
 libs::
 	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
 

xpcom/threads/Makefile.in

@@ -73,4 +73,7 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+ifeq ($(OS_ARCH), WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 

xpcom/tools/Makefile.in

@@ -28,5 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= registry
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= windows
+endif
+
 include $(topsrcdir)/config/rules.mk
 

xpcom/tools/registry/Makefile.in

@@ -33,8 +33,8 @@ REQUIRES	= $(NULL)
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 LIBS		= \
-		$(MOZ_COMPONENT_LIBS) \
 		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

xpcom/tools/windows/Makefile.in

@@ -0,0 +1,36 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SIMPLE_PROGRAMS	= rebasedlls$(BIN_SUFFIX)
+
+CPPSRCS		= rebasedlls.cpp
+
+OS_LIBS		+= imagehlp.lib
+
+include $(topsrcdir)/config/rules.mk
+

xpcom/typelib/xpidl/Makefile.in

@@ -30,6 +30,9 @@ MODULE		= xpcom
 PROGRAM		= xpidl$(BIN_SUFFIX)
 INTERNAL_TOOLS	= 1
 
+# glib and libIDL link against the non-debug msvcrt
+MOZ_NO_DEBUG_RTL=1
+
 CSRCS		= \
 		xpidl.c \
 		xpidl_idl.c \
@@ -52,10 +55,14 @@ CFLAGS		+= $(LIBIDL_CFLAGS)
 
 # Compile directly against the static lib, so we can use xpidl during the build
 # without the shared library path being set.
-LIBS		= $(DIST)/lib/libxpt.$(LIB_SUFFIX) $(LIBIDL_LIBS)
+ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+DEFINES		+= -DEXPORT_XPT_API
+LDFLAGS		+= -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRTD
+endif
 
 # Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
-EXTRA_DEPS	= $(wildcard $(DIST)/lib/libxpt.*)
+LIBS		= $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) $(LIBIDL_LIBS)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/$(LIB_PREFIX)xpt.*)
 
 ifdef CROSS_COMPILE
 HOST_CFLAGS	+= $(HOST_LIBIDL_CFLAGS)
@@ -68,4 +75,3 @@ endif
 endif
 
 export:: libs
-

xpcom/typelib/xpt/src/Makefile.in

@@ -33,7 +33,6 @@ ifdef CROSS_COMPILE
 HOST_LIBRARY_NAME	= hostxpt
 endif
 
-
 CSRCS		= xpt_arena.c xpt_struct.c xpt_xdr.c
 HOST_CSRCS	= $(CSRCS)
 
@@ -48,6 +47,10 @@ include $(topsrcdir)/config/rules.mk
 DEFINES		+= -DEXPORT_XPT_API
 HOST_CFLAGS	+= -DEXPORT_XPT_API
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 # Build libxpt early so that it'll be available to xpidl, which also
 # must be built early.
 export:: libs

xpcom/typelib/xpt/tests/Makefile.in

@@ -40,3 +40,7 @@ LIBS		= \
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES += -DEXPORT_XPT_API -DUSE_NSREG
+ifeq ($(OS_ARCH),WINNT)
+DEFINES += -DWIN32_LEAN_AND_MEAN
+endif

xpcom/typelib/xpt/tools/Makefile.in

@@ -42,12 +42,15 @@ include $(topsrcdir)/config/rules.mk
 
 # Compile directly against the static lib, so we can use the tools
 # during the build without the shared library path being set.
-LIBS		= $(DIST)/lib/libxpt.$(LIB_SUFFIX)
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API
+endif
+
+LIBS		= $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX)
 
 # Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled
 # when libxpt changes.
-EXTRA_DEPS	= $(wildcard $(DIST)/lib/libxpt.*)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/$(LIB_PREFIX)xpt.*)
-
 
 ifdef CROSS_COMPILE
 HOST_LIBS		= $(DIST)/host/lib/libhostxpt.$(LIB_SUFFIX)

xpcom/windbgdlg/Makefile.in

@@ -0,0 +1,34 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SIMPLE_PROGRAMS	= windbgdlg$(BIN_SUFFIX)
+
+CPPSRCS		= windbgdlg.cpp
+
+include $(topsrcdir)/config/rules.mk
+