bug 297257 - include reporter in suite, p=ajschult@verizon.net r=bsmedberg sr=Neil a=chofmann

2005-06-22 16:01:08 +00:00 · 2005-06-22 16:01:08 +00:00 · 8f9c7607a4
--- a/configure.in
+++ b/configure.in
@ -3819,7 +3819,7 @@ suite)
  MOZ_SUITE=1
  MOZ_PROFILESHARING=1
  MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions"
+  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions reporter"
  AC_DEFINE(MOZ_SUITE)
  ;;

--- a/xpinstall/packager/os2/config.it
+++ b/xpinstall/packager/os2/config.it
@ -178,6 +178,7 @@ C11=Component Uninstaller
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
 ;C12=Component QFA
+C12=Component RPT

 [Setup Type2]
 ;*** LOCALIZE ME BABY ***
@ -205,6 +206,7 @@ C11=Component Uninstaller
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
 ;C12=Component QFA
+C12=Component RPT



@ -565,6 +567,17 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\Components\pipnss.dll
 Force Upgrade File1=[SETUP PATH]\psm.exe

+[Component RPT]
+Description Short=Website Reporter
+;*** LOCALIZE ME BABY ***
+Description Long=Website Reporter
+Archive=reporter.xpi
+$InstallSize$:reporter
+$InstallSizeSystem$
+$InstallSizeArchive$:reporter.xpi
+Attributes=SELECTED|FORCE_UPGRADE
+Force Upgrade File0=[SETUP PATH]\chrome\reporter.jar
+
 [Core]
 Source=[XPI PATH]\xpcom.xpi
 Destination=[WIZTEMP]\xpcom.ns
--- a/xpinstall/packager/os2/installer.pkg
+++ b/xpinstall/packager/os2/installer.pkg
--- a/xpinstall/packager/os2/makeall.pl
+++ b/xpinstall/packager/os2/makeall.pl
@ -205,7 +205,8 @@ if(!(-d "$gDirStageProduct"))
                   "langenus",
                   "regus",
                   "venkman",
