diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm
index d01df3e5ef8..9ffdf5b4cec 100644
--- a/build/mac/NGLayoutBuildList.pm
+++ b/build/mac/NGLayoutBuildList.pm
@@ -17,7 +17,7 @@ use File::Path;
 use Moz;
 use MacCVS;
 
-@ISA				= qw(Exporter);
+@ISA			= qw(Exporter);
 @EXPORT			= qw( Checkout BuildDist BuildProjects BuildCommonProjects BuildLayoutProjects);
 
 # NGLayoutBuildList builds the nglayout project
@@ -32,9 +32,10 @@ use MacCVS;
 # Note that the name of alias is different than the name of the file. This
 # is to trick CW into including NGLayout defines 
 
-#
-# Utility routines
-#
+
+#//--------------------------------------------------------------------------------------------------
+#// Utility routines
+#//--------------------------------------------------------------------------------------------------
 
 # pickWithMemoryFile stores the information about the user pick inside
 # the file $session_storage
@@ -99,9 +100,11 @@ sub _getDistDirectory()
 	return $main::DEBUG ? ":mozilla:dist:viewer_debug:" : ":mozilla:dist:viewer:";
 }
 
-#
-# MAIN ROUTINES
-#
+
+#//--------------------------------------------------------------------------------------------------
+#// Checkout everything
+#//--------------------------------------------------------------------------------------------------
+
 sub Checkout()
 {
 	_assertRightDirectory();
@@ -109,80 +112,84 @@ sub Checkout()
 	my($session) = MacCVS->new( $cvsfile );
 	unless (defined($session)) { die "Checkout aborted. Cannot create session file: $session" }
 
+	#//
+	#//	List of the branches we use
+	#//
 	my($LIBPREF_BRANCH) = "XPCOM_BRANCH";
-	my($PLUGIN_BRANCH) = "OJI_19980618_BRANCH";
 
+	#//
+	#//	Checkout commands
+	#//
 	if ($main::pull{lizard})
 	{
-		$session->checkout("mozilla/LICENSE") || die "checkout failure";
-		$session->checkout("mozilla/LEGAL") || die "checkout failure";
-		$session->checkout("mozilla/config") || die "checkout failure";
-		$session->checkout("mozilla/dbm") || die "checkout failure";
-		$session->checkout("mozilla/lib/liblayer") || die "checkout failure";
-		$session->checkout("mozilla/modules/zlib") || die "checkout failure";
-		$session->checkout("mozilla/modules/libutil") || die "checkout failure";
-		$session->checkout("mozilla/nsprpub") || die "checkout failure";
-		$session->checkout("mozilla/sun-java") || die "checkout failure";
-		$session->checkout("mozilla/nav-java") || die "checkout failure";
-		$session->checkout("mozilla/js") || die "checkout failure";
-		$session->checkout("mozilla/modules/security/freenav") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libparse") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/layout") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libstyle") || die "checkout failure";
-		#//$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
-		$session->checkout("mozilla/modules/libpref",$LIBPREF_BRANCH) || die "checkout failure";
-		#//$session->checkout("mozilla/modules/plugin",$PLUGIN_BRANCH) || die "checkout failure";
-		$session->checkout("mozilla/modules/plugin") || die "checkout failure";
-	 $session->checkout("mozilla/modules/oji") || die "checkout failure";
+		$session->checkout("mozilla/LICENSE")				|| die "checkout failure";
+		$session->checkout("mozilla/LEGAL")					|| die "checkout failure";
+		$session->checkout("mozilla/config")				|| die "checkout failure";
+		$session->checkout("mozilla/dbm")					|| die "checkout failure";
+		$session->checkout("mozilla/lib/liblayer")			|| die "checkout failure";
+		$session->checkout("mozilla/modules/zlib")			|| die "checkout failure";
+		$session->checkout("mozilla/modules/libutil")		|| die "checkout failure";
+		$session->checkout("mozilla/nsprpub")				|| die "checkout failure";
+		$session->checkout("mozilla/sun-java")				|| die "checkout failure";
+		$session->checkout("mozilla/nav-java")				|| die "checkout failure";
+		$session->checkout("mozilla/js")					|| die "checkout failure";
+		$session->checkout("mozilla/modules/security/freenav")			|| die "checkout failure";
+		$session->checkout("mozilla/modules/libpref",$LIBPREF_BRANCH)	|| die "checkout failure";
+		$session->checkout("mozilla/modules/plugin")		|| die "checkout failure";
+	 $session->checkout("mozilla/modules/oji")				|| die "checkout failure";
 	}
 	if ($main::pull{xpcom})
 	{
-		$session->checkout("mozilla/modules/libreg") || die "checkout failure";
-		$session->checkout("mozilla/xpcom") || die "checkout failure";
+		$session->checkout("mozilla/modules/libreg")		|| die "checkout failure";
+		$session->checkout("mozilla/xpcom")					|| die "checkout failure";
 	}
 	if ($main::pull{imglib})
 	{
-		$session->checkout("mozilla/jpeg") || die "checkout failure";
-		$session->checkout("mozilla/modules/libutil") || die "checkout failure";
-		$session->checkout("mozilla/modules/libimg") || die "checkout failure";
+		$session->checkout("mozilla/jpeg")					|| die "checkout failure";
+		$session->checkout("mozilla/modules/libutil")		|| die "checkout failure";
+		$session->checkout("mozilla/modules/libimg")		|| die "checkout failure";
 	}
 	if ($main::pull{netlib})
 	{
-		$session->checkout("mozilla/lib/xp") || die "checkout failure";
-		$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
-		$session->checkout("mozilla/network") || die "checkout failure";
-		$session->checkout("mozilla/include") || die "checkout failure";
+		$session->checkout("mozilla/lib/xp")				|| die "checkout failure";
+		$session->checkout("mozilla/lib/libpwcac")			|| die "checkout failure";
+		$session->checkout("mozilla/network")				|| die "checkout failure";
+		$session->checkout("mozilla/include")				|| die "checkout failure";
 	}
 	if ($main::pull{nglayout})
 	{
-		$session->checkout("mozilla/base") || die "checkout failure";
-		$session->checkout("mozilla/dom") || die "checkout failure";
-		$session->checkout("mozilla/gfx") || die "checkout failure";
-		$session->checkout("mozilla/htmlparser") || die "checkout failure";
-		$session->checkout("mozilla/layout") || die "checkout failure";
-		$session->checkout("mozilla/view") || die "checkout failure";
-		$session->checkout("mozilla/webshell") || die "checkout failure";
-		$session->checkout("mozilla/widget") || die "checkout failure";
+		$session->checkout("mozilla/base")					|| die "checkout failure";
+		$session->checkout("mozilla/dom")					|| die "checkout failure";
+		$session->checkout("mozilla/gfx")					|| die "checkout failure";
+		$session->checkout("mozilla/htmlparser")			|| die "checkout failure";
+		$session->checkout("mozilla/layout")				|| die "checkout failure";
+		$session->checkout("mozilla/view")					|| die "checkout failure";
+		$session->checkout("mozilla/webshell")				|| die "checkout failure";
+		$session->checkout("mozilla/widget")				|| die "checkout failure";
 	}
 	if ($main::pull{mac})
 	{
-		$session->checkout("mozilla/build/mac") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/applevnt") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/central") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/gui") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/include") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/pch") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/projects") || die "checkout failure";
-		$session->checkout("mozilla/cmd/macfe/utility") || die "checkout failure";
-		$session->checkout("mozilla/lib/mac/MacMemoryAllocator") || die "checkout failure";
-		$session->checkout("mozilla/lib/mac/NSStdLib") || die "checkout failure";
-		$session->checkout("mozilla/lib/mac/MoreFiles") || die "checkout failure";
-		$session->checkout("mozilla/lib/mac/NSRuntime") || die "checkout failure";
-		$session->checkout("mozilla/lib/mac/Misc") || die "checkout failure";
+		$session->checkout("mozilla/build/mac")				|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/applevnt")	|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/central")		|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/gui")			|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/include")		|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/pch")			|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/projects")	|| die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe/utility")		|| die "checkout failure";
+		$session->checkout("mozilla/lib/mac/MacMemoryAllocator")	|| die "checkout failure";
+		$session->checkout("mozilla/lib/mac/NSStdLib")		|| die "checkout failure";
+		$session->checkout("mozilla/lib/mac/MoreFiles")		|| die "checkout failure";
+		$session->checkout("mozilla/lib/mac/NSRuntime")		|| die "checkout failure";
+		$session->checkout("mozilla/lib/mac/Misc")			|| die "checkout failure";
 	}
 }
 
