From 9b4c9a9a1f27d9ab24d349b086aa11597620b8e2 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Mon, 26 Aug 2002 04:42:03 +0000 Subject: [PATCH] Not part of build - OS/2 install work --- xpinstall/packager/os2/config.it | 120 +++++++++++++++--------------- xpinstall/packager/os2/makejs.pl | 3 +- xpinstall/packager/os2/makexpi.pl | 6 +- 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/xpinstall/packager/os2/config.it b/xpinstall/packager/os2/config.it index 4a1b3386cd5..f471cee2922 100644 --- a/xpinstall/packager/os2/config.it +++ b/xpinstall/packager/os2/config.it @@ -71,7 +71,7 @@ Program Name=$MainExeFile$ Program Folder Name=$ProductName$ Program Folder Path=[PROGRAMS] -Uninstall Filename=$UninstallFile$ +;Uninstall Filename=$UninstallFile$ ; This key is used as a fail over key. This url will be used when the ; url in the Site Selector fails. @@ -156,7 +156,7 @@ Readme App=notepad.exe ; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3). [Setup Type0] ;*** LOCALIZE ME BABY *** -Description Short=Bro&wser only +Description Short=Bro~wser only ;*** LOCALIZE ME BABY *** Description Long=Program will be installed with the minimal options. @@ -166,17 +166,17 @@ Description Long=Program will be installed with the minimal options. C0=Component XPCOM C1=Component Navigator C2=Component PSM -C3=Component Uninstaller -C4=Component US English Profile Defaults -C5=Component En US lang pack -C6=Component US region pack +C3=Component US English Profile Defaults +C4=Component En US lang pack +C5=Component US region pack +;C6=Component Uninstaller ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. C7=Component QFA [Setup Type1] ;*** LOCALIZE ME BABY *** -Description Short=C&omplete +Description Short=C~omplete ;*** LOCALIZE ME BABY *** Description Long=Program will be installed with the most common options. @@ -187,12 +187,12 @@ C0=Component XPCOM C1=Component Navigator C2=Component MailNews C3=Component PSM -C4=Component Uninstaller -C5=Component Chatzilla -C6=Component Venkman -C7=Component US English Profile Defaults -C8=Component En US lang pack -C9=Component US region pack +C4=Component Chatzilla +C5=Component Venkman +C6=Component US English Profile Defaults +C7=Component En US lang pack +C8=Component US region pack +;C9=Component Uninstaller ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. C10=Component DOM Inspector @@ -200,10 +200,10 @@ C11=Component QFA [Setup Type2] ;*** LOCALIZE ME BABY *** -Description Short=C&ustom +Description Short=C~ustom ;*** LOCALIZE ME BABY *** Description Long=You may choose the options you want to install. Recommended for advanced users only. -;Description Short=&Pro +;Description Short=~Pro ;Description Long=Program will be installed with all the options available. ; List of components to install/enable for this Setup Type. @@ -213,12 +213,12 @@ C0=Component XPCOM C1=Component Navigator C2=Component MailNews C3=Component PSM -C4=Component Uninstaller -C5=Component Chatzilla -C6=Component Venkman -C7=Component US English Profile Defaults -C8=Component En US lang pack -C9=Component US region pack +C4=Component Chatzilla +C5=Component Venkman +C6=Component US English Profile Defaults +C7=Component En US lang pack +C8=Component US region pack +;C9=Component Uninstaller ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. C10=Component DOM Inspector @@ -515,20 +515,20 @@ Attributes=SELECTED|FORCE_UPGRADE Force Upgrade File0=[SETUP PATH]\msgbsutl.dll -[Component Uninstaller] -Description Short=$CompanyName$ Uninstaller +;[Component Uninstaller] +;Description Short=$CompanyName$ Uninstaller ;*** LOCALIZE ME BABY *** -Description Long=Uninstaller for $ProductName$ -Archive=$UninstallFileZip$ -$InstallSize$:$UninstallFileZip$ -$InstallSizeArchive$:$UninstallFileZip$ -Attributes=SELECTED|INVISIBLE|DOWNLOAD_ONLY +;Description Long=Uninstaller for $ProductName$ +;Archive=$UninstallFileZip$ +;$InstallSize$:$UninstallFileZip$ +;$InstallSizeArchive$:$UninstallFileZip$ +;Attributes=SELECTED|INVISIBLE|DOWNLOAD_ONLY ;Since the uninstaller program is going to be installed into the Windows folder, ;Setup.exe need to know to calculate the disk space required for the Windows folder. ;This section overrides the default user-chosen path for Uninstaller only. -[Component Uninstaller-Destination Path0] -Path=[WINDIR] +;[Component Uninstaller-Destination Path0] +;Path=[WINDIR] [Component Chatzilla] @@ -648,32 +648,32 @@ Message= ; the app runs once upon windows reboot. ;Uncompress FileX sections -[Uncompress File0] -Timing=post smartupdate -Source=[XPI PATH]\$UninstallFileZip$ -Destination=[WINDIR] +;[Uncompress File0] +;Timing=post smartupdate +;Source=[XPI PATH]\$UninstallFileZip$ +;Destination=[WINDIR] ;*** LOCALIZE ME BABY *** -Message=Installing the uninstaller, please wait... -Only If Exists=FALSE +;Message=Installing the uninstaller, please wait... +;Only If Exists=FALSE ;Copy FileX sections ;Copy the uninstaller to the [Setup Path]\Uninstall folder. ;This copy is to be used when the user installed on a system with ;restricted access. -[Copy File0] -Timing=post smartupdate -Source=[WINDIR]\$UninstallFile$ -Destination=[SETUP PATH]\Uninstall -Fail If Exists=FALSE -Do Not Uninstall=FALSE +;[Copy File0] +;Timing=post smartupdate +;Source=[WINDIR]\$UninstallFile$ +;Destination=[SETUP PATH]\Uninstall +;Fail If Exists=FALSE +;Do Not Uninstall=FALSE -[Copy File1] -Timing=post smartupdate -Source=[XPI PATH]\$UninstallFile$ -Destination=[WINDIR] -Fail If Exists=FALSE -Do Not Uninstall=TRUE +;[Copy File1] +;Timing=post smartupdate +;Source=[XPI PATH]\$UninstallFile$ +;Destination=[WINDIR] +;Fail If Exists=FALSE +;Do Not Uninstall=TRUE ;Copy File SequentialX sections @@ -785,13 +785,13 @@ Timing=post smartupdate Show Folder=HIDE Program Folder=[Default Folder] -[Program Folder0-Shortcut0] -File=[SETUP PATH]\Uninstall\$UninstallFile$ -Arguments=/ua "$UserAgent$" -Working Dir=[SETUP PATH] -Description=Uninstall $ProductName$ -Icon Path=[SETUP PATH]\Uninstall\$UninstallFile$ -Icon Id=0 +;[Program Folder0-Shortcut0] +;File=[SETUP PATH]\Uninstall\$UninstallFile$ +;Arguments=/ua "$UserAgent$" +;Working Dir=[SETUP PATH] +;Description=Uninstall $ProductName$ +;Icon Path=[SETUP PATH]\Uninstall\$UninstallFile$ +;Icon Id=0 ;[Program Folder0-Shortcut1] ;File=[SETUP PATH]\$MainExeFile$ @@ -868,15 +868,15 @@ Error File Uncompress=Error uncompressing file %s: %d ;*** LOCALIZE ME BABY *** UsageMsg Usage=Usage: %s [options]%s [options] can be any of the following combination:%s -h: This help.%s -a [path]: Alternate archive search path.%s -n [filename]: Setup's parent's process filename.%s -ma: Run setup in Auto mode.%s -ms: Run setup in Silent mode.%s -ira: Ignore the [RunAppX] sections%s -ispf: Ignore the [Program FolderX] sections that show%s the Start Menu shortcut folder at the end of installation. ;*** LOCALIZE ME BABY *** -IDC Use FTP=Use &FTP for downloading files +IDC Use FTP=Use ~FTP for downloading files ;*** LOCALIZE ME BABY *** -IDC Use HTTP=Use &HTTP for downloading files +IDC Use HTTP=Use ~HTTP for downloading files ;*** LOCALIZE ME BABY *** -IDC Save Installer Files=&Save installer files locally +IDC Save Installer Files=~Save installer files locally ;*** LOCALIZE ME BABY *** -IDC Recapture Homepage=&Make Netscape.com my home page +IDC Recapture Homepage=~Make Netscape.com my home page ;*** LOCALIZE ME BABY *** -IDC Turbo Mode=&Use Quick Launch for faster startup times when possible +IDC Turbo Mode=~Use Quick Launch for faster startup times when possible ;*** LOCALIZE ME BABY *** Message Download Paused=Setup has encountered a network problem and has paused the download. If you have just lost your network connection, please click Resume once your network has been reestablished. diff --git a/xpinstall/packager/os2/makejs.pl b/xpinstall/packager/os2/makejs.pl index 13ee86f4723..90b418c6980 100644 --- a/xpinstall/packager/os2/makejs.pl +++ b/xpinstall/packager/os2/makejs.pl @@ -74,8 +74,7 @@ $outTempFile = $inJstFileSplit[0]; $outTempFile .= ".template"; $foundLongFiles = 0; -print "cp \"$ENV{MOZ_SRC}\\mozilla\\xpinstall\\packager\\common\\share.t\" $outTempFile\n"; -copy("$ENV{MOZ_SRC}\\mozilla\\xpinstall\\packager\\common\\share.t", "$outTempFile"); +system("cp \"$ENV{MOZ_SRC}\\mozilla\\xpinstall\\packager\\common\\share.t\" $outTempFile\n"); system("cat $inJstFile >> $outTempFile"); # Open the input .template file diff --git a/xpinstall/packager/os2/makexpi.pl b/xpinstall/packager/os2/makexpi.pl index 8a99be1ea20..77849e7a837 100644 --- a/xpinstall/packager/os2/makexpi.pl +++ b/xpinstall/packager/os2/makexpi.pl @@ -106,10 +106,10 @@ if(!(-e "$inStagePath\\$inComponentName")) if($inComponentName =~ /xpcom/i) { - # copy msvcrt.dll to xpcom dir + # copy cpprmi36.dll to xpcom dir if(-e "$ENV{VACPP365}\\runtime\\cpprmi36.dll") { - copy("$ENV{VACPP365}\\runtime\\cpprmi36.dll", "$inStagePath\\$inComponentName\\bin"); + system("cp $ENV{VACPP365}\\runtime\\cpprmi36.dll $inStagePath\\$inComponentName\\bin"); } } @@ -145,7 +145,7 @@ print "\n Making $inComponentName.xpi...\n"; $saveCwdir = cwd(); -copy("$inComponentName.js", "$inStagePath\\$inComponentName\\install.js"); +system("cp $inComponentName.js $inStagePath\\$inComponentName\\install.js"); # DLLRNAME and possibly LXLITE DLLs print "Modifying DLLs in $inStagePath/$inComponentName...\n";