71517: Dynamically select platform jar in langxxxx.xpi. r=ssu, sr=dveditz.

package all en-*.jar into langenus.xpi and select on one the fly.

allmakefiles.sh

@@ -670,6 +670,7 @@ xpfe/components/prefwindow/resources/content/unix/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/related/Makefile
 xpfe/components/related/src/Makefile
 xpfe/components/related/public/Makefile
@@ -717,8 +718,10 @@ xpfe/global/resources/content/os2/Makefile
 xpfe/global/resources/content/unix/Makefile
 xpfe/global/resources/locale/Makefile
 xpfe/global/resources/locale/en-US/Makefile
+xpfe/global/resources/locale/en-US/mac/Makefile
 xpfe/global/resources/locale/en-US/os2/Makefile
 xpfe/global/resources/locale/en-US/unix/Makefile
+xpfe/global/resources/locale/en-US/win/Makefile
 xpfe/communicator/Makefile
 xpfe/communicator/resources/Makefile
 xpfe/communicator/resources/locale/Makefile

xpfe/browser/resources/locale/en-US/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= unix
+DIRS		= mac unix win
 
 include $(topsrcdir)/config/rules.mk
 

xpfe/browser/resources/locale/en-US/makefile.win

@@ -32,6 +32,7 @@ CHROME_L10N = \
 	.\askViewZoom.dtd \
 	$(NULL)
 
+DIRS= unix
 
 include <$(DEPTH)\config\rules.mak>
 

xpfe/browser/resources/locale/en-US/unix/makefile.win

@@ -0,0 +1,25 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+

xpfe/components/prefwindow/resources/locale/en-US/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= unix
+DIRS		= unix win
 
 include $(topsrcdir)/config/rules.mk
 

xpfe/components/prefwindow/resources/locale/en-US/makefile.win

@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..\..\..\..
 
-DIRS = win
+DIRS = win unix
 
 CHROME_DIR = locales\en-US
 CHROME_L10N_DIR = communicator\locale\pref

xpfe/components/prefwindow/resources/locale/en-US/unix/makefile.win

@@ -0,0 +1,25 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+

xpfe/components/prefwindow/resources/locale/en-US/win/Makefile.in

@@ -0,0 +1,30 @@
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

xpfe/global/resources/locale/en-US/mac/Makefile.in

@@ -0,0 +1,30 @@
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

xpfe/global/resources/locale/en-US/mac/makefile.win

@@ -0,0 +1,25 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+

xpfe/global/resources/locale/en-US/makefile.win

@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..\..\..
 
-DIRS=win
+DIRS=win unix mac
 
 CHROME_DIR=locales\en-US
 CHROME_L10N_DIR=global\locale

xpfe/global/resources/locale/en-US/unix/makefile.win

@@ -0,0 +1,25 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+

xpfe/global/resources/locale/en-US/win/Makefile.in

@@ -0,0 +1,29 @@
+#
+# 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 Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+nclude $(topsrcdir)/config/rules.mk
+

xpinstall/packager/mac/langenus.jst

@@ -3,6 +3,21 @@ var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
+// OS type detection
+// which platform?
+var platformStr = new String(Install.platform);
+var platformNode;
+if (!platformStr.search(/^Macintosh/))
+    platformNode = 'mac';
+else if (!platformStr.search(/^Win/))
+    platformNode = 'win';
+else
+    platformNode = 'unix';
+
+logComment("initInstall: platformNode=" + platformNode);
+// end
+// end - OS type detection
+
 // --- LOCALIZATION NOTE: translate only these ---
 var prettyName = "English (US) Language Pack";
 var langcode = "en";
@@ -10,7 +25,7 @@ var chromeNode = langcode + "-US";
 // --- END LOCALIZABLE RESOURCES ---
 var regName      = "locales/mozilla/" + chromeNode;
 var chromeName   = chromeNode + ".jar";
-var platformName = langcode + "-mac.jar";
+var platformName = langcode + "-" + platformNode + ".jar";
 var localeName   = "locale/" + chromeNode + "/";
 
 err = initInstall(prettyName, regName, "$Version$"); 

xpinstall/packager/packages-unix

@@ -12,7 +12,9 @@
 ;
 ; en-US
 bin/chrome/en-US.jar
+bin/chrome/en-mac.jar
 bin/chrome/en-unix.jar
+bin/chrome/en-win.jar
 
 [regus]
 ;

xpinstall/packager/packages-win

@@ -13,6 +13,8 @@
 ; en-US 
 bin\chrome\en-US\*
 bin\chrome\en-win\*
+bin\chrome\en-unix\*
+bin\chrome\en-mac\*
 
 [regus]
 ;

xpinstall/packager/unix/langenus.jst

@@ -2,6 +2,21 @@ var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
+// OS type detection
+// which platform?
+var platformStr = new String(Install.platform);
+var platformNode;
+if (!platformStr.search(/^Macintosh/))
+    platformNode = 'mac';
+else if (!platformStr.search(/^Win/))
+    platformNode = 'win';
+else
+    platformNode = 'unix';
+
+logComment("initInstall: platformNode=" + platformNode);
+// end
+// end - OS type detection
+
 // --- LOCALIZATION NOTE: translate only these ---
 var prettyName = "English (US) Language Pack";
 var langcode = "en";
@@ -9,7 +24,7 @@ var chromeNode = langcode + "-US";
 // --- END LOCALIZABLE RESOURCES ---
 var regName    = "locales/mozilla/" + chromeNode;
 var chromeName = chromeNode + ".jar";
-var platformName = langcode + "-unix.jar";
+var platformName = langcode + "-" + platformNode + ".jar";
 var localeName = "locale/" + chromeNode + "/";
 
 err = initInstall(prettyName, regName, "$Version$"); 

xpinstall/packager/windows/langenus.jst

@@ -3,6 +3,21 @@ var srDest;
 var err;
 var fProgram;
 
+// OS type detection
+// which platform?
+var platformStr = new String(Install.platform);
+var platformNode;
+if (!platformStr.search(/^Macintosh/))
+    platformNode = 'mac';
+else if (!platformStr.search(/^Win/))
+    platformNode = 'win';
+else
+    platformNode = 'unix';
+
+logComment("initInstall: platformNode=" + platformNode);
+// end
+// end - OS type detection
+
 // ----LOCALIZATION NOTE: translate only these ------
 var prettyName = "English (US) Language Pack";
 var langcode = "en";
@@ -10,7 +25,7 @@ var chromeNode = langcode + "-US";
 // --- END CHANGABLE STUFF ---
 var regName    = "locales/mozilla/" + chromeNode;
 var chromeName = chromeNode + ".jar";
-var platformName = langcode + "-win.jar";
+var platformName = langcode + "-" + platformNode + ".jar";
 var localeName = "locale/" + chromeNode + "/";
 
 srDest = $SpaceRequired$:bin;