-# builds the dist directory
+
+#//--------------------------------------------------------------------------------------------------
+#// Build the 'dist' directory
+#//--------------------------------------------------------------------------------------------------
+
 sub BuildDist()
 {
 	unless ( $main::build{dist} ) { return;}
@@ -195,113 +202,136 @@ sub BuildDist()
 	my($distdirectory) = ":mozilla:dist";
 
 	my($distlist) = [
-#MAC_COMMON
-	[":mozilla:build:mac:MANIFEST", "$distdirectory:mac:common:"],
-	[":mozilla:lib:mac:NSStdLib:include:MANIFEST", "$distdirectory:mac:common:"],
-	[":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", "$distdirectory:mac:common:"],
-	[":mozilla:lib:mac:Misc:MANIFEST", "$distdirectory:mac:common:"],
-	[":mozilla:lib:mac:MoreFiles:MANIFEST", "$distdirectory:mac:common:morefiles:"],
-#INCLUDE
-	[":mozilla:config:mac:MANIFEST", "$distdirectory:config:"],
-	[":mozilla:config:mac:MANIFEST_config", "$distdirectory:config:"],
-	[":mozilla:include:MANIFEST", "$distdirectory:include:"],		
-	[":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"],
-	[":mozilla:cmd:macfe:utility:MANIFEST", "$distdirectory:include:"],
-#NSPR	
-    [":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"],		
-    [":mozilla:nsprpub:pr:src:md:mac:MANIFEST", "$distdirectory:nspr:mac:"],		
-    [":mozilla:nsprpub:lib:ds:MANIFEST", "$distdirectory:nspr:"],		
-    [":mozilla:nsprpub:lib:libc:include:MANIFEST", "$distdirectory:nspr:"],		
-    [":mozilla:nsprpub:lib:msgc:include:MANIFEST", "$distdirectory:nspr:"],
-#JPEG
-    [":mozilla:jpeg:MANIFEST", "$distdirectory:jpeg:"],
-#LIBREG
-    [":mozilla:modules:libreg:include:MANIFEST", "$distdirectory:libreg:"],
-#XPCOM
-    [":mozilla:xpcom:src:MANIFEST", "$distdirectory:xpcom:"],
-#ZLIB
-    [":mozilla:modules:zlib:src:MANIFEST", "$distdirectory:zlib:"],
-#LIBUTIL
-    [":mozilla:modules:libutil:public:MANIFEST", "$distdirectory:libutil:"],
-#SUN_JAVA
-    [":mozilla:sun-java:stubs:include:MANIFEST", "$distdirectory:sun-java:"],
-    [":mozilla:sun-java:stubs:macjri:MANIFEST", "$distdirectory:sun-java:"],
-#NAV_JAVA
-    [":mozilla:nav-java:stubs:include:MANIFEST", "$distdirectory:nav-java:"],
-    [":mozilla:nav-java:stubs:macjri:MANIFEST", "$distdirectory:nav-java:"],
-#JS
-    [":mozilla:js:src:MANIFEST", "$distdirectory:js:"],
-#SECURITY_freenav
-    [":mozilla:modules:security:freenav:MANIFEST", "$distdirectory:security:"],
-#LIBPREF
-    [":mozilla:modules:libpref:public:MANIFEST", "$distdirectory:libpref:"],
-#LIBIMAGE
-    [":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"],
-    [":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"],
-    [":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"],
-#PLUGIN
-    [":mozilla:modules:plugin:nglsrc:MANIFEST", "$distdirectory:plugin:"],
-    [":mozilla:modules:plugin:public:MANIFEST", "$distdirectory:plugin:"],
-    [":mozilla:modules:plugin:src:MANIFEST", "$distdirectory:plugin:"],
-    [":mozilla:modules:oji:src:MANIFEST", "$distdirectory:oji:"],
-    [":mozilla:modules:oji:public:MANIFEST", "$distdirectory:oji:"],
 
-# IS THIS STILL NEEDED
-#LAYERS
-	[":mozilla:lib:liblayer:include:MANIFEST",	"$distdirectory:layers:"],
-#NETWORK
-    [":mozilla:network:cache:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:client:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:cnvts:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:cstream:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:main:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:mimetype:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:util:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:about:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:certld:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:dataurl:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:file:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:ftp:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:gopher:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:http:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:js:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:mailbox:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:marimba:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:nntp:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:pop3:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:remote:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:protocol:smtp:MANIFEST", "$distdirectory:network:"],
-    [":mozilla:network:module:MANIFEST","$distdirectory:network:module"],
-#BASE
-    [":mozilla:base:src:MANIFEST", "$distdirectory:base:"],
-    [":mozilla:base:public:MANIFEST", "$distdirectory:base:"],
-#WEBSHELL
-    [":mozilla:webshell:public:MANIFEST", "$distdirectory:webshell:"],
-#LAYOUT
-    [":mozilla:layout:build:MANIFEST", "$distdirectory:layout:"],
-    [":mozilla:layout:base:public:MANIFEST", "$distdirectory:layout:"],
-    [":mozilla:layout:html:style:public:MANIFEST", "$distdirectory:layout:"],
-    [":mozilla:layout:html:base:src:MANIFEST", "$distdirectory:layout:"],
-    [":mozilla:layout:base:src:MANIFEST", "$distdirectory:layout:"],
-	[":mozilla:layout:events:public:MANIFEST", "$distdirectory:layout:"],
-	[":mozilla:layout:events:src:MANIFEST", "$distdirectory:layout:"],
-#WIDGET
-    [":mozilla:widget:public:MANIFEST", "$distdirectory:widget:"],
-    [":mozilla:widget:src:mac:MANIFEST", "$distdirectory:widget:"],
-#GFX
-    [":mozilla:gfx:src:MANIFEST", "$distdirectory:gfx:"],
-#VIEW
-    [":mozilla:view:public:MANIFEST", "$distdirectory:view:"],
-#DOM
-   [":mozilla:dom:public:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:coreDom:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:coreEvents:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:events:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:html:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:public:css:MANIFEST", "$distdirectory:dom:"],
-   [":mozilla:dom:src:jsurl:MANIFEST", "$distdirectory:dom:"],
-#HTMLPARSER
-   [":mozilla:htmlparser:src:MANIFEST", "$distdirectory:htmlparser:"],
+	#MAC_COMMON
+	[":mozilla:build:mac:MANIFEST",								"$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:NSStdLib:include:MANIFEST",				"$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST",	"$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:Misc:MANIFEST",							"$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:MoreFiles:MANIFEST",						"$distdirectory:mac:common:morefiles:"],
+
+	#INCLUDE
+	[":mozilla:config:mac:MANIFEST",							"$distdirectory:config:"],
+	[":mozilla:config:mac:MANIFEST_config",						"$distdirectory:config:"],
+	[":mozilla:include:MANIFEST",								"$distdirectory:include:"],		
+	[":mozilla:cmd:macfe:pch:MANIFEST",							"$distdirectory:include:"],
+	[":mozilla:cmd:macfe:utility:MANIFEST",						"$distdirectory:include:"],
+
+	#NSPR	
+    [":mozilla:nsprpub:pr:include:MANIFEST",					"$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:pr:src:md:mac:MANIFEST",					"$distdirectory:nspr:mac:"],		
+    [":mozilla:nsprpub:lib:ds:MANIFEST",						"$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:lib:libc:include:MANIFEST",				"$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:lib:msgc:include:MANIFEST",				"$distdirectory:nspr:"],
+
+	#JPEG
+    [":mozilla:jpeg:MANIFEST",									"$distdirectory:jpeg:"],
+
+	#LIBREG
+    [":mozilla:modules:libreg:include:MANIFEST",				"$distdirectory:libreg:"],
+
+	#XPCOM
+    [":mozilla:xpcom:src:MANIFEST",								"$distdirectory:xpcom:"],
+
+	#ZLIB
+    [":mozilla:modules:zlib:src:MANIFEST",						"$distdirectory:zlib:"],
+
+	#LIBUTIL
+    [":mozilla:modules:libutil:public:MANIFEST",				"$distdirectory:libutil:"],
+
+	#SUN_JAVA
+    [":mozilla:sun-java:stubs:include:MANIFEST",				"$distdirectory:sun-java:"],
+    [":mozilla:sun-java:stubs:macjri:MANIFEST",					"$distdirectory:sun-java:"],
+
+	#NAV_JAVA
+    [":mozilla:nav-java:stubs:include:MANIFEST",				"$distdirectory:nav-java:"],
+    [":mozilla:nav-java:stubs:macjri:MANIFEST",					"$distdirectory:nav-java:"],
+
+	#JS
+    [":mozilla:js:src:MANIFEST",								"$distdirectory:js:"],
+
+	#SECURITY_freenav
+    [":mozilla:modules:security:freenav:MANIFEST",				"$distdirectory:security:"],
+
+	#LIBPREF
+    [":mozilla:modules:libpref:public:MANIFEST",				"$distdirectory:libpref:"],
+
+	#LIBIMAGE
+    [":mozilla:modules:libimg:png:MANIFEST",					"$distdirectory:libimg:"],
+    [":mozilla:modules:libimg:src:MANIFEST",					"$distdirectory:libimg:"],
+    [":mozilla:modules:libimg:public:MANIFEST",					"$distdirectory:libimg:"],
+
+	#PLUGIN
+    [":mozilla:modules:plugin:nglsrc:MANIFEST",					"$distdirectory:plugin:"],
+    [":mozilla:modules:plugin:public:MANIFEST",					"$distdirectory:plugin:"],
+    [":mozilla:modules:plugin:src:MANIFEST",					"$distdirectory:plugin:"],
+    [":mozilla:modules:oji:src:MANIFEST",						"$distdirectory:oji:"],
+    [":mozilla:modules:oji:public:MANIFEST",					"$distdirectory:oji:"],
+
+	#LAYERS (IS THIS STILL NEEDED)
+	[":mozilla:lib:liblayer:include:MANIFEST",					"$distdirectory:layers:"],
+
+	#NETWORK
+    [":mozilla:network:cache:MANIFEST",							"$distdirectory:network:"],
+    [":mozilla:network:client:MANIFEST",						"$distdirectory:network:"],
+    [":mozilla:network:cnvts:MANIFEST",							"$distdirectory:network:"],
+    [":mozilla:network:cstream:MANIFEST",						"$distdirectory:network:"],
+    [":mozilla:network:main:MANIFEST",							"$distdirectory:network:"],
+    [":mozilla:network:mimetype:MANIFEST",						"$distdirectory:network:"],
+    [":mozilla:network:util:MANIFEST",							"$distdirectory:network:"],
+    [":mozilla:network:protocol:about:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:certld:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:dataurl:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:file:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:ftp:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:gopher:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:http:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:js:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:mailbox:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:marimba:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:nntp:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:pop3:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:protocol:remote:MANIFEST",				"$distdirectory:network:"],
+    [":mozilla:network:protocol:smtp:MANIFEST",					"$distdirectory:network:"],
+    [":mozilla:network:module:MANIFEST",						"$distdirectory:network:module"],
+
+	#BASE
+    [":mozilla:base:src:MANIFEST",								"$distdirectory:base:"],
+    [":mozilla:base:public:MANIFEST",							"$distdirectory:base:"],
+
+	#WEBSHELL
+    [":mozilla:webshell:public:MANIFEST",						"$distdirectory:webshell:"],
+
+	#LAYOUT
+    [":mozilla:layout:build:MANIFEST",							"$distdirectory:layout:"],
+    [":mozilla:layout:base:public:MANIFEST",					"$distdirectory:layout:"],
+    [":mozilla:layout:html:style:public:MANIFEST",				"$distdirectory:layout:"],
+    [":mozilla:layout:html:base:src:MANIFEST",					"$distdirectory:layout:"],
+    [":mozilla:layout:base:src:MANIFEST",						"$distdirectory:layout:"],
+	[":mozilla:layout:events:public:MANIFEST",					"$distdirectory:layout:"],
+	[":mozilla:layout:events:src:MANIFEST",						"$distdirectory:layout:"],
+
+	#WIDGET
+    [":mozilla:widget:public:MANIFEST",							"$distdirectory:widget:"],
+    [":mozilla:widget:src:mac:MANIFEST",						"$distdirectory:widget:"],
+
+	#GFX
+    [":mozilla:gfx:src:MANIFEST",								"$distdirectory:gfx:"],
+
+	#VIEW
+    [":mozilla:view:public:MANIFEST",							"$distdirectory:view:"],
+
+	#DOM
+   [":mozilla:dom:public:MANIFEST",								"$distdirectory:dom:"],
+   [":mozilla:dom:public:coreDom:MANIFEST",						"$distdirectory:dom:"],
+   [":mozilla:dom:public:coreEvents:MANIFEST",					"$distdirectory:dom:"],
+   [":mozilla:dom:public:events:MANIFEST",						"$distdirectory:dom:"],
+   [":mozilla:dom:public:html:MANIFEST",						"$distdirectory:dom:"],
+   [":mozilla:dom:public:css:MANIFEST",							"$distdirectory:dom:"],
+   [":mozilla:dom:src:jsurl:MANIFEST",							"$distdirectory:dom:"],
+
+	#HTMLPARSER
+   [":mozilla:htmlparser:src:MANIFEST",							"$distdirectory:htmlparser:"],
 
 	];
 	foreach $a (@$distlist)
@@ -309,12 +339,15 @@ sub BuildDist()
 		InstallFromManifest( $a->[0], $a->[1]);
 	}
 	
