diff --git a/xpinstall/packager/os2/config.it b/xpinstall/packager/os2/config.it index 15a81898762..db61df80bb4 100644 --- a/xpinstall/packager/os2/config.it +++ b/xpinstall/packager/os2/config.it @@ -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 *** diff --git a/xpinstall/packager/os2/makeall.pl b/xpinstall/packager/os2/makeall.pl index bc626dd199f..ed093a4c312 100644 --- a/xpinstall/packager/os2/makeall.pl +++ b/xpinstall/packager/os2/makeall.pl @@ -226,7 +226,8 @@ if(!(-d "$gDirStageProduct")) "langenus", "venkman", "inspector", - "reporter"); + "reporter", + "sroaming"); if(VerifyComponents()) # return value of 0 means no errors encountered { diff --git a/xpinstall/packager/os2/makexpi.pl b/xpinstall/packager/os2/makexpi.pl index d3ac702514a..e69de29bb2d 100644 --- a/xpinstall/packager/os2/makexpi.pl +++ b/xpinstall/packager/os2/makexpi.pl @@ -1,179 +0,0 @@ -#!c:\perl\bin\perl -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Communicator client code, released -# March 31, 1998. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998-1999 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Sean Su -# IBM Corporation -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# -# This perl script creates .xpi files given component input name -# -# Input: component name -# - name of the component directory located in the staging path -# staging path -# - path to where the built files are staged at -# dest path -# - path to where the .xpi files are are to be created at. -# ** MUST BE AN ABSOLUTE PATH, NOT A RELATIVE PATH ** -# -# ie: perl makexpi.pl xpcom z:\exposed\windows\32bit\en\5.0 d:\build\mozilla\dist\win32_o.obj\install\working -# - -use File::Copy; -use Cwd; - -## -# RecursiveModify -# -# Modify libs by recursing into all directories and calling -# the DLLRNAME utility on all the DLLs. -# -# We could also use this to add LXLITE later -# -# @param targetDir the directory to traverse recursively -# -sub RecursiveModify -{ - my($targetDir) = $_[0]; - my(@dirEntries) = (); - my($entry) = ""; - my($saveCwd) = cwd(); - - @dirEntries = <$targetDir/*>; - - # iterate over all subdir entries - foreach $entry ( @dirEntries ) - { - # if dir entry is dir - if (-d $entry) - { - # recurse into subdir - RecursiveModify($entry); - } else { - if(($entry =~ /\.dll/i) || ($entry =~ /\.exe/i)) - { - # Make sure it is not read only - system("chmod 755 $entry"); - } - } - - } -} - -# Make sure there are at least three arguments -if($#ARGV < 2) -{ - die "usage: $0 - - component name : name of component directory within staging path - staging path : path to where the components are staged at - dest path : path to where the .xpi files are to be created at - \n"; -} - -$inComponentName = $ARGV[0]; -$inStagePath = $ARGV[1]; -$inDestPath = $ARGV[2]; - -$inStagePath =~ s/\//\\/g; -$inDestPath =~ s/\//\\/g; - -# check for existance of staging component path -if(!(-e "$inStagePath\\$inComponentName")) -{ - die "invalid path: $inStagePath\\$inComponentName\n"; -} - -# check for existance of .js script -if(!(-e "$inComponentName.js")) -{ - die "missing .js script: $inComponentName.js\n"; -} - -# delete component .xpi file -if(-e "$inDestPath\\$inComponentName.xpi") -{ - unlink("$inDestPath\\$inComponentName.xpi"); -} -if(-e "$inStagePath\\$inComponentName\\$inComponentName.xpi") -{ - unlink("$inDestPath\\$inComponentName.xpi"); -} - -# delete install.js -if(-e "install.js") -{ - unlink("install.js"); -} - -# make sure inDestPath exists -if(!(-d "$inDestPath")) -{ - mkdir("$inDestPath",0775); -} - -print "\n Making $inComponentName.xpi...\n"; - -$saveCwdir = cwd(); - -system("cp $inComponentName.js $inStagePath\\$inComponentName\\install.js"); - -# DLLRNAME and possibly LXLITE DLLs -print "Modifying 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 *")) -{ - chdir("$saveCwdir"); - die "\n Error: zip -r $inDestPath\\$inComponentName.xpi *\n"; -} -chdir("$saveCwdir"); - -# delete install.js -if(-e "install.js") -{ - unlink("install.js"); -} - -print "\n $inComponentName.xpi done!\n"; - -# end of script -exit(0); - diff --git a/xpinstall/packager/os2/sroaming.jst b/xpinstall/packager/os2/sroaming.jst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2 index 35996331be0..20b59b8db8b 100644 --- a/xpinstall/packager/packages-os2 +++ b/xpinstall/packager/packages-os2 @@ -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