Landing xpcom20/21 branch.

Makefile.in

@@ -49,7 +49,6 @@ endif
 
 DIRS +=				\
   modules/libutil		\
-  base				\
   intl				\
   js				\
   modules/security/freenav	\

allmakefiles.sh

@@ -40,15 +40,6 @@ fi
 
 add_makefiles <<END_NGMAKEFILES
 Makefile
-base/Makefile
-base/public/Makefile
-base/src/Makefile
-base/src/gtk/Makefile
-base/src/motif/Makefile
-base/src/photon/Makefile
-base/src/rhapsody/Makefile
-base/src/xlib/Makefile
-base/tests/Makefile
 build/Makefile
 build/unix/Makefile
 build/unix/nspr_my_config.mk
@@ -349,36 +340,58 @@ widget/src/xpwidgets/Makefile
 widget/tests/Makefile
 widget/tests/scribble/Makefile
 widget/tests/widget/Makefile
+#
+# New xpcom hiearchy
+#
 xpcom/Makefile
-xpcom/public/Makefile
-xpcom/src/Makefile
-xpcom/sample/Makefile
-xpcom/tests/Makefile
-xpcom/tests/dynamic/Makefile
-xpcom/tools/Makefile
-xpcom/tools/xpidl/Makefile
-xpcom/tools/registry/Makefile
-xpcom/libxpt/Makefile
-xpcom/libxpt/public/Makefile
-xpcom/libxpt/src/Makefile
-xpcom/libxpt/tests/Makefile
-xpcom/libxpt/tools/Makefile
-xpcom/libxpt/xptcall/Makefile
-xpcom/libxpt/xptcall/public/Makefile
-xpcom/libxpt/xptcall/src/Makefile
-xpcom/libxpt/xptcall/src/md/Makefile
-xpcom/libxpt/xptcall/src/md/unix/Makefile
-xpcom/libxpt/xptcall/src/md/test/Makefile
-xpcom/libxpt/xptcall/tests/Makefile
-xpcom/libxpt/xptinfo/Makefile
-xpcom/libxpt/xptinfo/public/Makefile
-xpcom/libxpt/xptinfo/src/Makefile
-xpcom/libxpt/xptinfo/tests/Makefile
+xpcom/base/Makefile
+xpcom/build/Makefile
+xpcom/components/Makefile
+xpcom/ds/Makefile
 xpcom/idl/Makefile
+xpcom/io/Makefile
+xpcom/typelib/Makefile
+xpcom/reflect/Makefile
+xpcom/typelib/xpt/Makefile
+xpcom/typelib/xpt/public/Makefile
+xpcom/typelib/xpt/src/Makefile
+xpcom/typelib/xpt/tests/Makefile
+xpcom/typelib/xpt/tools/Makefile
+xpcom/typelib/xpidl/Makefile
+xpcom/typelib/xpidl/glib/glib-1.2.1/Makefile
+xpcom/typelib/xpidl/glib/glib-1.2.1/docs/Makefile
+xpcom/typelib/xpidl/glib/glib-1.2.1/gmodule/Makefile
+xpcom/typelib/xpidl/glib/glib-1.2.1/gthread/Makefile
+xpcom/typelib/xpidl/glib/glib-1.2.1/tests/Makefile
+xpcom/typelib/xpidl/libidl/libIDL-0.6.5/Makefile
+xpcom/reflect/xptcall/Makefile
+xpcom/reflect/xptcall/public/Makefile
+xpcom/reflect/xptcall/src/Makefile
+xpcom/reflect/xptcall/src/md/Makefile
+xpcom/reflect/xptcall/src/md/test/Makefile
+xpcom/reflect/xptcall/src/md/unix/Makefile
+xpcom/reflect/xptcall/tests/Makefile
+xpcom/reflect/xptinfo/Makefile
+xpcom/reflect/xptinfo/public/Makefile
+xpcom/reflect/xptinfo/src/Makefile
+xpcom/reflect/xptinfo/tests/Makefile
 xpcom/proxy/Makefile
 xpcom/proxy/public/Makefile
 xpcom/proxy/src/Makefile
 xpcom/proxy/tests/Makefile
+xpcom/public/Makefile
+xpcom/sample/Makefile
+xpcom/src/Makefile
+xpcom/tests/Makefile
+xpcom/tests/dynamic/Makefile
+# -dp- Temporary until I fix the Makefile.in
+# -dp-  xpcom/tests/services/Makefile
+xpcom/threads/Makefile
+xpcom/tools/Makefile
+xpcom/tools/registry/Makefile
+#
+# End of xpcom Makefiles
+#
 silentdl/Makefile
 xpinstall/Makefile
 xpinstall/public/Makefile

build/mac/BuildNGLayout.pl

@@ -18,25 +18,20 @@
 #
 
 #
-# nglayout build script (debug)
+# build script (optimized)
 #
 use Mac::Processes;
 use NGLayoutBuildList;
 use Cwd;
 use Moz;
 
-# configuration variables
-$DEBUG = 0;
-$ALIAS_SYM_FILES = $DEBUG;
-$CLOBBER_LIBS = 1;
-$MOZ_FULLCIRCLE = 0;
-$CARBON = 0;				# turn on to build with TARGET_CARBON
-$PROFILE = 0;				# do not turn on with optimized builds
-
-# The following two options will delete all files, but leave the directory structure intact.
-$CLOBBER_DIST_ALL 	= 0;		# turn on to clobber all files inside dist (headers, xsym and libs)
-$CLOBBER_DIST_LIBS 	= 0;		# turn on to clobber the aliases to libraries and sym files in dist
-$USE_XPIDL 			= 1;		# turn on to use the XPIDL plugin to generate files.
+#-----------------------------------------------
+# configuration variables that globally affect what is built
+#-----------------------------------------------
+$DEBUG					= 0;
+$CARBON					= 0;	# turn on to build with TARGET_CARBON
+$MOZ_FULLCIRCLE			= 0;
+$PROFILE				= 0;
 
 $pull{all} 			= 0;
 $pull{lizard} 		= 0;
@@ -46,18 +41,46 @@ $pull{netlib} 		= 0;
 $pull{nglayout} 	= 0;
 $pull{mac} 			= 0;
 
-$build{all} 		= 1;				# turn off to do individual builds
-$build{dist} 		= 0;
-$build{runtime}		= 0;
-$build{stubs} 		= 0;
-$build{common} 		= 0;
-$build{intl} 		= 0;
-$build{nglayout} 	= 0;
-$build{resources} 	= 0;
-$build{editor} 		= 0;
-$build{mailnews} 	= 0;
-$build{viewer} 		= 0;
-$build{xpapp} 		= 0;
+$build{all} 			= 0;			# turn off to do individual builds, or to do "most"
+$build{most} 			= 0;			# turn off to do individual builds
+$build{dist} 			= 0;
+$build{dist_runtime}	= 0;			# implied by $build{dist}
+$build{resources} 		= 0;
+$build{stubs} 			= 0;
+$build{runtime}			= 0;
+$build{common} 			= 1;
+$build{intl} 			= 1;
+$build{nglayout} 		= 1;
+$build{editor} 			= 1;
+$build{mailnews} 		= 1;
+$build{viewer} 			= 1;
+$build{xpapp} 			= 1;
+
+#-----------------------------------------------
+# configuration variables that affect the manner
+# of building, but possibly affecting
+# the outcome.
+#-----------------------------------------------
+$ALIAS_SYM_FILES		= $DEBUG;
+$CLOBBER_LIBS			= 1;	# turn on to clobber existing libs and .xSYM files before
+								# building each project							
+# The following two options will delete all dist files (if you have $build{dist} turned on),
+# but leave the directory structure intact.
+$CLOBBER_DIST_ALL 		= 1;	# turn on to clobber all aliases/files inside dist (headers/xsym/libs)
+$CLOBBER_DIST_LIBS 		= 0;	# turn on to clobber only aliases/files for libraries/sym files in dist
+
+#-----------------------------------------------
+# configuration variables that are preferences for the build style,
+# and do not affect what is built.
+#-----------------------------------------------
+$CodeWarriorLib::CLOSE_PROJECTS_FIRST
+						= 1;
+								# 1 = close then make (for development),
+								# 0 = make then close (for tinderbox).
+$USE_TIMESTAMPED_LOGS 	= 1;
+#-----------------------------------------------
+# END OF CONFIG SWITCHES
+#-----------------------------------------------
 
 if ($pull{all})
 {
@@ -73,17 +96,38 @@ if ($build{all})
 		$build{$k} = 1;
 	}
 }
+if ($build{most})
+{
+### Just uncomment/comment to get the ones you want (if "most" is selected).
+#	$build{dist}		= 1;
+#	$build{dist_runtime}= 1;
+#	$build{resources}	= 1;
+#   $build{stubs}		= 1;
+#   $build{runtime}		= 1;
+#	$build{common}		= 1; # Requires intl
+#   $build{intl}		= 1; 
+#	$build{nglayout}	= 1;
+#	$build{editor}		= 1;
+#	$build{mailnews}	= 1;
+#	$build{viewer}		= 1;
+	$build{xpapp}		= 1;
+}
 
 # do the work