-# To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
-	MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h", ":mozilla:dist:config:MacConfigInclude.h");
+	#// To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
+	MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h",	":mozilla:dist:config:MacConfigInclude.h");
 }
 
-# builds all projects
-# different targets controlled by $main::build
+
+#//--------------------------------------------------------------------------------------------------
+#// Build common projects
+#//--------------------------------------------------------------------------------------------------
+
 sub BuildCommonProjects()
 {
 	unless( $main::build{common} ) { return; }
@@ -324,15 +357,17 @@ sub BuildCommonProjects()
 	my($D) = $main::DEBUG ? "Debug" : "";
 	my($dist_dir) = _getDistDirectory();
 
-# clean projects
-
+	#//
+	#// Clean projects
+	#//
 	Moz::BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"Stubs");
 	Moz::BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              	"Stubs");
 	Moz::BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",				"Stubs");
 	Moz::BuildProjectClean(":mozilla:cmd:macfe:projects:client:Client.mcp",    		"Stubs");
 
-# shared
-
+	#//
+	#// Shared libraries
+	#//
 	if ( $main::CARBON )
 	{
 		BuildProject(":mozilla:cmd:macfe:projects:interfaceLib:Interface.mcp",			"Carbon Interfaces");
@@ -342,52 +377,53 @@ sub BuildCommonProjects()
 		BuildProject(":mozilla:cmd:macfe:projects:interfaceLib:Interface.mcp",			"MacOS Interfaces");
 	}
 		
