bug 328317 - merge platform .jar files into en-US.jar, r=mento for the mozilla/config changes r=jag sr=Neil

This commit is contained in:
kairo%kairo.at 2006-04-08 11:49:47 +00:00
parent 9ff4c86437
commit 6aea674984
39 changed files with 106 additions and 703 deletions

View File

@ -707,16 +707,6 @@ xpfe/components/history/Makefile
xpfe/components/history/src/Makefile
xpfe/components/history/public/Makefile
xpfe/components/intl/Makefile
xpfe/components/prefwindow/Makefile
xpfe/components/prefwindow/resources/Makefile
xpfe/components/prefwindow/resources/content/Makefile
xpfe/components/prefwindow/resources/content/unix/Makefile
xpfe/components/prefwindow/resources/content/win/Makefile
xpfe/components/prefwindow/resources/locale/Makefile
xpfe/components/prefwindow/resources/locale/en-US/Makefile
xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile
xpfe/components/prefwindow/resources/locale/en-US/win/Makefile
xpfe/components/prefwindow/resources/locale/en-US/mac/Makefile
xpfe/components/related/Makefile
xpfe/components/related/src/Makefile
xpfe/components/related/public/Makefile

View File

@ -36,6 +36,25 @@ sub foreignPlatformFile
return 0;
}
sub foreignPlatformPath
{
my ($jarpath) = @_;
if (!$win32 && index($jarpath, "-platform/win") != -1) {
return 1;
}
if (!$unix && index($jarpath, "-platform/unix") != -1) {
return 1;
}
if (!$macos && index($jarpath, "-platform/mac") != -1) {
return 1;
}
return 0;
}
#print "add-chrome $installedChromeFile $disableJarPackaging $chromeType $pkgName $jarFileName\n";
my $nofilelocks = 0;
@ -73,7 +92,7 @@ if ($jarFileName =~ /(.*)\.jar/) {
$jarFileName = $1;
}
if (!foreignPlatformFile($jarFileName)) {
if (!foreignPlatformFile($jarFileName) && !foreignPlatformPath($pkgName)) {
my $line;
if ($disableJarPackaging) {

View File

@ -203,6 +203,25 @@ sub foreignPlatformFile
return 0;
}
sub foreignPlatformPath
{
my ($jarpath) = @_;
if (!$win32 && index($jarpath, "-platform/win") != -1) {
return 1;
}
if (!$unix && index($jarpath, "-platform/unix") != -1) {
return 1;
}
if (!$macos && index($jarpath, "-platform/mac") != -1) {
return 1;
}
return 0;
}
sub zipErrorCheck($$)
{
my ($err,$lockfile) = @_;
@ -515,7 +534,7 @@ start:
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0);
$args = "$args$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg &&
if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
$dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
{
my $chrome_type = $1;
@ -527,7 +546,8 @@ start:
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0);
$overrides = "$overrides$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
$dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
{
my $chrome_type = $1;
my $pkg_name = $2;
@ -539,7 +559,8 @@ start:
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1);
$overrides = "$overrides$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
$dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
{
my $chrome_type = $1;
my $pkg_name = $2;

View File

@ -23,17 +23,6 @@
locale/@AB_CD@/global/security/caps.properties (%chrome/security/caps.properties)
locale/@AB_CD@/global/xml/prettyprint.dtd (%chrome/xml/prettyprint.dtd)
locale/@AB_CD@/global/webservices/security.properties (%chrome/webservices/security.properties)
#ifdef MOZ_XUL_APP
locale/@AB_CD@/global-platform/win/accessible.properties (%chrome/accessibility/win/accessible.properties)
locale/@AB_CD@/global-platform/mac/accessible.properties (%chrome/accessibility/mac/accessible.properties)
locale/@AB_CD@/global-platform/unix/accessible.properties (%chrome/accessibility/unix/accessible.properties)
#endif
#ifndef MOZ_XUL_APP
en-win.jar:
locale/en-US/global-platform/accessible.properties (%chrome/accessibility/win/accessible.properties)
en-unix.jar:
locale/en-US/global-platform/accessible.properties (%chrome/accessibility/unix/accessible.properties)
en-mac.jar:
locale/en-US/global-platform/accessible.properties (%chrome/accessibility/mac/accessible.properties)
#endif

View File

@ -137,7 +137,7 @@ jar:resource:///chrome/en-US.jar!/locale/en-US/editor/editorNavigatorOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/global-region/region.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/utilityOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/help/helpMenuOverlay.dtd
jar:resource:///chrome/en-win.jar!/locale/en-US/global-platform/platformGlobalOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/global-platform/win/platformGlobalOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/viewZoomOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/tasksOverlay.dtd
jar:resource:///chrome/en-US.jar!/locale/en-US/messenger/mailTasksOverlay.dtd
@ -204,10 +204,10 @@ jar:resource:///chrome/toolkit.jar!/content/global/autocomplete.xml
jar:resource:///chrome/toolkit.jar!/content/global/bindings/textbox.xml
jar:resource:///chrome/toolkit.jar!/content/global/bindings/outliner.xml
jar:resource:///chrome/en-US.jar!/locale/en-US/navigator/navigator.properties
jar:resource:///chrome/en-win.jar!/locale/en-US/navigator-platform/navigator.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/navigator-platform/win/navigator.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/necko/necko.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmarks.properties
jar:resource:///chrome/en-win.jar!/locale/en-US/global-platform/platformKeys.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/global-platform/win/platformKeys.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/utilityOverlay.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/navigator-region/region.properties
jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/viewZoomOverlay.properties

View File

@ -68,19 +68,13 @@ en-US.jar:
locale/en-US/navigator/mailNavigatorOverlay.dtd (resources/locale/en-US/mailNavigatorOverlay.dtd)
* locale/en-US/navigator-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/en-US/navigator-region/region.properties (resources/locale/en-US/region.properties)
en-mac.jar:
* locale/en-US/navigator-platform/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/mac/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/mac/navigator.properties)
en-unix.jar:
* locale/en-US/navigator-platform/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/unix/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/unix/navigator.properties)
en-win.jar:
* locale/en-US/navigator-platform/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/win/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/win/navigator.properties)
* locale/en-US/navigator-platform/mac/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/navigator-platform/mac/platformNavigationBindings.dtd (resources/locale/en-US/mac/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/mac/navigator.properties (resources/locale/en-US/mac/navigator.properties)
* locale/en-US/navigator-platform/unix/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/navigator-platform/unix/platformNavigationBindings.dtd (resources/locale/en-US/unix/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/unix/navigator.properties (resources/locale/en-US/unix/navigator.properties)
* locale/en-US/navigator-platform/win/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/navigator-platform/win/platformNavigationBindings.dtd (resources/locale/en-US/win/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/win/navigator.properties (resources/locale/en-US/win/navigator.properties)
#endif

View File

@ -74,16 +74,10 @@ en-US.jar:
* locale/en-US/branding/brand.properties (resources/locale/en-US/brand.properties)
* locale/en-US/communicator-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/en-US/communicator-region/region.properties (resources/locale/en-US/region.properties)
en-win.jar:
* locale/en-US/communicator-platform/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/communicator-platform/platformCommunicatorOverlay.dtd (resources/locale/en-US/win/platformCommunicatorOverlay.dtd)
en-unix.jar:
* locale/en-US/communicator-platform/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/communicator-platform/platformCommunicatorOverlay.dtd (resources/locale/en-US/unix/platformCommunicatorOverlay.dtd)
en-mac.jar:
* locale/en-US/communicator-platform/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/communicator-platform/platformCommunicatorOverlay.dtd (resources/locale/en-US/mac/platformCommunicatorOverlay.dtd)
* locale/en-US/communicator-platform/win/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/communicator-platform/win/platformCommunicatorOverlay.dtd (resources/locale/en-US/win/platformCommunicatorOverlay.dtd)
* locale/en-US/communicator-platform/unix/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/communicator-platform/unix/platformCommunicatorOverlay.dtd (resources/locale/en-US/unix/platformCommunicatorOverlay.dtd)
* locale/en-US/communicator-platform/mac/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/communicator-platform/mac/platformCommunicatorOverlay.dtd (resources/locale/en-US/mac/platformCommunicatorOverlay.dtd)
#endif

View File

@ -83,7 +83,6 @@ ifndef MOZ_PHOENIX
ifndef MOZ_XULRUNNER
DIRS += \
related \
prefwindow \
console \
updates \
autocomplete \

View File

@ -81,6 +81,15 @@ comm.jar:
content/communicator/pref/pref-cookies.xul (prefwindow/resources/content/pref-cookies.xul)
content/communicator/pref/pref-images.xul (prefwindow/resources/content/pref-images.xul)
content/communicator/pref/pref-popups.xul (prefwindow/resources/content/pref-popups.xul)
#ifdef XP_MACOSX
# content/communicator/pref/platformPrefOverlay.xul (prefwindow/resources/content/mac/platformPrefOverlay.xul)
#else
#ifdef XP_WIN32
content/communicator/pref/platformPrefOverlay.xul (prefwindow/resources/content/win/platformPrefOverlay.xul)
#else
content/communicator/pref/platformPrefOverlay.xul (prefwindow/resources/content/unix/platformPrefOverlay.xul)
#endif
#endif
content/communicator/related/related-panel.xul (related/resources/related-panel.xul)
content/communicator/related/related-panel.js (related/resources/related-panel.js)
content/communicator/search/search-editor.js (search/resources/search-editor.js)
@ -166,6 +175,9 @@ en-US.jar:
locale/en-US/communicator/pref/autocomplete-autofill-off.gif (prefwindow/resources/locale/en-US/autocomplete-autofill-off.gif)
locale/en-US/communicator/pref/autocomplete-showpopup.gif (prefwindow/resources/locale/en-US/autocomplete-showpopup.gif)
locale/en-US/communicator/pref/autocomplete-showsearch.gif (prefwindow/resources/locale/en-US/autocomplete-showsearch.gif)
locale/en-US/communicator-platform/mac/pref/platformPrefOverlay.dtd (prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd)
locale/en-US/communicator-platform/unix/pref/platformPrefOverlay.dtd (prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd)
locale/en-US/communicator-platform/win/pref/platformPrefOverlay.dtd (prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd)
locale/en-US/communicator/search/internetresults.dtd (search/resources/locale/en-US/internetresults.dtd)
locale/en-US/communicator/search/search-editor.dtd (search/resources/locale/en-US/search-editor.dtd)
locale/en-US/communicator/search/search-editor.properties (search/resources/locale/en-US/search-editor.properties)
@ -185,6 +197,7 @@ en-US.jar:
locale/en-US/global/console.properties (console/resources/locale/en-US/console.properties)
locale/en-US/global/finddialog.dtd (find/resources/locale/en-US/finddialog.dtd)
locale/en-US/global/finddialog.properties (find/resources/locale/en-US/finddialog.properties)
locale/en-US/global-platform/win/nsWindowsHooks.properties (winhooks/locale/en-US/nsWindowsHooks.properties)
* locale/en-US/cookie/contents.rdf (cookie/locale/en-US/contents.rdf)
locale/en-US/cookie/cookieAcceptDialog.properties (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties)
locale/en-US/cookie/cookieAcceptDialog.dtd (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd)
@ -199,9 +212,6 @@ toolkit.jar:
content/global/finddialog.xul (find/resources/finddialog.xul)
content/global/filepicker.js (filepicker/res/content/filepicker.js)
content/global/filepicker.xul (filepicker/res/content/filepicker.xul)
en-win.jar:
locale/en-US/global-platform/nsWindowsHooks.properties (winhooks/locale/en-US/nsWindowsHooks.properties)
#endif
toolkit.jar:

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = resources
include $(topsrcdir)/config/rules.mk

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = content locale
include $(topsrcdir)/config/rules.mk

View File

@ -1,52 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifeq ($(OS_ARCH),WINNT)
DIRS = win
else
DIRS = unix
endif
include $(topsrcdir)/config/rules.mk

View File

@ -1,2 +0,0 @@
comm.jar:
content/communicator/pref/platformPrefOverlay.xul

View File

@ -1,46 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

View File

@ -1,2 +0,0 @@
comm.jar:
content/communicator/pref/platformPrefOverlay.xul

View File

@ -1,46 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2001
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

View File

@ -1,2 +0,0 @@
comm.jar:
content/communicator/pref/platformPrefOverlay.xul

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = en-US
include $(topsrcdir)/config/rules.mk

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = mac unix win
include $(topsrcdir)/config/rules.mk

View File

@ -1,48 +0,0 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is preference localization for macos
#
# The Initial Developer of the Original Code is mozilla.org
#
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NO_JAR_AUTO_REG=1
include $(topsrcdir)/config/rules.mk

View File

@ -1,26 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:en-US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:en-US"
chrome:author="mozilla.org"
chrome:name="en-US"
chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
<RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
<!-- Version Information. State that we work only with major version of this
package. -->
<RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
</RDF:RDF>

View File

@ -1,3 +0,0 @@
en-mac.jar:
* locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd (platformPrefOverlay.dtd)

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NO_JAR_AUTO_REG=1
include $(topsrcdir)/config/rules.mk

View File

@ -1,26 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:en-US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:en-US"
chrome:author="mozilla.org"
chrome:name="en-US"
chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
<RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
<!-- Version Information. State that we work only with major version of this
package. -->
<RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
</RDF:RDF>

View File

@ -1,3 +0,0 @@
en-unix.jar:
* locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd (platformPrefOverlay.dtd)

View File

@ -1,48 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2001
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NO_JAR_AUTO_REG=1
include $(topsrcdir)/config/rules.mk

View File

@ -1,26 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:en-US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:en-US"
chrome:author="mozilla.org"
chrome:name="en-US"
chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
<RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
<!-- Version Information. State that we work only with major version of this
package. -->
<RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
</RDF:RDF>

View File

@ -1,3 +0,0 @@
en-win.jar:
* locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd

View File

@ -68,8 +68,8 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number
ifndef MOZ_XUL_APP
libs realchrome::
@$(REGCHROME) locale en-US/global-platform en-$(CHROME_PLATFORM).jar
@$(REGCHROME) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
install::
@$(REGCHROME_INSTALL) locale en-US/global-platform en-$(CHROME_PLATFORM).jar
@$(REGCHROME_INSTALL) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
endif

View File

@ -117,24 +117,17 @@ en-US.jar:
* locale/en-US/global-region/region.dtd (resources/locale/en-US/region.dtd)
locale/en-US/global-region/region.properties (resources/locale/en-US/region.properties)
locale/en-US/global-region/builtinURLs.rdf (resources/locale/en-US/builtinURLs.rdf)
en-win.jar:
* locale/en-US/global-platform/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/global-platform/platformDialogOverlay.dtd (resources/locale/en-US/win/platformDialogOverlay.dtd)
locale/en-US/global-platform/platformKeys.properties (resources/locale/en-US/win/platformKeys.properties)
locale/en-US/global-platform/wizard.properties (resources/locale/en-US/win/wizard.properties)
en-unix.jar:
* locale/en-US/global-platform/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/global-platform/platformDialogOverlay.dtd (resources/locale/en-US/unix/platformDialogOverlay.dtd)
locale/en-US/global-platform/platformKeys.properties (resources/locale/en-US/unix/platformKeys.properties)
locale/en-US/global-platform/wizard.properties (resources/locale/en-US/unix/wizard.properties)
locale/en-US/global-platform/printjoboptions.dtd (resources/locale/en-US/unix/printjoboptions.dtd)
en-mac.jar:
* locale/en-US/global-platform/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/global-platform/platformDialogOverlay.dtd (resources/locale/en-US/mac/platformDialogOverlay.dtd)
locale/en-US/global-platform/platformKeys.properties (resources/locale/en-US/mac/platformKeys.properties)
locale/en-US/global-platform/wizard.properties (resources/locale/en-US/mac/wizard.properties)
* locale/en-US/global-platform/win/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/global-platform/win/platformDialogOverlay.dtd (resources/locale/en-US/win/platformDialogOverlay.dtd)
locale/en-US/global-platform/win/platformKeys.properties (resources/locale/en-US/win/platformKeys.properties)
locale/en-US/global-platform/win/wizard.properties (resources/locale/en-US/win/wizard.properties)
* locale/en-US/global-platform/unix/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/global-platform/unix/platformDialogOverlay.dtd (resources/locale/en-US/unix/platformDialogOverlay.dtd)
locale/en-US/global-platform/unix/platformKeys.properties (resources/locale/en-US/unix/platformKeys.properties)
locale/en-US/global-platform/unix/wizard.properties (resources/locale/en-US/unix/wizard.properties)
locale/en-US/global-platform/unix/printjoboptions.dtd (resources/locale/en-US/unix/printjoboptions.dtd)
* locale/en-US/global-platform/mac/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/global-platform/mac/platformDialogOverlay.dtd (resources/locale/en-US/mac/platformDialogOverlay.dtd)
locale/en-US/global-platform/mac/platformKeys.properties (resources/locale/en-US/mac/platformKeys.properties)
locale/en-US/global-platform/mac/wizard.properties (resources/locale/en-US/mac/wizard.properties)
#endif

View File

@ -11,12 +11,10 @@ logComment("initInstall: platformNode=" + platformNode);
// --- LOCALIZATION NOTE: translate only these ---
var prettyName = "English (US) Language Pack";
var langcode = "en";
var chromeNode = langcode + "-US";
var chromeNode = "en-US";
// --- END LOCALIZABLE RESOURCES ---
var regName = "locales/mozilla/" + chromeNode;
var chromeName = chromeNode + ".jar";
var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
err = initInstall(prettyName, regName, "$Version$");
@ -52,7 +50,6 @@ if (verifyDiskSpace(fProgram, srDest))
{
// register chrome
var cf = getFolder(fProgram, "chrome/"+chromeName);
var pf = getFolder(fProgram, "chrome/"+platformName);
registerChrome(chromeType, cf, localeName + "global/");
registerChrome(chromeType, cf, localeName + "communicator/");
@ -79,9 +76,9 @@ if (verifyDiskSpace(fProgram, srDest))
registerChrome(chromeType, cf, localeName + "messenger-region/");
registerChrome(chromeType, cf, localeName + "navigator-region/");
registerChrome(chromeType, pf, localeName + "global-platform/");
registerChrome(chromeType, pf, localeName + "communicator-platform/");
registerChrome(chromeType, pf, localeName + "navigator-platform/");
registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "communicator-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "navigator-platform/" + platformNode + "/");
err = performInstall();
logComment("performInstall() returned: " + err);

View File

@ -13,12 +13,10 @@ logComment("initInstall: platformNode=" + platformNode);
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "English (US) Language Pack";
var langcode = "en";
var chromeNode = langcode + "-US";
var chromeNode = "en-US";
// --- END CHANGABLE STUFF ---
var regName = "locales/mozilla/" + chromeNode;
var chromeName = chromeNode + ".jar";
var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = $SpaceRequired$:bin;
@ -55,7 +53,6 @@ if(verifyDiskSpace(fProgram, srDest))
{
// register chrome
var cf = getFolder(fProgram, "chrome/"+chromeName);
var pf = getFolder(fProgram, "chrome/"+platformName);
registerChrome(chromeType, cf, localeName + "global/");
registerChrome(chromeType, cf, localeName + "communicator/");
@ -82,9 +79,9 @@ if(verifyDiskSpace(fProgram, srDest))
registerChrome(chromeType, cf, localeName + "messenger-region/");
registerChrome(chromeType, cf, localeName + "navigator-region/");
registerChrome(chromeType, pf, localeName + "global-platform/");
registerChrome(chromeType, pf, localeName + "communicator-platform/");
registerChrome(chromeType, pf, localeName + "navigator-platform/");
registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "communicator-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "navigator-platform/" + platformNode + "/");
err = performInstall();
logComment("performInstall() returned: " + err);

View File

@ -16,9 +16,6 @@ bin/.autoreg
; en-US
; If you add a new directory you must explicitly call addDirectory in langenus.jst
bin/chrome/en-US.jar
bin/chrome/en-mac.jar
bin/chrome/en-unix.jar
bin/chrome/en-win.jar
bin/defaults/profile/en-US/*
bin/defaults/messenger/en-US/*
bin/searchplugins/*

View File

@ -14,8 +14,6 @@ bin/.autoreg
;
; en-US
bin/chrome/en-US.jar
bin/chrome/en-unix.jar
bin/chrome/en-win.jar
bin/defaults/profile/en-US/*
bin/defaults/messenger/en-US/*
bin/defaults/isp/en-US/movemail.rdf

View File

@ -15,13 +15,7 @@ bin/.autoreg
; en-US
; If you add a new directory you must explicitly call addDirectory in langenus.jst
bin\chrome\en-US.jar
bin\chrome\en-mac.jar
bin\chrome\en-unix.jar
bin\chrome\en-win.jar
bin\chrome\en-US\*
bin\chrome\en-win\*
bin\chrome\en-unix\*
bin\chrome\en-mac\*
bin\defaults\profile\en-US\*
bin\defaults\messenger\en-US\*
bin\searchplugins\*

View File

@ -14,9 +14,6 @@ bin/.autoreg
;
; en-US
bin/chrome/en-US.jar
bin/chrome/en-mac.jar
bin/chrome/en-unix.jar
bin/chrome/en-win.jar
bin/defaults/profile/en-US/*
bin/defaults/messenger/en-US/*
bin/defaults/isp/en-US/movemail.rdf

View File

@ -33,13 +33,6 @@ bin/.autoreg
; en-US
; If you add a new directory you must explicitly call addDirectory in langenus.jst
bin\chrome\en-US.jar
bin\chrome\en-mac.jar
bin\chrome\en-unix.jar
bin\chrome\en-win.jar
bin\chrome\en-US\*
bin\chrome\en-win\*
bin\chrome\en-unix\*
bin\chrome\en-mac\*
bin\chrome\en-US\*
bin\defaults\profile\en-US\*
bin\defaults\messenger\en-US\*

View File

@ -9,12 +9,10 @@ logComment("initInstall: platformNode=" + platformNode);
// --- LOCALIZATION NOTE: translate only these ---
var prettyName = "English (US) Language Pack";
var langcode = "en";
var chromeNode = langcode + "-US";
var chromeNode = "en-US";
// --- END LOCALIZABLE RESOURCES ---
var regName = "locales/mozilla/" + chromeNode;
var chromeName = chromeNode + ".jar";
var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
err = initInstall(prettyName, regName, "$Version$");
@ -50,7 +48,6 @@ if (verifyDiskSpace(fProgram, srDest))
{
// register chrome
var cf = getFolder(fProgram, "chrome/"+chromeName);
var pf = getFolder(fProgram, "chrome/"+platformName);
registerChrome(chromeType, cf, localeName + "global/");
registerChrome(chromeType, cf, localeName + "communicator/");
@ -77,9 +74,9 @@ if (verifyDiskSpace(fProgram, srDest))
registerChrome(chromeType, cf, localeName + "messenger-region/");
registerChrome(chromeType, cf, localeName + "navigator-region/");
registerChrome(chromeType, pf, localeName + "global-platform/");
registerChrome(chromeType, pf, localeName + "communicator-platform/");
registerChrome(chromeType, pf, localeName + "navigator-platform/");
registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "communicator-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "navigator-platform/" + platformNode + "/");
err = performInstall();
logComment("performInstall() returned: " + err);

View File

@ -10,12 +10,10 @@ logComment("initInstall: platformNode=" + platformNode);
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "English (US) Language Pack";
var langcode = "en";
var chromeNode = langcode + "-US";
var chromeNode = "en-US";
// --- END CHANGABLE STUFF ---
var regName = "locales/mozilla/" + chromeNode;
var chromeName = chromeNode + ".jar";
var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = $SpaceRequired$:bin;
@ -52,7 +50,6 @@ if(verifyDiskSpace(fProgram, srDest))
{
// register chrome
var cf = getFolder(fProgram, "chrome/"+chromeName);
var pf = getFolder(fProgram, "chrome/"+platformName);
registerChrome(chromeType, cf, localeName + "global/");
registerChrome(chromeType, cf, localeName + "communicator/");
@ -79,9 +76,9 @@ if(verifyDiskSpace(fProgram, srDest))
registerChrome(chromeType, cf, localeName + "messenger-region/");
registerChrome(chromeType, cf, localeName + "navigator-region/");
registerChrome(chromeType, pf, localeName + "global-platform/");
registerChrome(chromeType, pf, localeName + "communicator-platform/");
registerChrome(chromeType, pf, localeName + "navigator-platform/");
registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "communicator-platform/" + platformNode + "/");
registerChrome(chromeType, cf, localeName + "navigator-platform/" + platformNode + "/");
// mesenger-mapi package exists only on windows.
// Register this package only for windows.
if (platformNode == "win")