-# you should not have to edit anything bellow
+# you should not have to edit anything below
 
 chdir("::::");
 $MOZ_SRC = cwd();
 
-$USE_TIMESTAMPED_LOGS = 0;
+if ($MOZ_FULLCIRCLE)
+{
+	#// Get the Build Number for the Master.ini(Full Circle) n'stuff
+	$buildnum = Moz::SetBuildNumber();
+}
+
 if ($USE_TIMESTAMPED_LOGS)
 {
-	#Use timestamped names so that you don't clobber your previous log file!
+	#Use time-stamped names so that you don't clobber your previous log file!
 	my $now = localtime();
 	while ($now =~ s@:@.@) {} # replace all colons by periods
 	my $logdir = ":Build Logs:";
@@ -114,5 +158,4 @@ BuildDist();
 chdir($MOZ_SRC);
 BuildProjects();
 
-print "Build layout complete\n";
-
+print "Build complete\n";

build/mac/BuildNGLayoutDebug.pl

@@ -18,7 +18,7 @@
 #
 
 #
-# nglayout build script (debug)
+# build script (debug)
 #
 use Mac::Processes;
 use NGLayoutBuildList;
@@ -30,7 +30,6 @@ use Moz;
 #-----------------------------------------------
 $DEBUG					= 1;
 $CARBON					= 0;	# turn on to build with TARGET_CARBON
-$USE_XPIDL				= 1;	# turn on to use the XPIDL plugin to generate files.
 $MOZ_FULLCIRCLE			= 0;
 $PROFILE				= 0;
 
@@ -44,17 +43,18 @@ $pull{mac} 				= 0;
 
 $build{all} 			= 1;			# turn off to do individual builds, or to do "most"
 $build{most} 			= 1;			# turn off to do individual builds
-$build{dist} 			= 0;
-$build{runtime}			= 0;
+$build{dist} 			= 1;
+$build{dist_runtime}	= 0;			# implied by $build{dist}
+$build{resources} 		= 0;
 $build{stubs} 			= 0;
-$build{common} 			= 0;
+$build{runtime}			= 0;
+$build{common} 			= 1;
 $build{intl} 			= 0;
 $build{nglayout} 		= 0;
-$build{resources} 		= 0;
 $build{editor} 			= 0;
 $build{mailnews} 		= 0;
 $build{viewer} 			= 0;
-$build{xpapp} 			= 0;
+$build{xpapp} 			= 1;
 
 #-----------------------------------------------
 # configuration variables that affect the manner
@@ -64,9 +64,9 @@ $build{xpapp} 			= 0;
 $ALIAS_SYM_FILES		= $DEBUG;
 $CLOBBER_LIBS			= 1;	# turn on to clobber existing libs and .xSYM files before
 								# building each project							
-# The following two options will delete all files,
+# The following two options will delete all dist files (if you have $build{dist} turned on),
 # but leave the directory structure intact.
-$CLOBBER_DIST_ALL 		= 0;	# turn on to clobber all aliases/files inside dist (headers/xsym/libs)
+$CLOBBER_DIST_ALL 		= 1;	# turn on to clobber all aliases/files inside dist (headers/xsym/libs)
 $CLOBBER_DIST_LIBS 		= 0;	# turn on to clobber only aliases/files for libraries/sym files in dist
 
 #-----------------------------------------------
@@ -78,6 +78,9 @@ $CodeWarriorLib::CLOSE_PROJECTS_FIRST
 								# 1 = close then make (for development),
 								# 0 = make then close (for tinderbox).
 $USE_TIMESTAMPED_LOGS 	= 1;
+#-----------------------------------------------
+# END OF CONFIG SWITCHES
+#-----------------------------------------------
 
 if ($pull{all})
 {
@@ -97,11 +100,13 @@ if ($build{most})
 {
 ### Just uncomment/comment to get the ones you want (if "most" is selected).
 #	$build{dist}		= 1;
+#	$build{dist_runtime}= 1;
+#	$build{resources}	= 1;
 #   $build{stubs}		= 1;
+#   $build{runtime}		= 1;
 #	$build{common}		= 1; # Requires intl
 #   $build{intl}		= 1; 
 #	$build{nglayout}	= 1;
-#	$build{resources}	= 1;
 #	$build{editor}		= 1;
 #	$build{mailnews}	= 1;
 #	$build{viewer}		= 1;
@@ -146,12 +151,9 @@ if ($pull{all}) {
    Checkout();
 }
 
-if ($build{dist}) {
-	chdir($MOZ_SRC);
-	BuildDist();
-}
+BuildDist();
 
 chdir($MOZ_SRC);
 BuildProjects();
 
-print "Build layout complete\n";
+print "Build complete\n";

build/mac/NGLayoutBuildList.pm

@@ -11,6 +11,7 @@ use vars qw( @ISA @EXPORT );
 use Mac::StandardFile;
 use Mac::Processes;
 use Mac::Events;
+use Mac::Files;
 use Cwd;
 use File::Path;
 use File::Copy;
@@ -158,8 +159,17 @@ sub EmptyTree($)
 	foreach $sub (readdir(DIR))
 	{
 		my $fullpathname = $root.$sub; # -f, -d only work on full paths
-		if (-d $fullpathname) #if it's a directory (returns true for the alias of a directory, false for a broken alias)
+
+		# Don't call empty tree for the alias of a directory.
+		# -d returns true for the alias of a directory, false for a broken alias)
+
+		if (-d $fullpathname)
 		{
+			if (-l $fullpathname)
+			{
+				print "¥¥¥ $fullpathname is an alias to a directory. Not emptying!\n";
+				next;
+			}
 			EmptyTree($fullpathname.":");
 			if ($sub eq "CVS")
 			{
@@ -273,16 +283,23 @@ sub BuildClientDist()
     InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",					"$distdirectory:libreg:");
 
 	#XPCOM
-	InstallFromManifest(":mozilla:xpcom:idl:MANIFEST",								"$distdirectory:idl:");
-	#EmptyTree("$distdirectory:xpcom:");#// XXX temporary - needed during changeover only.
-    InstallFromManifest(":mozilla:xpcom:public:MANIFEST",							"$distdirectory:xpcom:");
-    #!$main::USE_XPIDL && InstallFromManifest(":mozilla:xpcom:public:MANIFEST_TEMP","$distdirectory:xpcom:"); #// XXX remove
-	InstallFromManifest(":mozilla:xpcom:src:MANIFEST",								"$distdirectory:xpcom:");
-	InstallFromManifest(":mozilla:xpcom:libxpt:public:MANIFEST",					"$distdirectory:xpcom:");
-	InstallFromManifest(":mozilla:xpcom:libxpt:xptinfo:public:MANIFEST",			"$distdirectory:xpcom:");
-	InstallFromManifest(":mozilla:xpcom:libxpt:xptcall:public:MANIFEST",			"$distdirectory:xpcom:");
-	$main::USE_XPIDL && #// XXX remove
+	InstallFromManifest(":mozilla:xpcom:base:MANIFEST_IDL",							"$distdirectory:idl:");
+	InstallFromManifest(":mozilla:xpcom:io:MANIFEST_IDL",							"$distdirectory:idl:");
+	InstallFromManifest(":mozilla:xpcom:ds:MANIFEST_IDL",							"$distdirectory:idl:");
+
 	BuildOneProject(":mozilla:xpcom:macbuild:XPCOMIDL.mcp", 						"headers", "", 0, 0, 0);
+
+	InstallFromManifest(":mozilla:xpcom:base:MANIFEST",								"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:components:MANIFEST",						"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:ds:MANIFEST",								"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:io:MANIFEST",								"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:threads:MANIFEST",							"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:proxy:public:MANIFEST",						"$distdirectory:xpcom:");
+
+	InstallFromManifest(":mozilla:xpcom:reflect:xptinfo:public:MANIFEST",			"$distdirectory:xpcom:");
+	InstallFromManifest(":mozilla:xpcom:reflect:xptcall:public:MANIFEST",			"$distdirectory:xpcom:");
+
+	InstallFromManifest(":mozilla:xpcom:typelib:xpt:public:MANIFEST",					"$distdirectory:xpcom:");
 	
 	#ZLIB
     InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST",						"$distdirectory:zlib:");
@@ -307,11 +324,11 @@ sub BuildClientDist()
 	#LIVECONNECT
 	InstallFromManifest(":mozilla:js:src:liveconnect:MANIFEST",						"$distdirectory:liveconnect:");
 	
-	#XPCONNECT
-	InstallFromManifest(":mozilla:js:src:xpconnect:public:MANIFEST",				"$distdirectory:xpconnect:");
+	#XPCONNECT	
 	InstallFromManifest(":mozilla:js:src:xpconnect:idl:MANIFEST",					"$distdirectory:idl:");
 	BuildOneProject(":mozilla:js:macbuild:XPConnectIDL.mcp", 						"headers", "", 0, 0, 0);
-	
+	InstallFromManifest(":mozilla:js:src:xpconnect:public:MANIFEST",				"$distdirectory:xpconnect:");
+
 	#CAPS
 	InstallFromManifest(":mozilla:caps:public:MANIFEST",							"$distdirectory:caps:");
 	InstallFromManifest(":mozilla:caps:include:MANIFEST",							"$distdirectory:caps:");
@@ -370,10 +387,6 @@ sub BuildClientDist()
     InstallFromManifest(":mozilla:network:protocol:sockstub:MANIFEST",				"$distdirectory:network:");
     InstallFromManifest(":mozilla:network:module:MANIFEST",							"$distdirectory:network:module");
 
-	#BASE
-    InstallFromManifest(":mozilla:base:src:MANIFEST",								"$distdirectory:base:");
-    InstallFromManifest(":mozilla:base:public:MANIFEST",							"$distdirectory:base:");
-
 	#WALLET
     InstallFromManifest(":mozilla:extensions:wallet:public:MANIFEST",				"$distdirectory:wallet:");
 
@@ -430,12 +443,10 @@ sub BuildClientDist()
     InstallFromManifest(":mozilla:rdf:base:idl:MANIFEST",							"$distdirectory:idl:");
 	#EmptyTree("$distdirectory:rdf:");#// XXX temporary - needed during changeover only.
     InstallFromManifest(":mozilla:rdf:base:public:MANIFEST",						"$distdirectory:rdf:");
-    #!$main::USE_XPIDL && InstallFromManifest(":mozilla:rdf:base:public:MANIFEST_TEMP","$distdirectory:rdf:"); #// XXX remove
     InstallFromManifest(":mozilla:rdf:util:public:MANIFEST",						"$distdirectory:rdf:");
     InstallFromManifest(":mozilla:rdf:content:public:MANIFEST",						"$distdirectory:rdf:");
     InstallFromManifest(":mozilla:rdf:datasource:public:MANIFEST",					"$distdirectory:rdf:");
     InstallFromManifest(":mozilla:rdf:build:MANIFEST",								"$distdirectory:rdf:");
-    $main::USE_XPIDL && #// remove
 	BuildOneProject(":mozilla:rdf:macbuild:RDFIDL.mcp", 							"headers", "", 0, 0, 0);
     
     #BRPROF
@@ -716,7 +727,12 @@ sub BuildCommonProjects()
 
 	BuildOneProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",						"xpcom$D.shlb", "xpcom.toc", 1, $main::ALIAS_SYM_FILES, 0);
 	
-	$main::USE_XPIDL && #// XXX remove
+	# This next line builds the dummy base shlb. On 99/05/24 :mozilla:base: has gone away and its code
+	# is now included in the xpcom library. But many projects still link with base, and it is faster to
+	# make a dummy base library than to remove base from all the projects in the tree. Eventually, though,
+	# we want to do this.
+	BuildOneProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",						"base$D.shlb", "", 1, 0, 0);
+	
 	BuildOneProject(":mozilla:xpcom:macbuild:XPCOMIDL.mcp",						"xpcom.xpt", "", 1, 0, 1);
 
 	BuildOneProject(":mozilla:js:macbuild:JavaScript.mcp",						"JavaScript$D.shlb", "JavaScript.toc", 1, $main::ALIAS_SYM_FILES, 0);
@@ -731,16 +747,10 @@ sub BuildCommonProjects()
 	
 	BuildOneProject(":mozilla:modules:oji:macbuild:oji.mcp",					"oji$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 0);
 
-	BuildOneProject(":mozilla:base:macbuild:base.mcp",							"base$D.shlb", "base.toc", 1, $main::ALIAS_SYM_FILES, 0);
-
 	BuildOneProject(":mozilla:modules:libpref:macbuild:libpref.mcp",			"libpref$D.shlb", "libpref.toc", 1, $main::ALIAS_SYM_FILES, 0);
 
 	BuildOneProject(":mozilla:profile:macbuild:profile.mcp",					"profile$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 1);
 
-	BuildOneProject(":mozilla:xpcom:libxpt:macbuild:libxpt.mcp",				"libxpt$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 0);
-
-	BuildOneProject(":mozilla:js:macbuild:XPConnect.mcp",						"XPConnect$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 1);
-	BuildOneProject(":mozilla:js:macbuild:XPConnectIDL.mcp", 					"xpconnect.xpt", "", 1, 0, 1);
 
 	BuildOneProject(":mozilla:modules:libutil:macbuild:libutil.mcp",			"libutil$D.shlb", "libutil.toc", 1, $main::ALIAS_SYM_FILES, 0);
 
@@ -826,9 +836,15 @@ sub BuildFolderResourceAliases($$)
 	
 	# make aliases for each one into the dest directory
 	print("Placing aliases to all files from $src_dir in $dest_dir\n");
-	for ( @resource_files ) {
+	for ( @resource_files )
+	{
 		next if $_ eq "CVS";
-		
+		#print("    Doing $_\n");
+		if (-l $src_dir.$_)
+		{
+			print("   $_ is an alias\n");
+			next;
+		}
 		my($file_name) = $src_dir . $_;	
 		MakeAlias($file_name, $dest_dir);
 	}
@@ -864,7 +880,7 @@ sub MakeResourceAliases()
 	MakeAlias(":mozilla:webshell:tests:viewer:resources:viewer.properties",				"$resource_dir");
 	MakeAlias(":mozilla:intl:uconv:src:charsetalias.properties",						"$resource_dir");
 	MakeAlias(":mozilla:intl:uconv:src:maccharset.properties",							"$resource_dir");
-	MakeAlias(":mozilla:extensions:wallet:src:wallet.properties",				"$resource_dir");
+	MakeAlias(":mozilla:extensions:wallet:src:wallet.properties",						"$resource_dir");
 
 	my($html_dir) = "$resource_dir" . "html:";
 	MakeAlias(":mozilla:layout:html:base:src:broken-image.gif",							"$html_dir");
@@ -878,7 +894,6 @@ sub MakeResourceAliases()
 	my($rdf_dir) = "$resource_dir" . "rdf:";
 	BuildFolderResourceAliases(":mozilla:rdf:resources:",								"$rdf_dir");
 
-	$main::USE_XPIDL && #// XXX remove
 	BuildOneProject(":mozilla:rdf:macbuild:RDFIDL.mcp",									"rdf.xpt", "", 1, 0, 1);
 	
 	my($profile_dir) = "$resource_dir" . "profile:";
@@ -990,10 +1005,10 @@ sub BuildLayoutProjects()
 
 	BuildOneProject(":mozilla:htmlparser:macbuild:htmlparser.mcp",				"htmlparser$D.shlb", "htmlparser.toc", 1, $main::ALIAS_SYM_FILES, 0);
 
-	BuildOneProject(":mozilla:dom:macbuild:dom.mcp",							"dom$D.shlb", "dom.toc", 1, $main::ALIAS_SYM_FILES, 0);
-
 	BuildOneProject(":mozilla:gfx:macbuild:gfx.mcp",							"gfx$D.shlb", "gfx.toc", 1, $main::ALIAS_SYM_FILES, 0);
 
+	BuildOneProject(":mozilla:dom:macbuild:dom.mcp",							"dom$D.shlb", "dom.toc", 1, $main::ALIAS_SYM_FILES, 0);
+
 	BuildOneProject(":mozilla:modules:plugin:macbuild:plugin.mcp",				"plugin$D.shlb", "plugin.toc", 1, $main::ALIAS_SYM_FILES, 0);
 
 	BuildOneProject(":mozilla:layout:macbuild:layout.mcp",						"layout$D.shlb", "layout.toc", 1, $main::ALIAS_SYM_FILES, 1);

caps/src/makefile.win

@@ -108,7 +108,7 @@ LINCS= $(LINCS) \
 LLIBS = \
 	$(LIBNSPR)			\
 	$(DIST)\lib\plc3.lib	\
-	$(DIST)\lib\xpcom32.lib         \
+	$(DIST)\lib\xpcom.lib         \
 	$(DIST)\lib\xplib.lib           \
 	$(DIST)\lib\zlib.lib \
 	$(NULL)

config/rules.mak

@@ -656,7 +656,11 @@ XPIDL_TYPELIBS=$(XPIDL_TYPELIBS:.\=.\_xpidlgen\)
 .idl{$(XPIDL_GEN_DIR)}.xpt:
         $(XPIDL_PROG) -m typelib $(XPIDL_INCLUDES) -o $* $<
 
-TYPELIB = $(XPIDL_GEN_DIR)\$(MODULE).xpt
+!ifndef XPILD_MODULE
+XPILD_MODULE = $(MODULE)
+!endif
+
+TYPELIB = $(XPIDL_GEN_DIR)\$(XPILD_MODULE).xpt
 
 $(TYPELIB): $(XPIDL_TYPELIBS)
         @echo +++ make: Creating typelib: $(TYPELIB)
@@ -708,6 +712,8 @@ clobber::
 clobber_all::
         -$(RM_R) $(GARBAGE) 2> NUL
 
+GARBAGE=$(GARBAGE) $(XPIDL_GEN_DIR) $(DIST)\bin\components\$(XPIDL_MODULE).xpt
+
 !endif
 !endif
 

config/rules.mk

@@ -887,12 +887,16 @@ endif
 # Export the elements of $(XPIDLSRCS), generating .h and .xpt files and
 # moving them to the appropriate places.
 
+ifndef XPIDL_MODULE
+XPIDL_MODULE = $(MODULE)
+endif
+
 ifneq ($(XPIDLSRCS),)
-ifeq ($(MODULE),) # we need $(MODULE) to make $(MODULE).xpt
+ifeq ($(XPIDL_MODULE),) # we need $(XPIDL_MODULE) to make $(XPIDL_MODULE).xpt
 export:: FORCE
 	@echo
 	@echo "*** Error processing XPIDLSRCS:"
-	@echo "Please define MODULE when defining XPIDLSRCS,"
+	@echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS,"
 	@echo "so we have a module name to use when creating MODULE.xpt."
 	@echo; sleep 2; false
 else
@@ -919,15 +923,15 @@ export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(XPDIST)/include
 
 ifndef NO_GEN_XPT
 # generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
-# into $(MODULE).xpt and export it to $(DIST)/bin/components.
+# into $(XPIDL_MODULE).xpt and export it to $(DIST)/bin/components.
 $(XPIDL_GEN_DIR)/%.xpt: %.idl $(IDL_COMPILE) $(XPIDL_GEN_DIR)
 	$(XPIDL_COMPILE) -m typelib -w -I $(XPDIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
 
-$(XPIDL_GEN_DIR)/$(MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
-	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(MODULE).xpt $^
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
+	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $^
 
-install:: $(XPIDL_GEN_DIR)/$(MODULE).xpt
-	$(INSTALL) -m 444 $(XPIDL_GEN_DIR)/$(MODULE).xpt $(DIST)/bin/components
+install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
+	$(INSTALL) -m 444 $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/components
 
 endif
 

docshell/base/nsWebShell.cpp

@@ -33,7 +33,6 @@
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsIEventQueueService.h"
-#include "nsXPComCIID.h"
 #include "nsCRT.h"
 #include "nsVoidArray.h"
 #include "nsString.h"

dom/src/build/Makefile.in

@@ -42,7 +42,6 @@ INCLUDES +=  -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \
 	-I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(srcdir)/../base -I$(PUBLIC)/jsurl
 
 GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_TOOLKIT))
-BASE_DSO_FLAGS= $(addprefix -lgmbase, $(MOZ_TOOLKIT))
 
 SHARED_LIBRARY_LIBS =		       \
 	$(DIST)/lib/libjsdombase_s.a   \

dom/src/build/makefile.win

@@ -47,11 +47,10 @@ MISCDEP =						\
 	$(DIST)\lib\jsdomhtml_s.lib			\
 	$(DIST)\lib\jsdomcss_s.lib			\
 	$(DIST)\lib\jsurl.lib				\
-	$(DIST)\lib\raptorbase.lib			\
 	$(DIST)\lib\raptorgfxwin.lib			\
 	$(DIST)\lib\netlib.lib				\
 	$(DIST)\lib\js32$(VERSION_NUMBER).lib		\
-	$(DIST)\lib\xpcom32.lib				\
+	$(DIST)\lib\xpcom.lib				\
 	$(DIST)\lib\plds3.lib			\
 	$(DIST)\lib\plc3.lib			\
 	$(LIBNSPR)
@@ -70,11 +69,10 @@ LLIBS=							\
 	$(DIST)\lib\jsdomhtml_s.lib			\
 	$(DIST)\lib\jsdomcss_s.lib			\
 	$(DIST)\lib\jsurl.lib				\
-	$(DIST)\lib\raptorbase.lib			\
 	$(DIST)\lib\raptorgfxwin.lib			\
 	$(DIST)\lib\netlib.lib				\
 	$(DIST)\lib\js32$(VERSION_NUMBER).lib		\
-	$(DIST)\lib\xpcom32.lib				\
+	$(DIST)\lib\xpcom.lib				\
 	$(DIST)\lib\plds3.lib			\
 	$(DIST)\lib\plc3.lib			\
 	$(LIBNSPR)

dom/tools/Makefile.in

@@ -55,7 +55,6 @@ INCLUDES += \
 			$(NULL)
 
 LIBS+=\
-	-lraptorbase	\
 	$(NSPR_LIBS) \
 	-lxpcom	\
 	-lreg	\

dom/tools/Makefile.win

@@ -41,7 +41,7 @@ OBJS = \
 
 
 LLIBS= \
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)                     \
   -SUBSYSTEM:CONSOLE
 

editor/base/makefile.win

@@ -119,9 +119,8 @@ LCFLAGS = \
 
 # These are the libraries we need to link with to create the dll
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\plc3.lib       \
- $(DIST)\lib\raptorbase.lib       \
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\raptorwidget_s.lib		\
  $(LIBNSPR)  

editor/guimgr/src/makefile.win

@@ -50,7 +50,7 @@ LCFLAGS = \
         $(NULL)
 
 # These are the libraries we need to link with to create the dll
-LLIBS=$(DIST)\lib\xpcom32.lib $(DIST)\lib\raptorbase.lib
+LLIBS=$(DIST)\lib\xpcom.lib
 
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

editor/txmgr/src/Makefile.in

@@ -35,7 +35,7 @@ CPPSRCS =                           \
 
 EXTRA_DSO_LDOPTS = \
     -L$(DIST)/lib  \
-    -lraptorbase   \
+    -lxpcom   \
     $(NULL)
 
 MODULE = txmgr

editor/txmgr/src/makefile.win

@@ -44,14 +44,14 @@ LINCS=-I$(PUBLIC)\xpcom \
       -I$(PUBLIC)\raptor
 
 LLIBS=					\
- $(DIST)\lib\raptorbase.lib
+ $(DIST)\lib\xpcom.lib
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = txmgr
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 MISCDEP =				\
- $(DIST)\lib\raptorbase.lib
+ $(DIST)\lib\xpcom.lib
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -59,7 +59,7 @@ LCFLAGS = \
         $(NULL)
 
 # These are the libraries we need to link with to create the dll
-LLIBS=$(DIST)\lib\xpcom32.lib $(DIST)\lib\raptorbase.lib
+LLIBS=$(DIST)\lib\xpcom.lib
 
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

editor/txmgr/tests/Makefile.in

@@ -26,7 +26,6 @@ CPPSRCS		= TestTXMgr.cpp
 INCLUDES	+= -I$(DIST)/include
 
 LIBS		= \
-		  -lraptorbase \
 		  -lxpcom \
 		  -lreg \
 		  $(NSPR_LIBS) \

editor/txmgr/tests/makefile.win

@@ -34,8 +34,7 @@ LINCS=-I$(PUBLIC)\txmgr \
     -I$(PUBLIC)\dom
 
 LLIBS=					\
- $(DIST)\lib\raptorbase.lib		\
- $(DIST)\lib\xpcom32.lib
+ $(DIST)\lib\xpcom.lib
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
 !endif

editor/txtsvc/src/Makefile.in

@@ -34,7 +34,7 @@ CPPSRCS =                      \
 
 EXTRA_DSO_LDOPTS = \
     -L$(DIST)/lib  \
-    -lraptorbase   \
+    -lxpcom   \
     $(NULL)
 
 MODULE = txtsvc

editor/txtsvc/src/makefile.win

@@ -44,14 +44,14 @@ LINCS=-I$(PUBLIC)\xpcom \
       -I$(PUBLIC)\raptor
 
 LLIBS=					\
- $(DIST)\lib\raptorbase.lib
+ $(DIST)\lib\xpcom.lib
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = txtsvc
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 MISCDEP =				\
- $(DIST)\lib\raptorbase.lib
+ $(DIST)\lib\xpcom.lib
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -59,7 +59,7 @@ LCFLAGS = \
         $(NULL)
 
 # These are the libraries we need to link with to create the dll
-LLIBS=$(DIST)\lib\xpcom32.lib $(DIST)\lib\raptorbase.lib
+LLIBS=$(DIST)\lib\xpcom.lib
 
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

extensions/pics/src/Makefile.in

@@ -46,7 +46,7 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 MODULE = pics
 
-REQUIRES = js netlib xpcom xppref32 raptorbase nspr
+REQUIRES = js netlib xpcom xppref32 nspr
 
 MKSHLIB :=
 

extensions/pics/src/makefile.win

@@ -74,9 +74,9 @@ LLIBS	= \
  $(LIBNSPR) \
  $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
  $(DIST)\lib\netlib.lib \
- $(DIST)\lib\xpcom32.lib \
+ $(DIST)\lib\xpcom.lib \
  $(DIST)\lib\xppref32.lib \
- $(DIST)\lib\raptorbase.lib \
+ $(DIST)\lib\xpcom.lib \
  $(DIST)\lib\raptorhtmlpars.lib \
  $(HASHLIBS)
 

extensions/pics/tests/Makefile.in

@@ -32,7 +32,6 @@ LIBS		= \
 	-lxpcom \
 	-lreg \
 	-lpics \
-	-lraptorbase \
 	$(NSPR_LIBS) \
 	$(NULL)
 

extensions/pics/tests/makefile.win

@@ -45,8 +45,7 @@ LINCS = -I$(PUBLIC)/js \
 
 LLIBS=				\
  $(DIST)\lib\pics.lib	\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib \
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\plc3.lib \
  $(LIBNSPR) \
 

extensions/wallet/src/makefile.win

@@ -39,11 +39,10 @@ EXPORTS= $(NULL)
 
 LLIBS=$(LLIBS)  $(LIBNSPR)		\
 	$(WALLETLIBS)			\
-	$(DIST)\lib\raptorbase.lib	\
 	$(DIST)\lib\secfreenav32.lib	\
 	$(DIST)\lib\plc3.lib	\
 	$(DIST)\lib\xppref32.lib	\
-	$(DIST)\lib\xpcom32.lib		\
+	$(DIST)\lib\xpcom.lib		\
 	$(DIST)\lib\xplib.lib		\
 	$(DIST)\lib\netlib.lib		\
 	$(NULL)

gfx/public/MANIFEST

@@ -28,3 +28,6 @@ nsIDeviceContextSpec.h
 nsIDeviceContextSpecFactory.h
 nsColorNameIDs.h
 nsIDrawingSurface.h
+nsITimer.h
+nsITimerCallback.h
+nsRepeater.h

gfx/public/Makefile.in

@@ -49,7 +49,9 @@ EXPORTS =				\
   nsIDeviceContextSpecFactory.h \
   nsIDrawingSurface.h \
   nsColorNameIDs.h \
-	$(NULL)
+  nsITimer.h \
+  nsITimerCallback.h \
+  $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 

gfx/public/makefile.win

@@ -45,6 +45,8 @@ EXPORTS =				\
   nsIDeviceContextSpecFactory.h \
   nsIDrawingSurface.h \
   nsColorNameIDs.h \
+  nsITimer.h \
+  nsITimerCallback.h \
 	$(NULL)
 
 MODULE=raptor 

gfx/public/nsITimer.h

@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef nsITimer_h___
-#define nsITimer_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-
-class nsITimer;
-class nsITimerCallback;
-
-// Implementations of nsITimer should be written such that there are no limitations
-// on what can be called by the TimerCallbackFunc. On platforms like the Macintosh this
-// means that callback functions must be called from the main event loop NOT from
-// an interrupt.
-
-/// Signature of timer callback function
-typedef void
-(*nsTimerCallbackFunc) (nsITimer *aTimer, void *aClosure);
-
-/// Interface IID for nsITimer
-#define NS_ITIMER_IID         \
-{ 0x497eed20, 0xb740, 0x11d1,  \
-{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
-
-/**
- * Timer class, used to invoke a function or method after a fixed
- * millisecond interval. <B>Note that this interface is subject to
- * change!</B>
- */
-class nsITimer : public nsISupports {
-public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMER_IID)
-  
-  /**
-   * Initialize a timer to fire after the given millisecond interval.
-   * This version takes a function to call and a closure to pass to
-   * that function.
-   *
-   * @param aFunc - The function to invoke
-   * @param aClosure - an opaque pointer to pass to that function
-   * @param aRepeat - (Not yet implemented) One-shot or repeating
-   * @param aDelay - The millisecond interval
-   * @result - NS_OK if this operation was successful
-   */
-  virtual nsresult Init(nsTimerCallbackFunc aFunc,
-                        void *aClosure,
-//                      PRBool aRepeat, 
-                        PRUint32 aDelay)=0;
-
-  /**
-   * Initialize a timer to fire after the given millisecond interval.
-   * This version takes an interface of type <code>nsITimerCallback</code>. 
-   * The <code>Notify</code> method of this method is invoked.
-   *
-   * @param aCallback - The interface to notify
-   * @param aRepeat - (Not yet implemented) One-shot or repeating
-   * @param aDelay - The millisecond interval
-   * @result - NS_OK if this operation was successful
-   */
-  virtual nsresult Init(nsITimerCallback *aCallback,
-//                      PRBool aRepeat, 
-                        PRUint32 aDelay)=0;
-
-  /// Cancels the timeout
-  virtual void Cancel()=0;
-
-  /// @return the millisecond delay of the timeout
-  virtual PRUint32 GetDelay()=0;
-
-  /// Change the millisecond interval for the timeout
-  virtual void SetDelay(PRUint32 aDelay)=0;
-
-  /// @return the opaque pointer
-  virtual void* GetClosure()=0;
-};
-
-/** Factory method for creating an nsITimer */
-extern NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
-
-#endif

gfx/public/nsRepeater.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRepeater_h___
+#define nsRepeater_h___
+
+#include "nscore.h"
+
+class EventRecord;
+
+class NS_NET Repeater {
+  public:
+  
+    Repeater();
+    virtual ~Repeater();
+    
+    virtual	void RepeatAction(const EventRecord &aMacEvent) = 0;
+    
+    void StartRepeating();
+    void StopRepeating();
+    void StartIdling();
+    void StopIdling();
+    
+    static void DoRepeaters(const EventRecord &aMacEvent);
+    static void DoIdlers(const EventRecord &aMacEvent);
+    
+  protected:
+    
+    void AddToRepeatList();
+    void RemoveFromRepeatList();
+    void AddToIdleList();
+    void RemoveFromIdleList();
+    
+    static Repeater* sRepeaters;
+    static Repeater* sIdlers;
+    
+    bool mRepeating;
+    bool mIdling;
+    Repeater* mPrevRptr;
+    Repeater* mNextRptr;
+    Repeater* mPrevIdlr;
+    Repeater* mNextIdlr;
+};
+
+#endif

gfx/src/gtk/Makefile.in

@@ -43,7 +43,8 @@ CPPSRCS = \
 	nsGfxFactoryGTK.cpp \
 	nsRenderingContextGTK.cpp \
 	nsImageGTK.cpp \
-	nsRegionGTK.cpp 
+	nsRegionGTK.cpp \
+	nsTimer.cpp 
 
 CSRCS = \
 	nsPrintdGTK.c

gfx/src/mac/nsRepeater.cpp

@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsRepeater.h"
+
+Repeater* Repeater::sRepeaters = 0;
+Repeater* Repeater::sIdlers = 0;
+
+Repeater::Repeater()
+{
+  mRepeating = false;
+  mIdling = false;
+  mPrevRptr = 0;
+  mNextRptr = 0;
+  mPrevIdlr = 0;
+  mNextIdlr = 0;
+}
+
+Repeater::~Repeater()
+{
+  if (mRepeating) RemoveFromRepeatList();
+  if (mIdling) RemoveFromIdleList();
+}
+
+// protected helper functs
+
+//----------------------------------------------------------------------------
+void Repeater::AddToRepeatList()
+{
+  if (sRepeaters)
+  {
+    sRepeaters->mPrevRptr = this;
+    mNextRptr = sRepeaters;
+  }
+  sRepeaters = this;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::RemoveFromRepeatList()
+{
+  if (sRepeaters == this) sRepeaters = mNextRptr;
+  if (mPrevRptr) mPrevRptr->mNextRptr = mNextRptr;
+  if (mNextRptr) mNextRptr->mPrevRptr = mPrevRptr;
+  mPrevRptr = 0;
+  mNextRptr = 0;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::AddToIdleList()
+{
+  if (sIdlers)
+  {
+    sIdlers->mPrevIdlr = this;
+    mNextIdlr = sIdlers;
+  }
+  sIdlers = this;
+}
+
+//----------------------------------------------------------------------------
+void Repeater::RemoveFromIdleList()
+{
+  if (sIdlers == this) sIdlers = mNextIdlr;
+  if (mPrevIdlr) mPrevIdlr->mNextIdlr = mNextIdlr;
+  if (mNextIdlr) mNextIdlr->mPrevIdlr = mPrevIdlr;
+  mPrevIdlr = 0;
+  mNextIdlr = 0;
+}
+
+// repeater methods
+//----------------------------------------------------------------------------
+
+void Repeater::StartRepeating()
+{
+  if (!mRepeating) 
+  {
+    AddToRepeatList();
+    mRepeating = true;
+  }
+}
+
+void Repeater::StopRepeating()
+{
+  if (mRepeating)
+  {
+    RemoveFromRepeatList();
+    mRepeating = false;
+  }
+}
+
+void Repeater::DoRepeaters(const EventRecord &aMacEvent)
+{
+  Repeater* theRepeater = sRepeaters;
+  while (theRepeater)
+  {
+    theRepeater->RepeatAction(aMacEvent);
+    theRepeater = theRepeater->mNextRptr;
+  }
+}
+
+// idler methods
+
+void Repeater::StartIdling()
+{
+  if (!mIdling) 
+  {
+    AddToIdleList();
+    mIdling = true;
+  }
+}
+
+void Repeater::StopIdling()
+{
+  if (mIdling)
+  {
+    RemoveFromIdleList();
+    mIdling = false;
+  }
+}
+
+void Repeater::DoIdlers(const EventRecord &aMacEvent)
+{
+  Repeater* theIdler = sIdlers;
+  while (theIdler)
+  {
+    theIdler->RepeatAction(aMacEvent);
+    theIdler = theIdler->mNextIdlr;
+  }
+}
+
+
+
+    

gfx/src/motif/Makefile.in

@@ -36,7 +36,6 @@ EXTRA_DSO_LDOPTS+=\
 	-L$(DIST)/bin \
 	-lxpcom \
 	-lraptorgfx \
-	-lraptorbase \
 	-lreg \
 	$(NSPR_LIBS)
 
@@ -44,6 +43,7 @@ EXTRA_DSO_LDOPTS+= $(XLDFLAGS) $(XLIBS)
 
 
 CPPSRCS=nsDeviceContextMotif.cpp nsFontMetricsMotif.cpp nsGfxFactoryMotif.cpp \
+	nsTimer.cpp \
 	nsRenderingContextMotif.cpp nsRegionMotif.cpp nsImageMotif.cpp
 
 include $(topsrcdir)/config/rules.mk

gfx/src/photon/Makefile.in

@@ -43,6 +43,7 @@ CPPSRCS = \
 	nsGfxFactoryPh.cpp					\
 	nsImagePh.cpp						\
 	nsRegionPh.cpp						\
+	nsTimer.cpp \
 	nsRenderingContextPh.cpp
 
 

gfx/src/ps/Makefile.in

@@ -32,7 +32,7 @@ MODULE=raptor
 DEFINES += -D_IMPL_NS_GFXONXP 
 CFLAGS	+= $(TK_CFLAGS)
 
-LLIBS+=$(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorbase.a $(DIST)/lib/libraptorgfx.a
+LLIBS+=$(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorgfx.a
 
 CPPSRCS = \
 	nsDeviceContextPS.cpp \

gfx/src/rhapsody/Makefile.in

@@ -33,7 +33,7 @@ MODULE=raptor
 #LCFLAGS+=-D_IMPL_NS_GFXONXP
 
 #EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lraptorgfx \
--lraptorbase -lreg $(NSPR_LIBS)
+-lreg $(NSPR_LIBS)
 
 
 #CPPSRCS = \
@@ -42,6 +42,7 @@ MODULE=raptor
 	nsGfxFactoryUnix.cpp \
 	nsRenderingContextUnix.cpp \
 	nsRegionUnix.cpp \
+	nsTimer.cpp \
 	nsImageUnix.cpp
 
 include $(topsrcdir)/config/rules.mk

gfx/src/windows/makefile.win

@@ -44,6 +44,7 @@ OBJS =                                  \
 	.\$(OBJDIR)\nsDeviceContextSpecWin.obj          \
 	.\$(OBJDIR)\nsDeviceContextSpecFactoryW.obj          \
 	.\$(OBJDIR)\nsGfxFactoryWin.obj          \
+	.\$(OBJDIR)\nsTimer.obj        \
 	$(NULL)
 
 EXPORTS= nsIRenderingContextWin.h \
@@ -70,8 +71,7 @@ LCFLAGS = \
         $(NULL)
 
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\img32$(VERSION_NUMBER).lib        \
  $(DIST)\lib\js32$(VERSION_NUMBER).lib        \
  $(DIST)\lib\util.lib           \

gfx/src/xlib/Makefile.in

@@ -42,6 +42,7 @@ CPPSRCS = nsFontMetricsXlib.cpp \
 	nsRenderingContextXlib.cpp \
 	nsDeviceContextSpecFactoryX.cpp \
 	nsDeviceContextSpecXlib.cpp \
+	nsTimer.cpp \
 	nsGfxFactoryXlib.cpp
 
 CSRCS =

gfx/tests/Makefile.in

@@ -36,7 +36,6 @@ INCLUDES+=-I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
 
 LIBS = \
 	-lraptorgfx \
-	-lraptorbase \
 	-lnetlib \
 	-lhttpurl \
 	-lgophurl \
@@ -50,7 +49,6 @@ LIBS = \
 	-lnetcnvts \
 	-lnetcache \
 	-lpwcac \
-	-lgmbase$(MOZ_TOOLKIT) \
 	$(TK_LIBS) \
 	-lxpcom \
 	-lreg \

gfx/tests/btest/makefile.win

@@ -25,9 +25,8 @@ PROGRAMS = $(PROG0)
 LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
 
 LLIBS=				\
- $(DIST)\lib\raptorbase.lib		\
  $(DIST)\lib\raptorgfxwin.lib		\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib		\
  $(DIST)\lib\img32$(VERSION_NUMBER).lib		\

gfx/tests/makefile.win

@@ -29,9 +29,8 @@ PROGRAMS = $(PROG1) $(PROG2) $(PROG3)
 LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
 
 LLIBS=				\
- $(DIST)\lib\raptorbase.lib	\
  $(DIST)\lib\raptorgfxwin.lib	\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib
 

htmlparser/robot/Makefile.in

@@ -32,12 +32,10 @@ include $(topsrcdir)/config/config.mk
 
 
 LIBS = \
-	-lraptorbase \
 	-lraptorhtmlpars \
 	-lexpat \
 	-lxmltok \
 	-lnetlib \
-	-lgmbase$(MOZ_TOOLKIT) \
 	-lftpurl \
 	-lfileurl \
 	-labouturl \

htmlparser/robot/makefile.win

@@ -23,8 +23,7 @@ DEPTH=..\..
 
 LLIBS=				\
  $(DIST)\lib\raptorhtmlpars.lib	\
- $(DIST)\lib\raptorbase.lib	\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib	\
  $(DIST)\lib\netlib.lib \

htmlparser/robot/test/makefile.win

@@ -23,14 +23,12 @@ PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
 MISCDEP=			\
  $(DIST)\lib\DebugRobot.lib	\
- $(DIST)\lib\raptorbase.lib	\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(NULL)
 
 MYLIBS=				\
  $(DIST)\lib\DebugRobot.lib	\
- $(DIST)\lib\raptorbase.lib	\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(NULL)
 
 LLIBS= $(MYLIBS)                \

htmlparser/src/makefile.win

@@ -134,8 +134,7 @@ LCFLAGS = \
 
 # These are the libraries we need to link with to create the dll
 LLIBS=        \
- $(DIST)\lib\xpcom32.lib  \
- $(DIST)\lib\raptorbase.lib \
+ $(DIST)\lib\xpcom.lib  \
  $(DIST)\lib\plc3.lib       \
  $(DIST)\lib\expat.lib			\
  $(LIBNSPR)  

htmlparser/tests/grabpage/makefile.win

@@ -23,9 +23,8 @@ PROGRAM = .\$(OBJDIR)\grabpage.exe
 
 MISCDEP=				\
  $(DIST)\lib\raptorhtmlpars.lib		\
- $(DIST)\lib\raptorbase.lib		\
  $(DIST)\lib\netlib.lib			\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 OBJS =					\
@@ -39,9 +38,8 @@ LINCS=					\
 
 MYLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
- $(DIST)\lib\raptorbase.lib		\
  $(DIST)\lib\netlib.lib			\
- $(DIST)\lib\xpcom32.lib	        \
+ $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 

htmlparser/tests/logparse/Makefile.in

@@ -32,7 +32,6 @@ include $(topsrcdir)/config/config.mk
 
 LIBS = \
 	-lraptorhtmlpars \
-	-lraptorbase \
 	-lxpcom \
 	-lreg \
 	$(NSPR_LIBS) \

htmlparser/tests/logparse/makefile.win

@@ -1,4 +1,4 @@
-#!nmake
+!#!nmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -23,7 +23,7 @@ PROGRAM = .\$(OBJDIR)\logparse.exe
 
 MISCDEP=				\
  $(DIST)\lib\raptorhtmlpars.lib		\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 OBJS =					\
@@ -37,7 +37,7 @@ LINCS=					\
 
 MYLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
- $(DIST)\lib\xpcom32.lib	        \
+ $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 

intl/chardet/src/makefile.win

@@ -51,9 +51,8 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 
 LLIBS= \
-	$(DIST)\lib\xpcom32.lib	\
+	$(DIST)\lib\xpcom.lib	\
 	$(DIST)\lib\plc3.lib	\
-	$(DIST)\lib\raptorbase.lib	\
 	$(LIBNSPR)	
 
 include <$(DEPTH)\config\rules.mak>

intl/locale/src/makefile.win

@@ -46,8 +46,7 @@ LINCS		= -I.						\
 			  -I$(PUBLIC)\unicharutil
 
 
-LLIBS		= $(DIST)\lib\xpcom32.lib		\
-			  $(DIST)\lib\raptorbase.lib 	\
+LLIBS		= $(DIST)\lib\xpcom.lib		\
 			  $(LIBNSPR)
 
 MISCDEP		= $(LLIBS)

intl/locale/src/windows/makefile.win

@@ -54,8 +54,7 @@ LCFLAGS = \
         $(NULL)
 
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\plc3.lib       \
  $(DIST)\lib\nslocale_s.lib		\
 $(LIBNSPR)  

intl/locale/tests/Makefile.in

@@ -32,7 +32,6 @@ LOCAL_INCLUDES = -I$(srcdir)/../src
 include $(topsrcdir)/config/config.mk
 
 LIBS = \
-	-lraptorbase \
 	-lxpcom \
 	-lreg \
 	$(NSPR_LIBS) \

intl/locale/tests/makefile.win

@@ -32,9 +32,8 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\locale -I$(PUBLIC)\raptor \
       -I$(PUBLIC)\uconv -I$(PUBLIC)\unicharutil 
 
 LLIBS= \
- $(DIST)\lib\xpcom32.lib \
+ $(DIST)\lib\xpcom.lib \
  $(LIBNSPR) \
- $(DIST)\lib\raptorbase.lib     \
  $(DIST)\lib\plc3.lib		\
  $(DIST)\lib\nslocale.lib
  

intl/lwbrk/src/makefile.win

@@ -54,9 +54,8 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 
 LLIBS= \
-	$(DIST)\lib\xpcom32.lib	\
+	$(DIST)\lib\xpcom.lib	\
 	$(DIST)\lib\plc3.lib	\
-	$(DIST)\lib\raptorbase.lib	\
 	$(LIBNSPR)	
 
 include <$(DEPTH)\config\rules.mak>

intl/lwbrk/tests/Makefile.in

@@ -30,7 +30,6 @@ INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
 
 LIBS	= \
 	-lxpcom \
-	-lraptorbase \
 	-lreg \
 	$(NSPR_LIBS) \
 	$(NULL)

intl/lwbrk/tests/makefile.win

@@ -30,8 +30,7 @@ REQUIRES=libreg
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor
 
 LLIBS= \
- $(DIST)\lib\raptorbase.lib \
- $(DIST)\lib\xpcom32.lib \
+ $(DIST)\lib\xpcom.lib \
  $(LIBNSPR) \
  $(DIST)\lib\plc3.lib 
  

intl/strres/src/makefile.win

@@ -51,8 +51,7 @@ LCFLAGS = \
 
 # These are the libraries we need to link with to create the dll
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\plc3.lib       \
  $(LIBNSPR)  
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)

intl/strres/tests/Makefile.in

@@ -37,13 +37,11 @@ LIBS		= \
 	-lhttpurl \
 	-lnetwork \
 	-lnetcache \
-	-lgmbase$(MOZ_TOOLKIT) \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxp \
-	-lraptorbase \
 	-lxpcom \
 	-lreg \
 	$(ZLIB_LIBS) \

intl/strres/tests/StringBundleTest.cpp

@@ -22,7 +22,6 @@
 #include "nsINetService.h"
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
-#include "nsXPComCIID.h"
 
 #define TEST_URL "resource:/res/strres.properties"
 

intl/strres/tests/makefile.win

@@ -30,8 +30,7 @@ LINCS=\
     $(NULL)
 
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib	\
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)

intl/uconv/src/Makefile.in

@@ -47,7 +47,7 @@ EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom libraptorbase
+REQUIRES	= $(MODULE) libxpcom 
 
 include $(topsrcdir)/config/rules.mk
 

intl/uconv/src/makefile.win

@@ -75,8 +75,7 @@ LINCS=					\
 	$(NULL)
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib 		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 MISCDEP = $(LLIBS)

intl/uconv/tests/Makefile.in

@@ -36,7 +36,7 @@ INCLUDES	+= -I$(srcdir)/../ucvlatin  \
                    -I$(srcdir)/../ucvja2
 
 
-LIBS	        += $(NSPR_LIBS) -L$(DIST)/bin/ -lxpcom -lraptorbase -lreg -luconv
+LIBS	        += $(NSPR_LIBS) -L$(DIST)/bin/ -lxpcom -lreg -luconv
 
 # needed for mac linux
 ifeq ($(OS_ARCH),Linux)

intl/uconv/tests/makefile.win

@@ -26,8 +26,7 @@ RCFLAGS=/d_DEBUG
 !endif
 
 MISCDEP=			\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\uconv.lib		\
  $(LIBNSPR)			\
 
@@ -43,8 +42,7 @@ LINCS=  \
   $(NULL)
 
 LLIBS=				\
- $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\raptorbase.lib	\
+ $(DIST)\lib\xpcom.lib	\
  -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>

intl/uconv/ucvcn/Makefile.in

@@ -44,11 +44,11 @@ CPPSRCS		= \
 EXPORTS         = \
                   nsUCvCnCID.h \
 		  $(NULL)
-                
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom libraptorbase
+REQUIRES	= $(MODULE) libxpcom 
 
 include $(topsrcdir)/config/rules.mk

intl/uconv/ucvcn/makefile.win

@@ -62,8 +62,7 @@ LINCS=					\
 	$(NULL)
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib 		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 MISCDEP = $(LLIBS)

intl/uconv/ucvja/Makefile.in

@@ -38,11 +38,11 @@ CPPSRCS		= \
 EXPORTS         = \
                   nsUCVJACID.h \
 		  $(NULL)
-                
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom libraptorbase
+REQUIRES	= $(MODULE) libxpcom
 
 include $(topsrcdir)/config/rules.mk

intl/uconv/ucvja/makefile.win

@@ -50,8 +50,7 @@ LINCS=					\
 	$(NULL)
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib 		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 MISCDEP = $(LLIBS)

intl/uconv/ucvja2/Makefile.in

@@ -43,6 +43,6 @@ EXPORTS         = \
 
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom libraptorbase
+REQUIRES	= $(MODULE) libxpcom 
 
 include $(topsrcdir)/config/rules.mk

intl/uconv/ucvja2/makefile.win

@@ -60,7 +60,7 @@ EXPORTS= nsUCVJA2CID.h			\
 	$(NULL)
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 MISCDEP = $(LLIBS)

intl/uconv/ucvlatin/Makefile.in

@@ -109,11 +109,11 @@ CPPSRCS		= \
 EXPORTS         = \
                   nsUCvLatinCID.h \
 		  $(NULL)
-                
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom libraptorbase
+REQUIRES	= $(MODULE) libxpcom 
 
 include $(topsrcdir)/config/rules.mk

intl/uconv/ucvlatin/makefile.win

@@ -192,8 +192,7 @@ LINCS=					\
 	$(NULL)
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib 		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
 MISCDEP = $(LLIBS)

intl/unicharutil/src/makefile.win

@@ -54,9 +54,8 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 
 LLIBS= \
-	$(DIST)\lib\xpcom32.lib	\
+	$(DIST)\lib\xpcom.lib	\
 	$(DIST)\lib\plc3.lib	\
-	$(DIST)\lib\raptorbase.lib	\
 	$(LIBNSPR)	
 
 include <$(DEPTH)\config\rules.mak>

intl/unicharutil/tests/makefile.win

@@ -30,7 +30,7 @@ REQUIRES=libreg
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
 
 LLIBS= \
- $(DIST)\lib\xpcom32.lib \
+ $(DIST)\lib\xpcom.lib \
  $(LIBNSPR) \
  $(DIST)\lib\plc3.lib 
  

js/src/liveconnect/makefile.win

@@ -54,7 +54,7 @@ DEFFILE		= $(DLLNAME).def
 
 LLIBS=$(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
 !ifdef MOZ_OJI
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
 !endif
     $(NULL)
 

js/src/xpconnect/public/MANIFEST

@@ -5,3 +5,5 @@
 nsIXPConnect.h
 nsIXPCScriptable.h
 xpclog.h
+xpccomponents.h
+xpcjsid.h

js/src/xpconnect/shell/Makefile.in

@@ -38,12 +38,7 @@ LIBS		= 		\
 	-L$(DIST)/bin \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom       \
-	-lxpt \
-	-lxptinfo \
-	-lxptcall \
-	-lxptcmd \
 	-lreg       \
-	-lraptorbase \
 	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)

js/src/xpconnect/shell/makefile.win

@@ -28,13 +28,12 @@ LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN
 REQUIRES=xpcom js xpconnect
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \
-      -I$(PUBLIC)\raptor -I$(PUBLIC)\xptinfo -I$(PUBLIC)\libxpt
+      -I$(PUBLIC)\raptor
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)				\
  $(DIST)\lib\js3250.lib \
- $(DIST)\lib\raptorbase.lib \
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>

js/src/xpconnect/src/Makefile.in

@@ -69,11 +69,6 @@ EXTRA_DSO_LDOPTS = \
 	-L$(DIST)/bin \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom \
-	-lxpt \
-	-lxptinfo \
-	-lxptcall \
-	-lxptcmd \
-	-lraptorbase \
 	-lreg \
 	$(NSPR_LIBS) \
 	$(NULL)

js/src/xpconnect/src/makefile.win

@@ -26,7 +26,6 @@ DLLNAME		= xpc$(MOZ_BITS)$(VERSION_NUMBER)
 DLL		=.\$(OBJDIR)\$(DLLNAME).dll
 
 MODULE=xpconnect
-REQUIRES=xpcom js libxpt xptinfo xptcall
 
 DEFINES=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPC_API -DJS_THREADSAFE
 
@@ -48,8 +47,7 @@ OBJS=					\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpconnect -I$(PUBLIC)\xpcom -I$(PUBLIC)\js \
-      -I$(PUBLIC)\raptor -I$(PUBLIC)\libxpt -I$(PUBLIC)\xptinfo \
-      -I$(PUBLIC)\xptcall
+      -I$(PUBLIC)\raptor
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -58,9 +56,7 @@ LCFLAGS = \
 
 LLIBS=	$(LIBNSPR)	\
 		$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib	\
-		$(DIST)\lib\xpcom$(MOZ_BITS).lib	\
-		$(DIST)\lib\xptinfo$(MOZ_BITS).lib	\
-		$(DIST)\lib\xptcall$(MOZ_BITS).lib	\
+		$(DIST)\lib\xpcom.lib	\
 		$(NULL)
 
 include <$(DEPTH)\config\rules.mak>

js/src/xpconnect/tests/Makefile.in

@@ -40,12 +40,7 @@ LIBS		= 		\
 	-L$(DIST)/bin \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom       \
-	-lxpt \
-	-lxptinfo \
-	-lxptcall \
-	-lxptcmd \
 	-lreg       \
-	-lraptorbase \
 	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)

js/src/xpconnect/tests/components/makefile.win

@@ -23,7 +23,6 @@ DLLNAME		= xpctest
 DLL		=.\$(OBJDIR)\$(DLLNAME).dll
 
 MODULE=xpconnect
-REQUIRES=xpcom js libxpt xptinfo xptcall
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
@@ -33,8 +32,7 @@ OBJS=					\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpconnect -I$(PUBLIC)\xpcom -I$(PUBLIC)\js \
-      -I$(PUBLIC)\raptor -I$(PUBLIC)\libxpt -I$(PUBLIC)\xptinfo \
-      -I$(PUBLIC)\xptcall -I$(PUBLIC)\xpconnect
+      -I$(PUBLIC)\raptor -I$(PUBLIC)\xpconnect
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -43,9 +41,7 @@ LCFLAGS = \
 
 LLIBS=	$(LIBNSPR)	\
 		$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib	\
-		$(DIST)\lib\xpcom$(MOZ_BITS).lib	\
-		$(DIST)\lib\xptinfo$(MOZ_BITS).lib	\
-		$(DIST)\lib\xptcall$(MOZ_BITS).lib	\
+		$(DIST)\lib\xpcom.lib	\
 		$(DIST)\lib\xpc$(MOZ_BITS)$(VERSION_NUMBER).lib	\
 		$(NULL)
 

js/src/xpconnect/tests/makefile.win

@@ -31,13 +31,12 @@ LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DJS_THREADSAFE -DJSFILE
 REQUIRES=xpcom js xpconnect
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \
-      -I$(PUBLIC)\raptor -I$(PUBLIC)\xptinfo -I$(PUBLIC)\libxpt
+      -I$(PUBLIC)\raptor
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)				\
  $(DIST)\lib\js3250.lib \
- $(DIST)\lib\raptorbase.lib \
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>

layout/base/nsPresShell.cpp

@@ -49,7 +49,6 @@
 #include "nsHTMLAtoms.h"
 #include "nsCOMPtr.h"
 #include "nsIEventQueueService.h"
-#include "nsXPComCIID.h"
 #include "nsIServiceManager.h"
 #include "nsICaret.h"
 #include "nsCaretProperties.h"

layout/base/public/Makefile.in

@@ -27,6 +27,7 @@ MODULE=layout
 EXPORTS =				\
 	nslayout.h			\
 	nsICaret.h			\
+	nsCaretProperties.h		\
 	nsIContent.h			\
 	nsIContentIterator.h		\
 	nsIDiskDocument.h	\

layout/base/public/makefile.win

@@ -20,6 +20,7 @@ DEPTH=..\..\..
 EXPORTS =				\
 	nslayout.h			\
 	nsICaret.h			\
+	nsCaretProperties.h		\
 	nsIContent.h			\
 	nsIContentIterator.h		\
 	nsIDiskDocument.h	\

layout/base/public/nsCaretProperties.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// this class is used to gather caret properties from the OS. It
-// must be implemented by each platform that wants more than
-// the generic caret properties.
-
-class nsCaretProperties
-{
-	
-	public:
-	
-												nsCaretProperties();
-		virtual							~nsCaretProperties() {}
-	
-		virtual PRInt32			GetCaretWidth() 		{ return mCaretWidth; }
-		virtual PRUint32		GetCaretBlinkRate()	{ return mBlinkRate; }
-		
-		
-	protected:
-
-	// have value for no blinking
-	
-		enum {
-			eDefaulBlinkRate					= 500,			// twice a second
-			eDefaultCaretWidth				= 20				// 20 twips = 1 pixel
-		};
-
-
-		PRInt32					mCaretWidth;			// caret width in twips
-		PRUint32				mBlinkRate;				// blink rate in milliseconds
-		
-		
-		// members for vertical placement & size?
-
-};
-
-NS_BASE nsCaretProperties* NewCaretProperties();

layout/base/src/Makefile.in

@@ -29,6 +29,7 @@ MODULE=layout
 # Alphabetical list of source files
 CPPSRCS =				\
 	nsCaret.cpp			\
+	nsCaretProperties_$(MOZ_TOOLKIT).cpp \
 	nsCommentNode.cpp		\
 	nsContentIterator.cpp		\
 	nsContentList.cpp		\

layout/base/src/makefile.win

@@ -56,6 +56,7 @@ CPPSRCS =				\
 	nsLayoutAtoms.cpp		\
 	nsLayoutDebugger.cpp		\
 	nsCaret.cpp			\
+	nsCaretProperties_windows.cpp   \
 	nsRange.cpp			\
 	nsTextNode.cpp			\
 	$(NULL)
@@ -97,6 +98,7 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsLayoutAtoms.obj		\
 	.\$(OBJDIR)\nsLayoutDebugger.obj	\
 	.\$(OBJDIR)\nsCaret.obj			\
+	.\$(OBJDIR)\nsCaretProperties_windows.obj   \
 	.\$(OBJDIR)\nsRange.obj			\
 	.\$(OBJDIR)\nsTextNode.obj		\
 	$(NULL)

layout/base/tests/Makefile.in

@@ -46,12 +46,10 @@ LIBS = \
 	-lpwcac \
 	-lnetcache \
 	-lnetwork \
-	-lraptorbase \
 	-lraptorhtml \
 	-lpref \
 	-lsecfree \
 	-limg \
-	-lgmbase$(MOZ_TOOLKIT) \
 	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \

layout/base/tests/makefile.win

@@ -25,8 +25,7 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\src
 LLIBS=				\
  $(DIST)\lib\raptorlayout_s.lib	\
  $(DIST)\lib\raptorgfxwin.lib	\
- $(DIST)\lib\raptorbase.lib	\
- $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\xpcom.lib	\
  $(DIST)\lib\jsdom.lib	        \
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib

layout/build/Makefile.in

@@ -46,8 +46,6 @@ EXPORTS=nsLayoutCID.h
 
 INCLUDES +=  -I$(srcdir)/../html/base/src
 
-BASE_DSO_FLAGS = $(addprefix -lgmbase, $(MOZ_TOOLKIT))
-
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorevents_s.a	    \
 	$(DIST)/lib/libraptorhtmlbase_s.a   \

layout/build/dlldeps.cpp

@@ -25,6 +25,7 @@
 #include "nsIDocument.h"
 #include "nsHTMLParts.h"
 #include "nsINameSpaceManager.h"
+#include "nsCaretProperties.h"
 
 void XXXNeverCalled()
 {
@@ -52,4 +53,5 @@ void XXXNeverCalled()
   nsINameSpaceManager* nsm;
   NS_NewNameSpaceManager(&nsm);
   NS_CreateHTMLElement(nsnull, "");
+  NewCaretProperties();
 }

layout/build/makefile.win

@@ -51,8 +51,7 @@ MISCDEP =				\
  $(DIST)\lib\raptorxulbase_s.lib	\
  $(DIST)\lib\raptorxulcontent_s.lib	\
  $(DIST)\lib\raptorevents_s.lib		\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(DIST)\lib\raptorgfxwin.lib		\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\jsdom.lib		        \
@@ -85,8 +84,7 @@ LLIBS=					\
  $(DIST)\lib\raptorxulbase_s.lib \
  $(DIST)\lib\raptorxulcontent_s.lib	\
  $(DIST)\lib\raptorevents_s.lib		\
- $(DIST)\lib\xpcom32.lib		\
- $(DIST)\lib\raptorbase.lib		\
+ $(DIST)\lib\xpcom.lib		\
  $(DIST)\lib\raptorgfxwin.lib		\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\jsdom.lib		        \