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

[OS/2] Bug 339532: Package roaming in installer builds, r=mkaply

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@203509 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%weilbacher.org 2006-07-24 17:24:37 +00:00
parent bf2fef384e
commit 52f4f0b3e6
5 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,6 +177,7 @@ C10=Component Uninstaller
; this component can easily remove it.
;C11=Component QFA
C11=Component RPT
C12=Component SRoaming
[Setup Type2]
;*** LOCALIZE ME BABY ***
@ -204,6 +205,7 @@ C10=Component Uninstaller
; this component can easily remove it.
;C11=Component QFA
C11=Component RPT
C12=Component SRoaming
@ -521,6 +523,16 @@ $InstallSizeArchive$:inspector.xpi
Attributes=SELECTED|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]\Chrome\inspector.jar
[Component SRoaming]
Description Short=Roaming
;*** LOCALIZE ME BABY ***
Description Long=Profile Roaming
Archive=sroaming.xpi
$InstallSize$:sroaming
$InstallSizeArchive$:sroaming.xpi
Attributes=SELECTED|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]\Chrome\sroaming.jar
[Component US English Profile Defaults]
Description Short=US English profile defaults
;*** LOCALIZE ME BABY ***

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

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

11
mozilla/xpinstall/packager/os2/makexpi.pl
View File

@ -87,7 +87,8 @@ sub RecursiveModify
if(($entry =~ /\.dll/i) || ($entry =~ /\.exe/i))
{
# Make sure it is not read only
system("chmod 755 $entry");
# we already are in xpinstall/packager/os2, call without path
system("strip.cmd \"$entry\"");
}
}
@ -152,17 +153,17 @@ $saveCwdir = cwd();
system("cp $inComponentName.js $inStagePath\\$inComponentName\\install.js");
# DLLRNAME and possibly LXLITE DLLs
print "Modifying DLLs in $inStagePath/$inComponentName...\n";
# set permissions and possibly lxLite-strip binaries
print "Modifying EXEs and DLLs in $inStagePath/$inComponentName...\n";
RecursiveModify("$inStagePath\\$inComponentName");
# change directory to where the files are, else zip will store
# unwanted path information.
chdir("$inStagePath\\$inComponentName");
if(system("zip -r $inDestPath\\$inComponentName.xpi *"))
if(system("zip -rD $inDestPath\\$inComponentName.xpi *"))
{
chdir("$saveCwdir");
die "\n Error: zip -r $inDestPath\\$inComponentName.xpi *\n";
die "\n Error: zip -rD $inDestPath\\$inComponentName.xpi *\n";
}
chdir("$saveCwdir");

25
mozilla/xpinstall/packager/os2/sroaming.jst Normal file
View File

@ -0,0 +1,25 @@
var err = initInstall("SRoaming v0.1", "Roaming", "$Version$");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "$Version$", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("SRoaming Chrome",
"bin/chrome/sroaming.jar", // jar source folder
getFolder("Chrome"), // target folder
""); // target subdir
var jarFolder = getFolder("Chrome", "sroaming.jar");
registerChrome(CONTENT | DELAYED_CHROME, jarFolder, "content/sroaming/");
registerChrome(LOCALE | DELAYED_CHROME, jarFolder, "locale/en-US/sroaming/");
registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/sroaming/");
registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/sroaming/");
err = getLastError();
if (err==SUCCESS)
performInstall();
else
cancelInstall(err);

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

@ -284,10 +284,6 @@ bin/components/websrvcs.xpt
bin/components/xulappinfo.js
bin/components/xulappinfo.xpt
; Roaming
bin/components/sroaming.dll
bin/chrome/sroaming.jar
; LDAP components need to be in the browser for AutoConfig
bin/components/mozldap.dll
bin/components/mozldap.xpt
@ -486,6 +482,10 @@ bin/dictionaries/*
[reporter]
bin/chrome/reporter.jar
[sroaming]
bin/components/sroaming.dll
bin/chrome/sroaming.jar
;Things that aren't packaged and why (or not why)
;accproxy.dll - I don't know
;accessproxy.xpt - I don't know