From 362d0e1c5e2abda5ecf0271d6814193f69ffe951 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Mon, 1 May 2000 21:57:11 +0000
Subject: [PATCH] Make the checkout error messages a bit more gentle, put in a
 MakeJars stub method.

---
 build/mac/NGLayoutBuildList.pm | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm
index 7253ed627c07..cc571a005633 100644
--- a/build/mac/NGLayoutBuildList.pm
+++ b/build/mac/NGLayoutBuildList.pm
@@ -18,6 +18,7 @@ use File::Copy;
 
 # homegrown
 use Moz;
+use MozJar;
 use MacCVS;
 use MANIFESTO;
 
@@ -258,9 +259,10 @@ sub Checkout()
 	#//
 	if ($main::pull{moz})
 	{
-		$session->checkout("mozilla/nsprpub",	$nsprpub_tag)				|| print "checkout of nsprpub failed";		
-		$session->checkout("mozilla/security",	"SeaMonkey_M14_BRANCH")		|| print "checkout of security failed";		
-		$session->checkout("SeaMonkeyAll")									|| print "checkout of SeaMonkeyAll failed";
+		$session->checkout("mozilla/nsprpub",	$nsprpub_tag)				|| print "checkout of nsprpub failed\n";		
+		$session->checkout("mozilla/security",	"SeaMonkey_M14_BRANCH")		|| print "checkout of security failed\n";		
+		$session->checkout("SeaMonkeyAll")									|| 
+		     print "MacCVS reported some errors checking out SeaMonkeyAll, but these are probably not serious.\n";
 	}
 	elsif ($main::pull{runtime})
 	{
@@ -750,6 +752,29 @@ sub MakeResourceAliases()
 	print("--- Resource copying complete ----\n");
 }
 
+
+#//--------------------------------------------------------------------------------------------------
+#// BuildJarFiles
+#//--------------------------------------------------------------------------------------------------
+
+
+sub BuildJarFiles()
+{
+	unless( $main::build{jars} ) { return; }
+	_assertRightDirectory();
+
+	# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
+	my($D) = $main::DEBUG ? "Debug" : "";
+	my($dist_dir) = _getDistDirectory();
+
+	print("--- Starting JAR building ----\n");
+
+	my($chrome_dir) = "$dist_dir"."Chrome";
+
+    CreateJarFile("$chrome_dir:communicator", "$chrome_dir:communicator.jar");
+}
+
+
 #//--------------------------------------------------------------------------------------------------
 #// Make library aliases
 #//--------------------------------------------------------------------------------------------------
@@ -1930,6 +1955,7 @@ sub BuildMozilla()
 sub BuildProjects()
 {
 	MakeResourceAliases();
+	# BuildJarFiles();
 	MakeLibAliases();
 
 	# activate CodeWarrior