Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@175003 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kairo%kairo.at
2005-06-22 16:01:08 +00:00
parent 397dcb6520
commit 239e6ee7ea
18 changed files with 132 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/configure.in
View File

@@ -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)
;;

13
mozilla/xpinstall/packager/os2/config.it
View File

@@ -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

30
mozilla/xpinstall/packager/os2/installer.pkg
View File

@@ -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

3
mozilla/xpinstall/packager/os2/makeall.pl
View File

@@ -205,7 +205,8 @@ if(!(-d "$gDirStageProduct"))
"langenus",
"regus",
"venkman",
"inspector");
"inspector",
"reporter");
if(VerifyComponents()) # return value of 0 means no errors encountered
{

24
mozilla/xpinstall/packager/os2/reporter.jst Normal file
View File

@@ -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);

3
mozilla/xpinstall/packager/packages-os2
View File

@@ -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

3
mozilla/xpinstall/packager/packages-static-unix
View File

@@ -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

3
mozilla/xpinstall/packager/packages-static-win
View File

@@ -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

3
mozilla/xpinstall/packager/packages-unix
View File

@@ -476,3 +476,6 @@ bin/components/libmyspell.so
bin/components/libspellchecker.so
bin/components/spellchecker.xpt
bin/components/myspell/*
[reporter]
bin/chrome/reporter.jar

3
mozilla/xpinstall/packager/packages-win
View File

@@ -376,3 +376,6 @@ bin\components\myspell.dll
bin\components\spellchk.dll
bin\components\spellchecker.xpt
bin\components\myspell\*
[reporter]
bin\chrome\reporter.jar

14
mozilla/xpinstall/packager/unix/config.it
View File

@@ -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]
;-------------------------------------------------------------------------

53
mozilla/xpinstall/packager/unix/installer.pkg
View File

@@ -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

1
mozilla/xpinstall/packager/unix/makeall.pl
View File

@@ -98,6 +98,7 @@ MakeXpiFile("regus");
MakeXpiFile("venkman");
MakeXpiFile("inspector");
MakeXpiFile("spellcheck");
MakeXpiFile("reporter");
# Make the config.ini file
MakeConfigFile();

24
mozilla/xpinstall/packager/unix/reporter.jst Normal file
View File

@@ -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);

13
mozilla/xpinstall/packager/windows/config.it
View File

@@ -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

26
mozilla/xpinstall/packager/windows/installer.pkg
View File

@@ -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

3
mozilla/xpinstall/packager/windows/makeall.pl
View File

@@ -215,7 +215,8 @@ if(!(-d "$gDirStageProduct"))
"langenus",
"regus",
"venkman",
"inspector");
"inspector",
"reporter");
if(VerifyComponents()) # return value of 0 means no errors encountered
{

24
mozilla/xpinstall/packager/windows/reporter.jst Normal file
View File

@@ -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);