diff --git a/mozilla/configure.in b/mozilla/configure.in index 2459ca61b06..72baeaaef00 100644 --- a/mozilla/configure.in +++ b/mozilla/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) ;; diff --git a/mozilla/xpinstall/packager/os2/config.it b/mozilla/xpinstall/packager/os2/config.it index 1c9944fdebf..000ab6e7cc6 100644 --- a/mozilla/xpinstall/packager/os2/config.it +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/os2/installer.pkg b/mozilla/xpinstall/packager/os2/installer.pkg deleted file mode 100644 index 140196c4e6b..00000000000 --- a/mozilla/xpinstall/packager/os2/installer.pkg +++ /dev/null @@ -1,30 +0,0 @@ -[gre-xpi] -!error GRE not implemented on OS/2 yet! - -[xpi-bootstrap] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/xpcom.jst - -[xpfe-browser-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/browser.jst - -[xpfe-lang-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/langenus.jst - -[xpfe-locale-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/regus.jst - -[xpfe-default-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/deflenus.jst - -[xpfe-mailnews-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/mail.jst - -[spellcheck-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/spellcheck.jst - -[psm-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/psm.jst - -[seamonkey-installer-stub-en-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/os2/mozilla-os2-stub-installer.jst -dist/install-seamonkey/mozilla-os2-stub-installer.exe xpiroot/mozilla-os2-stub-installer.exe diff --git a/mozilla/xpinstall/packager/os2/makeall.pl b/mozilla/xpinstall/packager/os2/makeall.pl index a61c27eb633..f1576f4e5f3 100644 --- a/mozilla/xpinstall/packager/os2/makeall.pl +++ b/mozilla/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 { diff --git a/mozilla/xpinstall/packager/os2/reporter.jst b/mozilla/xpinstall/packager/os2/reporter.jst new file mode 100644 index 00000000000..47211d29228 --- /dev/null +++ b/mozilla/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); diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2 index e0377be9284..ece838fd60f 100644 --- a/mozilla/xpinstall/packager/packages-os2 +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/packages-static-unix b/mozilla/xpinstall/packager/packages-static-unix index ef48e0efb7c..33345bba855 100644 --- a/mozilla/xpinstall/packager/packages-static-unix +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/packages-static-win b/mozilla/xpinstall/packager/packages-static-win index 6a737283496..b355a86de8a 100644 --- a/mozilla/xpinstall/packager/packages-static-win +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index d2da8ff419f..9aaf631bd28 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/packages-win b/mozilla/xpinstall/packager/packages-win index 250b1248d4d..a7d6a19d39d 100644 --- a/mozilla/xpinstall/packager/packages-win +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/unix/config.it b/mozilla/xpinstall/packager/unix/config.it index 3d2b98b10f6..c242c3e16e7 100644 --- a/mozilla/xpinstall/packager/unix/config.it +++ b/mozilla/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] ;------------------------------------------------------------------------- diff --git a/mozilla/xpinstall/packager/unix/installer.pkg b/mozilla/xpinstall/packager/unix/installer.pkg deleted file mode 100644 index 1b821d92474..00000000000 --- a/mozilla/xpinstall/packager/unix/installer.pkg +++ /dev/null @@ -1,53 +0,0 @@ -[gre-xpi] -!error GRE not implemented on *nix yet! - -[xpi-bootstrap] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/xpcom.jst - -[xpfe-browser-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/browser.jst - -[xpfe-lang-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/langenus.jst - -[xpfe-locale-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/regus.jst - -[xpfe-default-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/deflenus.jst - -[xpfe-mailnews-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/mail.jst - -[spellcheck-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/spellcheck.jst - -# right now this is the "dummy XPI" but leaf thinks we can integrate talkback -# more successfully later -[talkback-xpi] -@topsrcdir@/xpinstall/packager/unix/talkback.jst xpiroot/install.js - -[psm-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/unix/psm.jst - -[seamonkey-installer-stub-en seamonkey-installer-en] -@topsrcdir@/xpinstall/wizard/unix/src2/mozilla-installer installer/mozilla-installer -@topsrcdir@/xpinstall/wizard/unix/src2/README installer/README -@topsrcdir@/xpinstall/wizard/unix/src2/MPL-1.1.txt installer/MPL-1.1.txt -xpinstall/wizard/unix/src2/mozilla-installer-bin installer/mozilla-installer-bin -dist/install-seamonkey/config.ini installer/config.ini -@topsrcdir@/xpinstall/wizard/unix/src2/installer.ini installer/installer.ini - -[seamonkey-installer-en] -dist/install-seamonkey/xpi/browser.xpi installer/xpi/browser.xpi -dist/install-seamonkey/xpi/langenus.xpi installer/xpi/langenus.xpi -dist/install-seamonkey/xpi/regus.xpi installer/xpi/regus.xpi -dist/install-seamonkey/xpi/deflenus.xpi installer/xpi/deflenus.xpi -dist/install-seamonkey/xpi/mail.xpi installer/xpi/mail.xpi -dist/install-seamonkey/xpi/venkman.xpi installer/xpi/venkman.xpi -dist/install-seamonkey/xpi/inspector.xpi installer/xpi/inspector.xpi -dist/install-seamonkey/xpi/chatzilla.xpi installer/xpi/chatzilla.xpi -dist/install-seamonkey/xpi/spellcheck.xpi installer/xpi/spellcheck.xpi -dist/install-seamonkey/xpi/talkback.xpi installer/xpi/talkback.xpi -dist/install-seamonkey/xpi/xpcom.xpi installer/xpi/xpcom.xpi -dist/install-seamonkey/xpi/psm.xpi installer/xpi/psm.xpi diff --git a/mozilla/xpinstall/packager/unix/makeall.pl b/mozilla/xpinstall/packager/unix/makeall.pl index cea6b2e2f6b..bc885e2dc2e 100755 --- a/mozilla/xpinstall/packager/unix/makeall.pl +++ b/mozilla/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(); diff --git a/mozilla/xpinstall/packager/unix/reporter.jst b/mozilla/xpinstall/packager/unix/reporter.jst new file mode 100644 index 00000000000..47211d29228 --- /dev/null +++ b/mozilla/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); diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it index 3153b724f01..2fc9d8a9f4f 100644 --- a/mozilla/xpinstall/packager/windows/config.it +++ b/mozilla/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 diff --git a/mozilla/xpinstall/packager/windows/installer.pkg b/mozilla/xpinstall/packager/windows/installer.pkg deleted file mode 100644 index 1556f690d82..00000000000 --- a/mozilla/xpinstall/packager/windows/installer.pkg +++ /dev/null @@ -1,26 +0,0 @@ -[xpfe-browser-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/browser.jst - -[xpfe-lang-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/langenus.jst - -[xpfe-locale-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/regus.jst - -[xpfe-default-US-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/deflenus.jst - -[xpfe-mailnews-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/mail.jst - -[spellcheck-enUS-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/spellcheck.jst - -# right now this is the "dummy XPI" but leaf thinks we can integrate talkback -# more successfully later -[talkback-xpi] -@topsrcdir@/xpinstall/packager/windows/talkback.jst xpiroot/install.js - -[seamonkey-installer-stub-en-xpi] -!preprocess xpiroot/install.js -E -Fsubstitution @topsrcdir@/xpinstall/packager/common/share.t @topsrcdir@/xpinstall/packager/common/windows.t @topsrcdir@/xpinstall/packager/windows/mozilla-win32-stub-installer.jst -dist/install-seamonkey/mozilla-win32-stub-installer.exe xpiroot/mozilla-win32-stub-installer.exe diff --git a/mozilla/xpinstall/packager/windows/makeall.pl b/mozilla/xpinstall/packager/windows/makeall.pl index 0860a2f534e..4485287dc49 100644 --- a/mozilla/xpinstall/packager/windows/makeall.pl +++ b/mozilla/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 { diff --git a/mozilla/xpinstall/packager/windows/reporter.jst b/mozilla/xpinstall/packager/windows/reporter.jst new file mode 100644 index 00000000000..47211d29228 --- /dev/null +++ b/mozilla/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);