*** NOT PART OF TBOX BUILDS ***

1> Enabling talkback in Unix and Mac builds [bugscape nsbeta2+ b=1405] 2> Adding en-US and en-GB language packs to installers [nsbeta2+ b=41054] [r=ssu]
2000-07-13 02:56:21 +00:00 · 2000-07-13 02:56:21 +00:00 · 3fcd0cd82f
--- a/xpinstall/packager/mac/deflenus.jst
+++ b/xpinstall/packager/mac/deflenus.jst
@ -0,0 +1,33 @@
+var err;
+var fProgram;
+
+// ----LOCALIZATION NOTE: translate only these ------
+var prettyName = "US English Language Pack";
+var regName    = "defaults/mozilla/en-US";
+// --- END CHANGABLE STUFF ---
+
+err    = initInstall(prettyName, regName, "$Version$"); 
+logComment("initInstall: " + err);
+
+fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("",
+                   "$Version$",
+                   "viewer",
+                   fProgram,
+                   "",
+                   true);
+logComment("addDirectory() returned: " + err);
+
+// check return value
+if(err == SUCCESS)
+{
+    err = performInstall(); 
+    logComment("performInstall() returned: " + err);
+}
+else
+{
+    cancelInstall(err);
+    logComment("cancelInstall due to error: " + err);
+}
--- a/xpinstall/packager/mac/langengb.jst
+++ b/xpinstall/packager/mac/langengb.jst
@ -0,0 +1,38 @@
+var err;
+var fProgram;
+
+// --- LOCALIZATION NOTE: translate only these ---
+var prettyName = "English-GB Language Pack";
+var regName    = "locales/mozilla/en-GB";
+var chromeName = "locales/en-GB";
+// --- END LOCALIZABLE RESOURCES ---
+
+err = initInstall(prettyName, regName, "$Version$"); 
+logComment("initInstall: " + err);
+
+fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("",
+                   "$Version$",
+                   "viewer",
+                   fProgram,
+                   "",
+                   true);
+logComment("addDirectory() returned: " + err);
+
+// register chrome
+var cf = getFolder("Chrome");
+registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+
+// check return value
+if(err == SUCCESS)
+{
+    err = performInstall(); 
+    logComment("performInstall() returned: " + err);
+}
+else
+{
+    cancelInstall(err);
+    logComment("cancelInstall due to error: " + err);
+}
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -275,3 +275,14 @@ bin/chrome/packages/messenger/*
 [chatzilla]
 bin/components/chatzilla-service.js
 bin/chrome/packages/chatzilla/*
+
+
+[talkback]
+; Dummy talkback.xpi must be generated so deliver.pl and 
+; the linux installer generated by deliver.pl don't break.
+;
+; NOTE: This doesn't actually make it to release builds, merely 
+;       here so that deliver.pl works in test mode when used by
+;       developers to create an installer.  Release builds contain 
+;       a legitimate, working talkback.xpi.
+bin/components/nsSample.js
--- a/xpinstall/packager/unix/.cvsignore
+++ b/xpinstall/packager/unix/.cvsignore
@ -3,3 +3,6 @@ xpcom.js
 browser.js
 mail.js
 chatzilla.js
+talkback.js
+deflenus.js
+langengb.js
--- a/xpinstall/packager/unix/config.it
+++ b/xpinstall/packager/unix/config.it
@ -29,24 +29,33 @@ Message0=Please select the setup type you wish to install.

 [Setup Type0]
 Description Short=Typical
-Description Long=Most common options, without Java
+Description Long=Navigator and Mail & News
 C0=Component0
 C1=Component1
 C2=Component2
+C3=Component4
+C4=Component5
+C5=Component6

 [Setup Type1]
 Description Short=Complete
-Description Long=Most common options, with Java
+Description Long=Navigator, Mail & News, and Chatzilla
 C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5
+C6=Component6

 [Setup Type2]
 Description Short=Navigator
-Description Long=Navigator client only
+Description Long=Navigator only
 C0=Component0
 C1=Component1 
+C2=Component4
+C3=COmponent5
+C4=Component6

 [Setup Type3]
 Description Short=Custom
@ -55,6 +64,9 @@ C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5
+C6=Component6


 ;-------------------------------------------------------------------------
@ -96,6 +108,31 @@ $InstallSize$:chatzilla
 Attributes=SELECTED
 URL0=$URLPath$

+[Component4]
+Description Short=Quality Feedback Agent
+Description Long=Tool for reporting software crashes to Netscape
+Archive=talkback.xpi
+$InstallSize$:talkback
+Attributes=SELECTED
+URL0=$URLPath$
+
+[Component5]
+Description Short=English US Language Pack
+Description Long=English US Language Pack
+Archive=deflenus.xpi
+$InstallSize$:deflenus
+Attributes=SELECTED|INVISIBLE
+URL0=$URLPath$
+
+[Component6]
+Description Short=English GB Language Pack
+Description Long=English GB Language Pack
+Archive=langengb.xpi
+$InstallSize$:langengb
+Attributes=SELECTED|INVISIBLE
+URL0=$URLPath$
+
+
 ;-------------------------------------------------------------------------
 [Dialog Start Install]
 ;-------------------------------------------------------------------------
--- a/xpinstall/packager/unix/deflenus.jst
+++ b/xpinstall/packager/unix/deflenus.jst
@ -0,0 +1,33 @@
+var err;
+var fProgram;
+
+// ----LOCALIZATION NOTE: translate only these ------
+var prettyName = "US English Language Pack";
+var regName    = "defaults/mozilla/en-US";
+// --- END CHANGABLE STUFF ---
+
+err    = initInstall(prettyName, regName, "$Version$"); 
+logComment("initInstall: " + err);
+
+fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("",
+                   "$Version$",
+                   "bin",
+                   fProgram,
+                   "",
+                   true);
+logComment("addDirectory() returned: " + err);
+
+// check return value
+if(err == SUCCESS)
+{
+    err = performInstall(); 
+    logComment("performInstall() returned: " + err);
+}
+else
+{
+    cancelInstall(err);
+    logComment("cancelInstall due to error: " + err);
+}
--- a/xpinstall/packager/unix/langengb.jst
+++ b/xpinstall/packager/unix/langengb.jst
@ -0,0 +1,38 @@
+var err;
+var fProgram;
+
+// --- LOCALIZATION NOTE: translate only these ---
+var prettyName = "English-GB Language Pack";
+var regName    = "locales/mozilla/en-GB";
+var chromeName = "locales/en-GB";
+// --- END LOCALIZABLE RESOURCES ---
+
+err = initInstall(prettyName, regName, "$Version$"); 
+logComment("initInstall: " + err);
+
+fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("",
+                   "$Version$",
+                   "bin",
+                   fProgram,
+                   "",
+                   true);
+logComment("addDirectory() returned: " + err);
+
+// register chrome
+var cf = getFolder("Chrome");
+registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+
+// check return value
+if(err == SUCCESS)
+{
+    err = performInstall(); 
+    logComment("performInstall() returned: " + err);
+}
+else
+{
+    cancelInstall(err);
+    logComment("cancelInstall due to error: " + err);
+}
--- a/xpinstall/packager/unix/makeall.pl
+++ b/xpinstall/packager/unix/makeall.pl
@ -63,17 +63,14 @@ if(!(-e "$inDistPath"))
  system("mkdir $inDistPath");
 }

-# Make .js files
-MakeJsFile("xpcom");
-MakeJsFile("browser");
-MakeJsFile("mail");
-MakeJsFile("chatzilla");
-
 # Make all xpi files
 MakeXpiFile("xpcom");
 MakeXpiFile("browser");
 MakeXpiFile("mail");
 MakeXpiFile("chatzilla");
+MakeXpiFile("talkback");
+MakeXpiFile("deflenus");
+MakeXpiFile("langengb");

 # Make the config.ini file
 MakeConfigFile();
@ -107,6 +104,9 @@ sub MakeXpiFile
 {
  my($componentName) = @_;

+  # Make .js file
+  MakeJsFile($componentName);
+
  # Make .xpi file
  if(system("perl makexpi.pl $componentName $inStagePath $inDistPath") != 0)
  {
--- a/xpinstall/packager/unix/talkback.jst
+++ b/xpinstall/packager/unix/talkback.jst
@ -0,0 +1,25 @@
+var err = initInstall("Talkback", "/FullCircle/TalkBack", "$Version$"); 
+logComment("initInstall: " + err);
+
+var communicatorFolder = getFolder("Program");
+logComment("communicatorFolder: " + communicatorFolder);
+
+err = addDirectory("Program",
+                   "$Version$",
+                   "bin",              // jar source folder 
+                   communicatorFolder, // target folder 
+                   "",                 // target subdir 
+                   true );             // force flag 
+
+logComment("addDirectory() returned: " + err);
+
+if (err==SUCCESS)
+{
+	err = performInstall(); 
+	logComment("performInstall() returned: " + err);
+}
+else
+{
+	cancelInstall(err);
+	logComment("cancelInstall() returned: " + err);
+}
--- a/xpinstall/wizard/mac/macbuild/Installer
+++ b/xpinstall/wizard/mac/macbuild/Installer
@ -20,6 +20,8 @@ C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5

 [Setup Type1]
 Description Short=Custom Install
@ -28,6 +30,8 @@ C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5

 [Dialog Select Components]
 Message0=Please select the components you wish to install:
@ -68,10 +72,30 @@ Domain0=http://sweetlou.mcom.com/
 Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
 Attributes=SELECTED

+[Component4]
+Description Short=English US Language Pack
+Description Long=English US Language Pack
+Archive=deflenus.xpi
+Install Size=(#deflenus_size)
+Domain0=http://sweetlou.mcom.com/
+Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
+Attributes=SELECTED|INVISIBLE
+
+[Component5]
+Description Short=English GB Language Pack
+Description Long=English GB Language Pack
+Archive=langengb.xpi
+Install Size=(#langengb_size)
+Domain0=http://sweetlou.mcom.com/
+Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
+Attributes=SELECTED|INVISIBLE
+
+
 [Dialog Start Install]
 Message0=Click the Install button to download and install the selected components.  
 Message1=Save installer modules upon download

+
 [SmartDownload-Netscape Install]
 core_file=xpcom.xpi
 no_ads=true
--- a/xpinstall/wizard/mac/macbuild/config.ini_tmpl
+++ b/xpinstall/wizard/mac/macbuild/config.ini_tmpl
@ -20,6 +20,8 @@ C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5

 [Setup Type1]
 Description Short=Custom Install
@ -28,6 +30,8 @@ C0=Component0
 C1=Component1
 C2=Component2
 C3=Component3
+C4=Component4
+C5=Component5

 [Dialog Select Components]
 Message0=Please select the components you wish to install:
@ -68,10 +72,30 @@ Domain0=http://sweetlou.mcom.com/
 Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
 Attributes=SELECTED

+[Component4]
+Description Short=English US Language Pack
+Description Long=English US Language Pack
+Archive=deflenus.xpi
+Install Size=(#deflenus_size)
+Domain0=http://sweetlou.mcom.com/
+Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
+Attributes=SELECTED|INVISIBLE
+
+[Component5]
+Description Short=English GB Language Pack
+Description Long=English GB Language Pack
+Archive=langengb.xpi
+Install Size=(#langengb_size)
+Domain0=http://sweetlou.mcom.com/
+Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/
+Attributes=SELECTED|INVISIBLE
+
+
 [Dialog Start Install]
 Message0=Click the Install button to download and install the selected components.  
 Message1=Save installer modules upon download

+
 [SmartDownload-Netscape Install]
 core_file=xpcom.xpi
 no_ads=true