-	Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
-	MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb.xSYM", "$dist_dir") : 0;
+	Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",						"NSRuntime$D.shlb");
+	MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb",							"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb.xSYM",		"$dist_dir") : 0;
 	
-	Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp", "MoreFiles$D.shlb");
-	MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb.xSYM", "$dist_dir") : 0;
+	Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp",				"MoreFiles$D.shlb");
+	MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb",						"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb.xSYM",	"$dist_dir") : 0;
 
-	BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",	"NSPR20$D.shlb");
-	MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb.xSYM", "$dist_dir") : 0;
+	BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",								"NSPR20$D.shlb");
+	MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb",								"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb.xSYM",			"$dist_dir") : 0;
 
-	BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"MemAllocator$D.shlb");
-	MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb.xSYM", "$dist_dir") : 0;
+	BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",					"MemAllocator$D.shlb");
+	MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb",					"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb.xSYM","$dist_dir") : 0;
 	
 	BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
-	MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb.xSYM", "$dist_dir") : 0;
+	MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb",								"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb.xSYM",			"$dist_dir") : 0;
 
-	BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",											"JPEG$D.shlb");
-	MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb.xSYM", "$dist_dir") : 0;
+	BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",										"JPEG$D.shlb");
+	MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb",										"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb.xSYM",					"$dist_dir") : 0;
 
