fixing bug #63307 - PSM is not being installed in mozilla builds. sr=beinvenu, r=leaf,sgehani. not part of any tinderbox builds. affects only windows platforms

xpinstall/packager/packages-win

@@ -275,3 +275,9 @@ bin\chrome\messenger\*
 [chatzilla]
 bin\components\chatzilla-service.js
 bin\chrome\chatzilla\*
+
+[psm]
+bin\psm.exe
+bin\nssckbi.dll
+bin\psmdata\*
+

xpinstall/packager/windows/.cvsignore

@@ -15,3 +15,5 @@ mail.template
 uninstall.ini
 xpcom.js
 xpcom.template
+psm.js
+psm.template

xpinstall/packager/windows/config.it

@@ -161,9 +161,10 @@ Description Long=Program will be installed with the minimal options.
 ; this Setup Type is selected.
 C0=Component XPCOM
 C1=Component Navigator
-C2=Component Uninstaller
-C3=Component US English Profile Defaults
-C4=Component En US lang pack
+C2=Component PSM
+C3=Component Uninstaller
+C4=Component US English Profile Defaults
+C5=Component En US lang pack
 
 [Setup Type1]
 ;*** LOCALIZE ME BABY ***
@@ -177,10 +178,11 @@ Description Long=Program will be installed with the most common options.
 C0=Component XPCOM
 C1=Component Navigator
 C2=Component MailNews
-C3=Component Uninstaller
-C4=Component Chatzilla
-C5=Component US English Profile Defaults
-C6=Component En US lang pack
+C3=Component PSM
+C4=Component Uninstaller
+C5=Component Chatzilla
+C6=Component US English Profile Defaults
+C7=Component En US lang pack
 
 [Setup Type2]
 ;*** LOCALIZE ME BABY ***
@@ -196,23 +198,13 @@ Description Long=You may choose the options you want to install.  Recommended fo
 C0=Component XPCOM
 C1=Component Navigator
 C2=Component MailNews
-C3=Component Uninstaller
-C4=Component Chatzilla
-C5=Component US English Profile Defaults
-C6=Component En US lang pack
+C3=Component PSM
+C4=Component Uninstaller
+C5=Component Chatzilla
+C6=Component US English Profile Defaults
+C7=Component En US lang pack
 
-;[Setup Type3]
-;Description Short=C&ustom
-;Description Long=You may choose the options you want to install.  Recommended for advanced users.
 
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-;C0=Component XPCOM
-;C1=Component Navigator
-;C2=Component MailNews
-;C3=Component Uninstaller
-;C4=Component Chatzilla
 
 [Dialog Select Components]
 Show Dialog=TRUE
@@ -428,6 +420,22 @@ $InstallSizeArchive$:langenus.xpi
 Attributes=SELECTED|INVISIBLE
 Parameter=
 
+[Component PSM]
+Description Short=Personal Security Manager
+;*** LOCALIZE ME BABY ***
+Description Long=Personal Security Manager (PSM) for crypto operations
+Archive=psm.xpi
+$InstallSize$:psm
+$InstallSizeSystem$
+$InstallSizeArchive$:psm.xpi
+;Dependency0=
+; Attributes can be the following values:
+;   SELECTED  - the component is selected to be installed by default.
+;   INVISIBLE - the component is not shown in the Select Components dialog.
+Attributes=SELECTED
+Parameter=
+
+
 
 [Core]
 Source=[XPI PATH]\xpcom.xpi

xpinstall/packager/windows/makeall.pl

@@ -81,6 +81,7 @@ if(!(-d "$inStagePath"))
 @gComponentList = ("xpcom",
                    "browser",
                    "mail",
+                   "psm",
                    "chatzilla",
                    "deflenus",
                    "langenus");

xpinstall/packager/windows/psm.jst

@@ -0,0 +1,65 @@
+function updateWindowsRegistry(psmPath)
+{
+  var winReg = getWinRegistry();
+  if(winReg != null)
+  {
+    winReg.setRootKey(winReg.HKEY_LOCAL_MACHINE);
+    subKey    = "SOFTWARE\\$CompanyName$";
+    err       = winReg.createKey(subKey, "");
+
+    subKey    = "SOFTWARE\\$CompanyName$\\Personal Security Manager";
+    err       = winReg.createKey(subKey, "");
+
+    subKey    = "SOFTWARE\\$CompanyName$\\Personal Security Manager\\Main";
+    valueName = "Install Directory";
+    err       = winReg.createKey(subKey, "");
+    err       = winReg.setValueString(subKey, valueName, psmPath);
+  }
+  else
+  {
+    logComment("getWinRegsitry() failed: " + winReg);
+  }
+}
+
+// main
+var srDest;
+var err;
+var fProgram;
+
+$Ren8dot3List$
+
+srDest = $SpaceRequired$:bin;
+err    = initInstall("Personal Security Manager", "Personal Security Manager", "$Version$"); 
+logComment("initInstall: " + err);
+
+fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+if(verifyDiskSpace(fProgram, srDest))
+{
+  setPackageFolder(fProgram);
+
+  $Ren8dot3Call$
+
+  err = addDirectory("",
+                     "$Version$",
+                     "bin",              // dir name in jar to extract 
+                     fProgram,           // Where to put this file (Returned from GetFolder) 
+                     "",                 // subdir name to create relative to fProgram
+                     true);              // Force Flag 
+  logComment("addDirectory() returned: " + err);
+
+  // check return value
+  if(err == SUCCESS)
+  {
+    updateWindowsRegistry(fProgram);
+    err = performInstall(); 
+    logComment("performInstall() returned: " + err);
+  }
+  else
+    cancelInstall(err);
+}
+else
+  cancelInstall(INSUFFICIENT_DISK_SPACE);
+
+// end main