b=76915 r=dveditz sr=sfraser a=asa

Giving GUI feedback instead of crashing
Part 2 of 3 - changes to make files only

build/mac/build_scripts/MozillaBuildList.pm

@@ -303,6 +303,7 @@ sub ProcessJarManifests()
 {
     my($dist_dir) = GetBinDirectory();
     my($chrome_dir) = "$dist_dir"."Chrome";
+    my($resource_dir) = "$dist_dir" . "res:";
 
     # a hash of jars passed as context to the following calls
     my(%jars);
@@ -389,6 +390,7 @@ sub ProcessJarManifests()
     if ($main::options{psm}) {
     	CreateJarFromManifest(":mozilla:security:manager:ssl:resources:jar.mn", $chrome_dir, \%jars);
     	CreateJarFromManifest(":mozilla:security:manager:pki:resources:jar.mn", $chrome_dir, \%jars);
+    	InstallFromManifest(":mozilla:security:manager:ssl:src:MANIFEST_NSSIFAIL", "$resource_dir");
     }
     # bad jar.mn files
 #    CreateJarFromManifest(":mozilla:extensions:xmlterm:jar.mn", $chrome_dir, \%jars);

security/manager/ssl/src/Makefile.in

@@ -51,6 +51,9 @@ META_COMPONENT	= crypto
 EXPORTS = 			\
 	$(NULL)
 
+install::
+	$(INSTALL) $(srcdir)/nssifail.txt $(DIST)/bin/res
+
 CPPSRCS = 				\
 	nsNSSCallbacks.cpp		\
 	nsNSSComponent.cpp		\

security/manager/ssl/src/makefile.win

@@ -105,4 +105,5 @@ include <$(DEPTH)\config\rules.mak>
 
 install:: $(DLL)
     $(MAKE_INSTALL) $(DIST)\lib\nssckbi.dll $(DIST)\bin
+    $(MAKE_INSTALL) nssifail.txt $(DIST)\bin\res
 

xpinstall/packager/packages-mac

@@ -255,6 +255,7 @@ viewer:res:rdf:unread.gif
 viewer:res:rdf:xpidl-test-1.xul
 viewer:res:samples:*
 viewer:res:cmessage.txt
+viewer:res:nssifail.txt
 ; the line above will skip aliases to subdirectories; let's list them explicitly
 viewer:res:samples:sampleimages
 viewer:res:builtin:htmlBindings.xml

xpinstall/packager/packages-static-unix

@@ -248,3 +248,4 @@ bin/components/pipnss.xpt
 bin/components/pippki.xpt
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
+bin/res/nssifail.txt

xpinstall/packager/packages-static-win

@@ -255,4 +255,5 @@ bin\components\pipnss.xpt
 bin\components\pippki.xpt
 bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
+bin\res\nssifail.txt
 

xpinstall/packager/packages-unix

@@ -345,3 +345,4 @@ bin/components/libpippki.so
 bin/components/pippki.xpt
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
+bin/res/nssifail.txt

xpinstall/packager/packages-win

@@ -351,4 +351,5 @@ bin\components\pippki.dll
 bin\components\pippki.xpt
 bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
+bin\res\nssifail.txt