-                   "inspector");
+                   "inspector",
+                   "reporter");

 if(VerifyComponents()) # return value of 0 means no errors encountered
 {
--- a/xpinstall/packager/os2/reporter.jst
+++ b/xpinstall/packager/os2/reporter.jst
@ -0,0 +1,24 @@
+var err = initInstall("Website Reporter", "Reporter", "$Version$"); 
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+var srDest = $SpaceRequired$;
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+  err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+  logComment("addDirectory: " + err);
+  
+  var jarFolder = getFolder("Chrome", "reporter.jar");
+  registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/reporter/");
+  registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/");
+  
+  err = getLastError();
+  if (err==SUCCESS)
+      performInstall(); 
+  else
+      cancelInstall(err);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@ -472,6 +472,9 @@ bin/components/spellchk.dll
 bin/components/spellchecker.xpt
 bin/components/myspell/*

+[reporter]
+bin/chrome/reporter.jar
+
 ;Things that aren't packaged and why (or not why)
 ;accproxy.dll - I don't know
 ;accessproxy.xpt - I don't know
--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@ -343,3 +343,6 @@ bin/chrome/inspector.jar
 bin/defaults/pref/inspector.js
 bin/res/inspector/viewer-registry.rdf
 bin/res/inspector/search-registry.rdf
+
+[reporter]
+bin/chrome/reporter.jar
--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@ -337,3 +337,6 @@ bin\chrome\inspector.jar
 bin\defaults\pref\inspector.js
 bin\res\inspector\viewer-registry.rdf
 bin\res\inspector\search-registry.rdf
+
+[reporter]
+bin\chrome\reporter.jar
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -476,3 +476,6 @@ bin/components/libmyspell.so
 bin/components/libspellchecker.so
 bin/components/spellchecker.xpt
 bin/components/myspell/*
+
+[reporter]
+bin/chrome/reporter.jar
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@ -376,3 +376,6 @@ bin\components\myspell.dll
 bin\components\spellchk.dll
 bin\components\spellchecker.xpt
 bin\components\myspell\*
+
+[reporter]
+bin\chrome\reporter.jar
--- a/xpinstall/packager/unix/config.it
+++ b/xpinstall/packager/unix/config.it
@ -59,7 +59,7 @@ C8=Component11
 ; *** LOCALIZE ME BABY ***
 Description Short=Complete
 ; *** LOCALIZE ME BABY ***
-Description Long=Navigator, Mail & News, Spellchecker, Chatzilla, Debugger, and Inspector
+Description Long=Navigator, Mail & News, Spellchecker, Chatzilla, Debugger, Inspector, and Reporter
 C0=Component0
 C1=Component1
 C2=Component2
@ -72,6 +72,7 @@ C8=Component8
 C9=Component9
 C10=Component10
 C11=Component11
+C12=Component12

 [Setup Type2]
 ; *** LOCALIZE ME BABY ***
@ -103,6 +104,7 @@ C8=Component8
 C9=Component9
 C10=Component10
 C11=Component11
+C12=Component12


 ;-------------------------------------------------------------------------
@ -232,6 +234,16 @@ $InstallSizeArchive$:spellcheck.xpi
 Attributes=SELECTED
 URL0=$URLPath$

+[Component12]
+Description Short=Website Reporter
+; *** LOCALIZE ME BABY ***
+Description Long=Website Reporter
+Archive=reporter.xpi
+$InstallSize$:reporter
+$InstallSizeArchive$:reporter.xpi
+Attributes=SELECTED
+URL0=$URLPath$
+
 ;-------------------------------------------------------------------------
 [Dialog Start Install]
 ;-------------------------------------------------------------------------
--- a/xpinstall/packager/unix/installer.pkg
+++ b/xpinstall/packager/unix/installer.pkg
--- a/xpinstall/packager/unix/makeall.pl
+++ b/xpinstall/packager/unix/makeall.pl
@ -98,6 +98,7 @@ MakeXpiFile("regus");
 MakeXpiFile("venkman");
 MakeXpiFile("inspector");
 MakeXpiFile("spellcheck");
+MakeXpiFile("reporter");

 # Make the config.ini file
 MakeConfigFile();
--- a/xpinstall/packager/unix/reporter.jst
+++ b/xpinstall/packager/unix/reporter.jst
@ -0,0 +1,24 @@
+var err = initInstall("Website Reporter", "Reporter", "$Version$"); 
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+var srDest = $SpaceRequired$;
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+  err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+  logComment("addDirectory: " + err);
+  
+  var jarFolder = getFolder("Chrome", "reporter.jar");
+  registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/reporter/");
+  registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/");
+  
+  err = getLastError();
+  if (err==SUCCESS)
+      performInstall(); 
+  else
+      cancelInstall(err);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);
--- a/xpinstall/packager/windows/config.it
+++ b/xpinstall/packager/windows/config.it
@ -259,6 +259,7 @@ C10=Component US region pack
 ; this component can easily remove it.
 C11=Component DOM Inspector
 C12=Component QFA
+C13=Component RPT

 [Setup Type2]
 ;*** LOCALIZE ME BABY ***
@ -286,6 +287,7 @@ C10=Component US region pack
 ; this component can easily remove it.
 C11=Component DOM Inspector
 C12=Component QFA
+C13=Component RPT



@ -734,6 +736,17 @@ Install Size Archive=248
 Attributes=SELECTED|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\components\fullsoft.dll

+[Component RPT]
+Description Short=Website Reporter
+;*** LOCALIZE ME BABY ***
+Description Long=Website Reporter
+Archive=reporter.xpi
+$InstallSize$:reporter
+$InstallSizeSystem$
+$InstallSizeArchive$:reporter.xpi
+Attributes=SELECTED|FORCE_UPGRADE
+Force Upgrade File0=[SETUP PATH]\chrome\reporter.jar
+
 ; This is to randomly set the default checkbox for this component.
 ; This particular value will set the checkbox checked [number]% of the time.
 ; This logic is done only during the initialization of setup, not in any
--- a/xpinstall/packager/windows/installer.pkg
+++ b/xpinstall/packager/windows/installer.pkg
--- a/xpinstall/packager/windows/makeall.pl
+++ b/xpinstall/packager/windows/makeall.pl
@ -215,7 +215,8 @@ if(!(-d "$gDirStageProduct"))
                   "langenus",
                   "regus",
                   "venkman",
-                   "inspector");
+                   "inspector",
+                   "reporter");

 if(VerifyComponents()) # return value of 0 means no errors encountered
 {
--- a/xpinstall/packager/windows/reporter.jst
+++ b/xpinstall/packager/windows/reporter.jst
@ -0,0 +1,24 @@
+var err = initInstall("Website Reporter", "Reporter", "$Version$"); 
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+var srDest = $SpaceRequired$;
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+  err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+  logComment("addDirectory: " + err);
+  
+  var jarFolder = getFolder("Chrome", "reporter.jar");
+  registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/reporter/");
+  registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/");
+  
+  err = getLastError();
+  if (err==SUCCESS)
+      performInstall(); 
+  else
+      cancelInstall(err);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);