зеркало из https://github.com/mozilla/pjs.git
Bug 287262 - Make en-US.manifest contain all the locale registration (not in installed-chrome.txt any more) r=gandalf a=asa
This commit is contained in:
bsmedberg%covad.net
Родитель
f718f510ee
Коммит
e0a926bf15
|
|
@ -1,112 +0,0 @@
|
|||
#filter substitution
|
||||
|
||||
var srDest = $SpaceRequired$;
|
||||
var err;
|
||||
var fProgram;
|
||||
var platformNode;
|
||||
var searchPlugins = "searchplugins";
|
||||
|
||||
platformNode = getPlatform();
|
||||
if (platformNode == 'mac') {
|
||||
searchPlugins = "Search Plugins";
|
||||
}
|
||||
logComment("initInstall: platformNode=" + platformNode);
|
||||
// end
|
||||
// end - OS type detection
|
||||
|
||||
var prettyName = "@AB_CD@ Language Pack";
|
||||
var chromeNode = "@AB_CD@";
|
||||
|
||||
var regName = "locales/mozilla/" + chromeNode;
|
||||
var chromeName = chromeNode + ".jar";
|
||||
var localeName = "locale/" + chromeNode + "/";
|
||||
|
||||
err = initInstall(prettyName, regName, "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
fProgram = getFolder("Program");
|
||||
logComment("fProgram: " + fProgram);
|
||||
|
||||
if (verifyDiskSpace(fProgram, srDest))
|
||||
{
|
||||
var chromeType = LOCALE;
|
||||
var fTarget;
|
||||
|
||||
err = addDirectory("",
|
||||
"bin",
|
||||
fProgram,
|
||||
"");
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the user profile:" + fProgram);
|
||||
err = addDirectory("","bin",fProgram,"");
|
||||
}
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
// check return value
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
fTarget = getFolder("Program", "defaults");
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/defaults", // dir name in JAR to extract
|
||||
fTarget, // Where to put this file
|
||||
""); // subdir name relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
fTarget = getFolder("Program", searchPlugins);
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/searchplugins",
|
||||
fTarget,
|
||||
"");
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+chromeName);
|
||||
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global-platform/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global-region/");
|
||||
|
||||
registerChrome(chromeType, cf, "locale/browser/");
|
||||
registerChrome(chromeType, cf, "locale/browser-region/");
|
||||
registerChrome(chromeType, cf, "locale/branding/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/");
|
||||
|
||||
#ifdef EXTENSION_PREF
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/autoconfig/");
|
||||
#endif
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/cookie/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/pipnss/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/pippki/");
|
||||
|
||||
#ifdef LOCALE_HAS_HELP
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/help/");
|
||||
#endif
|
||||
#ifdef LOCALE_HAS_DOMI
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/inspector/");
|
||||
#endif
|
||||
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/communicator/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
else
|
||||
{
|
||||
cancelInstall(err);
|
||||
logComment("cancelInstall due to error: " + err);
|
||||
}
|
||||
}
|
||||
else
|
||||
cancelInstall(INSUFFICIENT_DISK_SPACE);
|
||||
|
|
@ -39,17 +39,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
""); // Force Flag
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the user profile:" + fProgram);
|
||||
err = addDirectory("","bin",fProgram,"");
|
||||
}
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
// check return value
|
||||
|
|
@ -71,35 +60,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+chromeName);
|
||||
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global-platform/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/global-region/");
|
||||
|
||||
registerChrome(chromeType, cf, "locale/browser/");
|
||||
registerChrome(chromeType, cf, "locale/browser-region/");
|
||||
registerChrome(chromeType, cf, "locale/branding/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/");
|
||||
|
||||
#ifdef EXTENSION_PREF
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/autoconfig/");
|
||||
#endif
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/cookie/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/pippki/");
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/pipnss/");
|
||||
|
||||
#ifdef LOCALE_HAS_HELP
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/help/");
|
||||
#endif
|
||||
#ifdef LOCALE_HAS_DOMI
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/inspector/");
|
||||
#endif
|
||||
|
||||
registerChrome(chromeType, cf, "locale/@AB_CD@/communicator/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
* locale/browser/contents.rdf (generic/chrome/browser/contents.rdf)
|
||||
% locale browser @AB_CD@ %locale/browser/
|
||||
locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd)
|
||||
locale/browser/credits.dtd (%chrome/browser/credits.dtd)
|
||||
* locale/browser/browser.dtd (%chrome/browser/browser.dtd)
|
||||
|
|
@ -45,8 +45,8 @@
|
|||
locale/browser/preferences/sanitize.dtd (%chrome/browser/preferences/sanitize.dtd)
|
||||
locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd)
|
||||
locale/browser/sidebar/sidebar.properties (%chrome/browser/sidebar/sidebar.properties)
|
||||
% locale browser-region @AB_CD@ %locale/browser-region/
|
||||
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
|
||||
* locale/browser-region/contents.rdf (generic/chrome/browser-region/contents.rdf)
|
||||
locale/browser/help/help.rdf (%chrome/help/firebirdhelp.rdf)
|
||||
locale/browser/help/firebird-index1.rdf (%chrome/help/firebird-index1.rdf)
|
||||
locale/browser/help/firebird-toc.rdf (%chrome/help/firebird-toc.rdf)
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
locale/browser/help/glossary.xhtml (%chrome/help/glossary.xhtml)
|
||||
locale/browser/help/firebird-glossary.rdf (%chrome/help/firebird-glossary.rdf)
|
||||
#ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
* locale/branding/contents.rdf (generic/chrome/branding/contents.rdf)
|
||||
% locale branding @AB_CD@ %locale/branding/
|
||||
locale/branding/brand.dtd (%chrome/branding/brand.dtd)
|
||||
locale/branding/brand.properties (%chrome/branding/brand.properties)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,11 +27,3 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs realchrome::
|
||||
@$(REGCHROME) content autoconfig comm.jar
|
||||
@$(REGCHROME) locale en-US/autoconfig en-US.jar
|
||||
|
||||
install::
|
||||
@$(REGCHROME_INSTALL) content autoconfig comm.jar
|
||||
@$(REGCHROME_INSTALL) locale en-US/autoconfig en-US.jar
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef MOZ_XUL_APP
|
||||
comm.jar:
|
||||
* content/autoconfig/contents.rdf (content/contents.rdf)
|
||||
|
||||
#ifndef MOZ_XUL_APP
|
||||
en-US.jar:
|
||||
* locale/en-US/autoconfig/contents.rdf (locale/en-US/contents.rdf)
|
||||
locale/en-US/autoconfig/autoconfig.properties (/toolkit/locales/en-US/chrome/autoconfig/autoconfig.properties)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
* locale/@AB_CD@/reporter/contents.rdf (generic/chrome/contents.rdf)
|
||||
% locale reporter @AB_CD@ %locale/@AB_CD@/reporter/
|
||||
locale/@AB_CD@/reporter/reportWizard.dtd (%chrome/reportWizard.dtd)
|
||||
locale/@AB_CD@/reporter/about.dtd (%chrome/about.dtd)
|
||||
locale/@AB_CD@/reporter/reporterOverlay.dtd (%chrome/reporterOverlay.dtd)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
* locale/@AB_CD@/global/contents.rdf (generic/chrome/global/contents.rdf)
|
||||
% locale global @AB_CD@ %locale/@AB_CD@/global/
|
||||
+ locale/@AB_CD@/global/accept2locale.properties (%chrome/global/accept2locale.properties)
|
||||
locale/@AB_CD@/global/brand.dtd (generic/chrome/global/brand.dtd)
|
||||
+ locale/@AB_CD@/global/charsetOverlay.dtd (%chrome/global/charsetOverlay.dtd)
|
||||
|
|
@ -54,18 +54,18 @@
|
|||
locale/@AB_CD@/global/nsProgressDialog.properties (%chrome/global/nsProgressDialog.properties)
|
||||
locale/@AB_CD@/global/history/history.properties (%chrome/global/history/history.properties)
|
||||
locale/@AB_CD@/global/xpinstall/xpinstall.properties (%chrome/global/xpinstall/xpinstall.properties)
|
||||
* locale/@AB_CD@/global-region/contents.rdf (generic/chrome/global-region/contents.rdf)
|
||||
% locale global-region @AB_CD@ %locale/@AB_CD@/global-region/
|
||||
+ locale/@AB_CD@/global-region/region.dtd (%chrome/global-region/region.dtd)
|
||||
+ locale/@AB_CD@/global-region/region.properties (%chrome/global-region/region.properties)
|
||||
+ locale/@AB_CD@/global-region/builtinURLs.rdf (%chrome/global-region/builtinURLs.rdf)
|
||||
* locale/@AB_CD@/global-platform/contents.rdf (generic/chrome/global-platform/contents.rdf)
|
||||
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/
|
||||
locale/@AB_CD@/global-platform/mac/platformKeys.properties (%chrome/global-platform/mac/platformKeys.properties)
|
||||
locale/@AB_CD@/global-platform/unix/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties)
|
||||
locale/@AB_CD@/global-platform/win/platformKeys.properties (%chrome/global-platform/win/platformKeys.properties)
|
||||
locale/@AB_CD@/global-platform/mac/intl.properties (%chrome/global-platform/mac/intl.properties)
|
||||
locale/@AB_CD@/global-platform/unix/intl.properties (%chrome/global-platform/unix/intl.properties)
|
||||
locale/@AB_CD@/global-platform/win/intl.properties (%chrome/global-platform/win/intl.properties)
|
||||
* locale/@AB_CD@/mozapps/contents.rdf (generic/chrome/mozapps/contents.rdf)
|
||||
% locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/
|
||||
* locale/@AB_CD@/mozapps/downloads/unknownContentType.properties (%chrome/mozapps/downloads/unknownContentType.properties)
|
||||
* locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd (%chrome/mozapps/downloads/unknownContentType.dtd)
|
||||
locale/@AB_CD@/mozapps/downloads/editAction.dtd (%chrome/mozapps/downloads/editAction.dtd)
|
||||
|
|
@ -91,13 +91,13 @@
|
|||
locale/@AB_CD@/mozapps/update/errors.dtd (%chrome/mozapps/update/errors.dtd)
|
||||
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/xpinstall/xpinstallConfirm.dtd)
|
||||
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/xpinstall/xpinstallConfirm.properties)
|
||||
* locale/@AB_CD@/cookie/contents.rdf (generic/chrome/cookie/contents.rdf)
|
||||
% locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
|
||||
locale/@AB_CD@/cookie/cookieAcceptDialog.dtd (%chrome/cookie/cookieAcceptDialog.dtd)
|
||||
locale/@AB_CD@/cookie/cookieAcceptDialog.properties (%chrome/cookie/cookieAcceptDialog.properties)
|
||||
* locale/@AB_CD@/passwordmgr/contents.rdf (generic/chrome/passwordmgr/contents.rdf)
|
||||
% locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
|
||||
* locale/@AB_CD@/passwordmgr/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties)
|
||||
* locale/@AB_CD@/passwordmgr/passwordManager.dtd (%chrome/passwordmgr/passwordManager.dtd)
|
||||
* locale/@AB_CD@/autoconfig/contents.rdf (generic/chrome/autoconfig/contents.rdf)
|
||||
% locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
|
||||
locale/@AB_CD@/autoconfig/autoconfig.properties (%chrome/autoconfig/autoconfig.properties)
|
||||
% locale help @AB_CD@ %locale/@AB_CD@/help/
|
||||
locale/@AB_CD@/help/help.properties (%chrome/mozapps/help/help.properties)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче