From 98afed87e868ce83009e0dea08dfc676c8bf71f3 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Fri, 13 Apr 2001 23:50:22 +0000 Subject: [PATCH] bug 75487 PSM2 installer issues, r=/sr=leaf --- xpinstall/packager/mac/browser.jst | 4 ++++ xpinstall/packager/unix/psm.jst | 6 ++++++ xpinstall/packager/windows/config.it | 2 +- xpinstall/packager/windows/psm.jst | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index e43c0506e2d..4d5e29188ca 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -45,6 +45,10 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"help.jar"),"locale/en-US/help/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "pippki/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "pipnss/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "en-US/pippki/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "en-US/pipnss/"); // make an alias to the browser on the desktop var desktopFolder = getFolder("Mac Desktop"); diff --git a/xpinstall/packager/unix/psm.jst b/xpinstall/packager/unix/psm.jst index cc48da44763..e93b9e44b89 100644 --- a/xpinstall/packager/unix/psm.jst +++ b/xpinstall/packager/unix/psm.jst @@ -20,6 +20,12 @@ if(verifyDiskSpace(communicatorFolder, srDest)) if(err==SUCCESS) { + var pki = getFolder("Chrome","pippki.jar"); + var nss = getFolder("Chrome","pipnss.jar"); + registerChrome(CONTENT | DELAYED_CHROME, pki, "pippki/"); + registerChrome(CONTENT | DELAYED_CHROME, nss, "pipnss/"); + registerChrome(LOCALE | DELAYED_CHROME, pki, "en-US/pippki/"); + registerChrome(LOCALE | DELAYED_CHROME, nss, "en-US/pipnss/"); err = performInstall(); logComment("performInstall() returned: " + err); } diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it index 6ba1bad6548..f13f42354f9 100644 --- a/xpinstall/packager/windows/config.it +++ b/xpinstall/packager/windows/config.it @@ -476,7 +476,7 @@ Archive=deflenus.xpi $InstallSize$:deflenus $InstallSizeSystem$ $InstallSizeArchive$:deflenus.xpi -Attributes=SELECTED|INVISIBLE|FOCE_UPGRADE +Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html [Component En US lang pack] diff --git a/xpinstall/packager/windows/psm.jst b/xpinstall/packager/windows/psm.jst index 36e337249fe..3663ef8c51b 100644 --- a/xpinstall/packager/windows/psm.jst +++ b/xpinstall/packager/windows/psm.jst @@ -29,6 +29,12 @@ if(verifyDiskSpace(fProgram, srDest)) // check return value if(err == SUCCESS) { + var pki = getFolder("Chrome", "pippki.jar"); + var nss = getFolder("Chrome", "pipnss.jar"); + registerChrome(CONTENT | DELAYED_CHROME, pki, "pippki/"); + registerChrome(CONTENT | DELAYED_CHROME, nss, "pipnss/"); + registerChrome(LOCALE | DELAYED_CHROME, pki, "en-US/pippki/"); + registerChrome(LOCALE | DELAYED_CHROME, nss, "en-US/pipnss/"); err = performInstall(); logComment("performInstall() returned: " + err); }