#26126: changed Mac build scripts to pull NSPR from static tag + some cleanup. r=sfraser

build/mac/BuildNGLayout.pl

@@ -40,12 +40,8 @@ $PROFILE				= 0;
 $GC_LEAK_DETECTOR		= 0;	# turn on to use GC leak detection
 
 $pull{all} 				= 0;
-$pull{lizard} 			= 0;
-$pull{xpcom} 			= 0;
-$pull{imglib} 			= 0;
-$pull{netlib} 			= 0;
-$pull{nglayout} 		= 0;
-$pull{mac} 				= 0;
+$pull{moz}				= 0;
+$pull{runtime} 			= 0;
 
 $build{all} 			= 1;			# turn off to do individual builds, or to do "most"
 $build{most} 			= 0;			# turn off to do individual builds
@@ -167,9 +163,7 @@ else
 Moz::StopForErrors();
 #Moz::DontStopForErrors();
 
-if ($pull{all}) { 
-   Checkout();
-}
+Checkout();
 
 SetBuildNumber();
 

build/mac/BuildNGLayoutDebug.pl

@@ -72,12 +72,8 @@ $PROFILE				= 0;
 $GC_LEAK_DETECTOR		= 0;	# turn on to use GC leak detection
 
 $pull{all} 				= 0;
-$pull{lizard} 			= 0;
-$pull{xpcom} 			= 0;
-$pull{imglib} 			= 0;
-$pull{netlib} 			= 0;
-$pull{nglayout} 		= 0;
-$pull{mac} 				= 0;
+$pull{moz}				= 0;
+$pull{runtime} 			= 0;
 
 $build{all} 			= 1;	# Turn off to do individual builds, or to do "most"
 $build{most} 			= 0;	# Turn off to do individual builds
@@ -200,11 +196,9 @@ else
 Moz::StopForErrors();
 #Moz::DontStopForErrors();
 
-if ($pull{all}) { 
-   Checkout();
-}
-
+Checkout();
 
+chdir($MOZ_SRC);
 BuildDist();
 
 chdir($MOZ_SRC);

build/mac/NGLayoutBuildList.pm

@@ -182,7 +182,7 @@ sub _copy($$)
 
 sub Checkout()
 {
-	unless ( $main::pull{all} || $main::pull{runtime} ) { return;}
+	unless ( $main::pull{all} || $main::pull{moz} || $main::pull{runtime} ) { return;}
 
 	# give application activation a chance to happen
 	WaitNextEvent();
@@ -197,15 +197,15 @@ sub Checkout()
 	# activate MacCVS
 	ActivateApplication('Mcvs');
 
+	my($nsprpub_tag) = "NSPRPUB_20000208";
+	
 	#//
 	#// Checkout commands
 	#//
-	if ($main::pull{all})
+	if ($main::pull{moz})
 	{
 		$session->checkout("SeaMonkeyAll")							|| die "checkout failure";
-	
-		#// Check out the MRJ OJI plugin. Needs to be added to the "SeaMonkeyAll" module.
-		$session->checkout("mozilla/plugin/oji/MRJ")				|| die "checkout failure";
+		$session->checkout("mozilla/nsprpub",	$nsprpub_tag)		|| die "checkout failure";
 	}
 	elsif ($main::pull{runtime})
 	{
@@ -216,7 +216,7 @@ sub Checkout()
 		$session->checkout("mozilla/lib/mac/NSRuntime")				|| die "checkout failure";
 		$session->checkout("mozilla/lib/mac/MoreFiles")				|| die "checkout failure";
 		$session->checkout("mozilla/lib/mac/MacMemoryAllocator")	|| die "checkout failure";
-		$session->checkout("mozilla/nsprpub")						|| die "checkout failure";	
+		$session->checkout("mozilla/nsprpub",	$nsprpub_tag)		|| die "checkout failure";	
 	}
 }
 

build/mac/PullNGlayout.pl

@@ -32,12 +32,8 @@ use Moz;
 # configuration variables
 $DEBUG = 1;
 $pull{all} = 1;
-$pull{lizard} = 0;
-$pull{xpcom} = 0;
-$pull{imglib} = 0;
-$pull{netlib} = 0;
-$pull{nglayout} = 0;
-$pull{mac} = 0;
+$pull{moz} = 0;
+$pull{runtime} = 0;
 
 if ($pull{all})
 {