new embedding promptservice component. bug 72112 r=hyatt,pinkerton

allmakefiles.sh

@@ -745,6 +745,9 @@ embedding/browser/photon/src/Makefile
 embedding/browser/photon/tests/Makefile
 embedding/components/Makefile
 embedding/components/build/Makefile
+embedding/components/promptservice/Makefile
+embedding/components/promptservice/public/Makefile
+embedding/components/promptservice/src/Makefile
 embedding/components/windowwatcher/Makefile
 embedding/components/windowwatcher/public/Makefile
 embedding/components/windowwatcher/src/Makefile

build/mac/build_scripts/MozillaBuildList.pm

@@ -719,6 +719,7 @@ sub BuildClientDist()
     #EMBEDDING
     InstallFromManifest(":mozilla:embedding:base:MANIFEST_IDL",                    "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:browser:webbrowser:MANIFEST_IDL",      "$distdirectory:idl:");
+    InstallFromManifest(":mozilla:embedding:components:promptservice:public:MANIFEST_IDL", "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:components:windowwatcher:public:MANIFEST_IDL", "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:components:appstartup:src:MANIFEST",   "$distdirectory:embedding:components:");
 

embedding/components/Makefile.in

@@ -24,6 +24,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = windowwatcher appstartup build
+DIRS = promptservice windowwatcher appstartup build
 
 include $(topsrcdir)/config/rules.mk

embedding/components/build/Makefile.in

@@ -27,12 +27,13 @@ MODULE		= embedcomponents
 LIBRARY_NAME	= embedcomponents
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
-REQUIRES	= js xpcom string windowwatcher embed_base
+REQUIRES	= js xpcom string promptservice windowwatcher embed_base
 
 CPPSRCS		= nsModule.cpp
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXTRA_DSO_LIBS	= \
+	promptservice_s \
 	windowwatcher_s \
 	appstartupnotifier_s \
 	$(NULL)
@@ -45,6 +46,7 @@ endif
 else
 
 SHARED_LIBRARY_LIBS = \
+	$(DIST)/lib/libpromptservice_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
 	$(NULL)
@@ -56,6 +58,7 @@ endif
 endif
 
 LOCAL_INCLUDES	= \
+	-I$(srcdir)/../promptservice/src  \
 	-I$(srcdir)/../windowwatcher/src  \
 	-I$(srcdir)/../appstartup/src  \
 	$(NULL)

embedding/components/build/makefile.win

@@ -35,11 +35,13 @@ LLIBS = \
 	$(LIBNSPR) \
         $(DIST)\lib\js3250.lib \
 	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\promptservice_s.lib \
 	$(DIST)\lib\windowwatcher_s.lib \
 	$(DIST)\lib\appstartupnotifier_s.lib \
 	$(NULL)
 
 INCS = $(INCS) \
+	-I$(DEPTH)\embedding\components\promptservice\src \
 	-I$(DEPTH)\embedding\components\windowwatcher\src \
 	-I$(DEPTH)\embedding\components\appstartup\src \
 	$(NULL)

embedding/components/build/nsModule.cpp

@@ -21,14 +21,17 @@
  */
 
 #include "nsIGenericFactory.h"
+#include "nsPromptService.h"
 #include "nsWindowWatcher.h"
 #include "nsAppStartupNotifier.h"
 
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
 
 static nsModuleComponentInfo components[] = {
 
+  { "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor },
   { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
   { NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
 };

embedding/components/makefile.win

@@ -21,6 +21,7 @@
 DEPTH=..\..
 
 DIRS= \
+	promptservice \
 	windowwatcher \
 	appstartup \
 	build \

embedding/components/promptservice/src/Makefile.in

@@ -0,0 +1,40 @@
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= embedcomponents
+LIBRARY_NAME	= promptservice_s
+REQUIRES	= xpcom string dom promptservice widget js xpconnect caps layout uriloader necko docshell locale webbrwsr embed_base gfx2
+
+CPPSRCS		= nsPromptService.cpp \
+                  $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+