зеркало из https://github.com/mozilla/gecko-dev.git
bug 75487 PSM2 installer issues, r=/sr=leaf
This commit is contained in:
Родитель
390bcc5098
Коммит
c64c1ce909
|
@ -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");
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче