mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-25 22:29:07 +00:00
Bug 332203 Ensure the installers work with MOZ_XUL_APP set on SeaMonkey (Fix the unix installer registration process), r=ajschult,sr=Neil over irc
This commit is contained in:
bugzilla%standard8.demon.co.uk
parent
55689b18c2
commit
34b8074909
258
suite/installer/unix/config.it
Normal file
258
suite/installer/unix/config.it
Normal file
@ -0,0 +1,258 @@
|
||||
; XXX This is the Configuration file for Suite builds with MOZ_XUL_APP=1
|
||||
; set. For MOZ_XUL_APP=0 see xpinstall/packager/unix/config.it
|
||||
; Changes should be reflected in both files.
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[General]
|
||||
;-------------------------------------------------------------------------
|
||||
Default Location=/usr/local/$AppName$
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Title=$AppDisplayName$ Installer
|
||||
; The Default Setup Type value must exactly match the "Description Short"
|
||||
; value of the desired setup type.
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Default Setup Type=Typical
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Cleanup On Upgrade]
|
||||
;-------------------------------------------------------------------------
|
||||
ObjectToIgnore0=plugins
|
||||
ObjectToIgnore1=install.log
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Dialog Welcome]
|
||||
;-------------------------------------------------------------------------
|
||||
Show Dialog=TRUE
|
||||
Title=$AppDisplayName$ Installer
|
||||
Readme File=README
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Dialog License]
|
||||
;-------------------------------------------------------------------------
|
||||
Show Dialog=TRUE
|
||||
Title=$AppDisplayName$ Installer
|
||||
License File=MPL-1.1.txt
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Dialog Setup Type]
|
||||
;-------------------------------------------------------------------------
|
||||
Title=$AppDisplayName$ Installer
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Message0=Please select the setup type you wish to install.
|
||||
|
||||
[Setup Type0]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Short=Typical
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Navigator and Mail & News
|
||||
C0=Component0
|
||||
C1=Component1
|
||||
C2=Component2
|
||||
C3=Component3
|
||||
C4=Component5
|
||||
C5=Component6
|
||||
C6=Component9
|
||||
C7=Component11
|
||||
|
||||
[Setup Type1]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Short=Complete
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Navigator, Mail & News, Spellchecker, Chatzilla, Debugger, Inspector, and Reporter
|
||||
C0=Component0
|
||||
C1=Component1
|
||||
C2=Component2
|
||||
C3=Component3
|
||||
C4=Component4
|
||||
C5=Component5
|
||||
C6=Component6
|
||||
C7=Component7
|
||||
C8=Component8
|
||||
C9=Component9
|
||||
C10=Component10
|
||||
C11=Component11
|
||||
|
||||
[Setup Type2]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Short=Navigator
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Navigator only
|
||||
C0=Component0
|
||||
C1=Component1
|
||||
C2=Component3
|
||||
C3=Component5
|
||||
C4=Component6
|
||||
C5=Component11
|
||||
|
||||
[Setup Type3]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Short=Custom
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Choose components you wish to install
|
||||
C0=Component0
|
||||
C1=Component1
|
||||
C2=Component2
|
||||
C3=Component3
|
||||
C4=Component4
|
||||
C5=Component5
|
||||
C6=Component6
|
||||
C7=Component7
|
||||
C8=Component8
|
||||
C9=Component9
|
||||
C10=Component10
|
||||
C11=Component11
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Dialog Select Components]
|
||||
;-------------------------------------------------------------------------
|
||||
Title=$AppDisplayName$ Installer
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Message0=Please select the components you wish to install.
|
||||
|
||||
[Component0]
|
||||
Description Short=XPInstall Engine
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Installer technology
|
||||
Archive=xpcom.xpi
|
||||
$InstallSize$:xpcom
|
||||
$InstallSizeArchive$:xpcom.xpi
|
||||
Attributes=SELECTED|INVISIBLE
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component1]
|
||||
Description Short=Navigator
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for web browsing
|
||||
Archive=browser.xpi
|
||||
$InstallSize$:browser
|
||||
$InstallSizeArchive$:browser.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component2]
|
||||
Description Short=Mail & News
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for reading email and newsgroups
|
||||
Archive=mail.xpi
|
||||
$InstallSize$:mail
|
||||
$InstallSizeArchive$:mail.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component3]
|
||||
Description Short=Personal Security Manager
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for secure browsing and email; required for SSL(https) and S/MIME
|
||||
Archive=psm.xpi
|
||||
$InstallSize$:psm
|
||||
$InstallSizeArchive$:psm.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component4]
|
||||
Description Short=Chatzilla
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for chatting on Internet Relay Chat(IRC)
|
||||
Archive=chatzilla.xpi
|
||||
$InstallSize$:chatzilla
|
||||
$InstallSizeArchive$:chatzilla.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component5]
|
||||
Description Short=English US Profile Defaults
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=English US Profile Defaults
|
||||
Archive=deflenus.xpi
|
||||
$InstallSize$:deflenus
|
||||
$InstallSizeArchive$:deflenus.xpi
|
||||
Attributes=SELECTED|INVISIBLE
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component6]
|
||||
Description Short=English (US) Language Pack
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=English (US) Language Pack
|
||||
Archive=langenus.xpi
|
||||
$InstallSize$:langenus
|
||||
$InstallSizeArchive$:langenus.xpi
|
||||
Attributes=SELECTED|INVISIBLE
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component7]
|
||||
Description Short=Debugger
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for debugging JavaScript
|
||||
Archive=venkman.xpi
|
||||
$InstallSize$:venkman
|
||||
$InstallSizeArchive$:venkman.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component8]
|
||||
Description Short=Inspector
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=DOM Inspector
|
||||
Archive=inspector.xpi
|
||||
$InstallSize$:inspector
|
||||
$InstallSizeArchive$:inspector.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component9]
|
||||
Description Short=Spellchecker
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Spellchecker
|
||||
Archive=spellcheck.xpi
|
||||
$InstallSize$:spellcheck
|
||||
$InstallSizeArchive$:spellcheck.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component10]
|
||||
Description Short=Website Reporter
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Website Reporter
|
||||
Archive=reporter.xpi
|
||||
$InstallSize$:reporter
|
||||
$InstallSizeArchive$:reporter.xpi
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component11]
|
||||
Description Short=Quality Feedback Agent
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for reporting $AppDisplayName$ crash information
|
||||
Archive=talkback.xpi
|
||||
Install Size=1960
|
||||
Archive Size=812
|
||||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[Dialog Start Install]
|
||||
;-------------------------------------------------------------------------
|
||||
Show Dialog=TRUE
|
||||
Title=$AppDisplayName$ Installer
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Message0=Click the Install button to proceed with this installation.
|
||||
XPInstall Engine=xpcom.xpi
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[PostInstallRun0]
|
||||
;-------------------------------------------------------------------------
|
||||
Target=seamonkey
|
||||
Arguments=-register
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[LegacyCheck0]
|
||||
;-------------------------------------------------------------------------
|
||||
Filename=$AppName$-bin
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Message=The selected directory already contains a $AppDisplayName$ installation. To delete %s completely, please press the 'Delete Directory' button. Information in your $AppDisplayName$ profile(s) should not be affected. Or, please press the 'Cancel' button and choose a different destination directory.
|
||||
@ -55,10 +55,18 @@ ifndef INSTALLER_URL
|
||||
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/linux-xpi"
|
||||
endif
|
||||
|
||||
# XXX For Suite with MOZ_XUL_APP set we need a new config.it. This selects that
|
||||
# the old one can be removed once we throw the switch.
|
||||
ifdef MOZ_XUL_APP
|
||||
CONFIG_IT_LOCATION=$(topsrcdir)/suite/installer/unix
|
||||
else
|
||||
CONFIG_IT_LOCATION=$(srcdir)
|
||||
endif
|
||||
|
||||
installer:
|
||||
$(PERL) $(srcdir)/deliver.pl \
|
||||
-o $(DEPTH) -s $(topsrcdir) \
|
||||
$(MOZ_APP_VERSION) $(INSTALLER_URL) $(STUB_NAME) $(SEA_NAME) NO $(MOZ_APP_NAME) $(MOZ_APP_DISPLAYNAME)
|
||||
$(MOZ_APP_VERSION) $(INSTALLER_URL) $(STUB_NAME) $(SEA_NAME) NO $(MOZ_APP_NAME) $(MOZ_APP_DISPLAYNAME) $(CONFIG_IT_LOCATION)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
; XXXThis is the Configuration file for Suite builds with MOZ_XUL_APP=0
|
||||
; set. For MOZ_XUL_APP=1 see suite/installer/unix/config.it
|
||||
; Changes should be reflected in both files.
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
[General]
|
||||
;-------------------------------------------------------------------------
|
||||
|
||||
@ -102,10 +102,12 @@ $aBlobName = "mozilla-installer";
|
||||
$aBuildWizard = "NO";
|
||||
$aMozAppName = "mozilla";
|
||||
$aMozAppDisplayName = "Mozilla";
|
||||
$aConfigItLocation = ".";
|
||||
|
||||
#// parse args
|
||||
# all optional args: version, URLPath, stubName, blobName, MozAppName,
|
||||
# MozDisplayName
|
||||
if ($#ARGV >= 7) { $aConfigItLocation = $ARGV[7]; }
|
||||
if ($#ARGV >= 6) { $aMozAppDisplayName = $ARGV[6]; }
|
||||
if ($#ARGV >= 5) { $aMozAppName = $ARGV[5]; }
|
||||
if ($#ARGV >= 4) { $aBuildWizard = $ARGV[4]; }
|
||||
@ -204,8 +206,8 @@ spew("Completed signing NSS libraries");
|
||||
|
||||
#// call makeall.pl tunneling args (delivers .xpis to $topobjdir/installer/stage)
|
||||
chdir("$topsrcdir/xpinstall/packager/unix");
|
||||
system("perl makeall.pl $aVersion $aURLPath $STAGE $XPI $aMozAppName $aMozAppDisplayName");
|
||||
system("mv $topsrcdir/xpinstall/packager/unix/config.ini $RAW");
|
||||
system("perl makeall.pl $aVersion $aURLPath $STAGE $XPI $aMozAppName $aMozAppDisplayName $aConfigItLocation");
|
||||
system("mv $aConfigItLocation/config.ini $RAW");
|
||||
spew("Completed making .xpis");
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -43,10 +43,10 @@
|
||||
# This perl script builds the xpi, config.ini, and js files.
|
||||
#
|
||||
|
||||
# Make sure there are at least six arguments
|
||||
if(@ARGV < 6)
|
||||
# Make sure there are at least seven arguments
|
||||
if(@ARGV < 7)
|
||||
{
|
||||
die "usage: $0 <default version> <URL path> <staging path> <dist install path> <app name> <app display name>
|
||||
die "usage: $0 <default version> <URL path> <staging path> <dist install path> <app name> <app display name> <config.it location>
|
||||
|
||||
default version : julian based date version
|
||||
ie: 5.0.0.99257
|
||||
@ -63,6 +63,9 @@ if(@ARGV < 6)
|
||||
|
||||
app display name : the display name to use
|
||||
|
||||
config.it location: the location of the configuration file to use as
|
||||
input for config.ini
|
||||
|
||||
\n";
|
||||
}
|
||||
|
||||
@ -72,6 +75,7 @@ $inStagePath = $ARGV[2];
|
||||
$inDistPath = $ARGV[3];
|
||||
$inAppName = $ARGV[4];
|
||||
$inAppDisplayName = $ARGV[5];
|
||||
$inConfigItLoc = $ARGV[6];
|
||||
|
||||
# Check for existance of staging path
|
||||
if(!(-e "$inStagePath"))
|
||||
@ -110,7 +114,7 @@ exit(0);
|
||||
sub MakeConfigFile
|
||||
{
|
||||
# Make config.ini file
|
||||
if(system("perl makecfgini.pl config.it $inDefaultVersion $inStagePath $inDistPath $inURLPath $inAppName $inAppDisplayName") != 0)
|
||||
if(system("perl makecfgini.pl $inConfigItLoc/config.it $inDefaultVersion $inStagePath $inDistPath $inURLPath $inAppName $inAppDisplayName") != 0)
|
||||
{
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user