-	BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",		"JavaScriptNoJSJ$D.shlb");
-	MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb.xSYM", "$dist_dir") : 0;
+	BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",								"JavaScriptNoJSJ$D.shlb");
+	MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb",									"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb.xSYM",				"$dist_dir") : 0;
 
-	BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",		"zlib$D.shlb");
-	MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
-	$main::DEBUG ? MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb.xSYM", "$dist_dir") : 0;
+	BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",								"zlib$D.shlb");
+	MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb",								"$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb.xSYM",			"$dist_dir") : 0;
 	
-# static
-
+	#//
+	#// Static libraries
+	#//
 	BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.o");
-
-	BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	 "Security.o");
-
-	BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
-
-	BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o (standalone)");
-
-	BuildProject(":mozilla:network:macbuild:network.mcp",		"NetworkModular$D.o");
-
+	BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",			"Security.o");
+	BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",							"png$D.o");
+	BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",							"libimg$D.o (standalone)");
+	BuildProject(":mozilla:network:macbuild:network.mcp",								"NetworkModular$D.o");
 }
 
+
+#//--------------------------------------------------------------------------------------------------
+#// Build NGLayout
+#//--------------------------------------------------------------------------------------------------
+
 sub BuildLayoutProjects()
 {
 	unless( $main::build{nglayout} ) { return; }
@@ -397,52 +433,52 @@ sub BuildLayoutProjects()
 	my($D) = $main::DEBUG ? "Debug" : "";
 	my($dist_dir) = _getDistDirectory();
 
-	#--
-	#-- Make aliases of resource files
-	#--
+	#//
+	#// Make aliases of resource files
+	#//
 	my($resource_dir) = "$dist_dir" . "res:";
-	MakeAlias(":mozilla:layout:html:document:src:ua.css", "$resource_dir");
-
-	my($throbber_dir) = "$dist_dir" . "res:throbber:";
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims00.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims01.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims02.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims03.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims04.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims05.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims06.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims07.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims08.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims09.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims10.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims11.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims12.gif", "$throbber_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims13.gif", "$throbber_dir");
+	MakeAlias(":mozilla:layout:html:document:src:ua.css",				"$resource_dir");
 
 	my($html_dir) = "$dist_dir" . "res:html:";
-	MakeAlias(":mozilla:layout:html:base:src:broken-image.gif", "$html_dir");
+	MakeAlias(":mozilla:layout:html:base:src:broken-image.gif",			"$html_dir");
+
+	my($throbber_dir) = "$dist_dir" . "res:throbber:";
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims00.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims01.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims02.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims03.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims04.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims05.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims06.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims07.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims08.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims09.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims10.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims11.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims12.gif",	"$throbber_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:throbber:anims13.gif",	"$throbber_dir");
 
 	my($samples_dir) = "$dist_dir" . "res:samples:";
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test0.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test1.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test2.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test3.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test4.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test5.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test6.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test7.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test8.html", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:test9.html", "$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test0.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test1.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test2.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test3.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test4.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test5.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test6.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test7.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test8.html",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:test9.html",		"$samples_dir");
 
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:Anieyes.gif", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:bg.jpg", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:gear1.gif", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:raptor.jpg", "$samples_dir");
-	MakeAlias(":mozilla:webshell:tests:viewer:samples:rock_gra.gif", "$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:Anieyes.gif",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:bg.jpg",			"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:gear1.gif",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:raptor.jpg",		"$samples_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:samples:rock_gra.gif",	"$samples_dir");
 
-	#--
-	#-- Build Layout projects
-	#--
+	#//
+	#// Build Layout projects
+	#//
 	BuildProject(":mozilla:base:macbuild:base.mcp",						"base$D.o");
 	BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp",			"htmlparser$D.o");
 	BuildProject(":mozilla:dom:macbuild:dom.mcp",						"dom$D.o");
@@ -453,6 +489,11 @@ sub BuildLayoutProjects()
 	BuildProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp",		"viewer$D");
 }
 
+
+#//--------------------------------------------------------------------------------------------------
+#// Build everything
+#//--------------------------------------------------------------------------------------------------
+
 sub BuildProjects()
 {
 	BuildCommonProjects();