diff --git a/mozilla/xpinstall/packager/os2/browser.jst b/mozilla/xpinstall/packager/os2/browser.jst index 6e94c0dc1cf..1701776da15 100644 --- a/mozilla/xpinstall/packager/os2/browser.jst +++ b/mozilla/xpinstall/packager/os2/browser.jst @@ -1,108 +1,112 @@ function upgradeCleanup() { - // Obsolete files from Netscape 6.0 and Netscape 6.01 that + // Obsolete files and generated files that // need to be cleaned up. - deleteThisFile("Components", "libmozucth.so"); - deleteThisFile("Components", "libpsmglue.so"); - deleteThisFile("Components", "libsample.so"); - deleteThisFile("Components", "nsSample.js"); - deleteThisFile("Components", "libucvja.so"); - deleteThisFile("Components", "libucvko.so"); - deleteThisFile("Components", "libucvtw.so"); - deleteThisFile("Components", "libucvtw2.so"); - deleteThisFile("Components", "libucvlatin.so"); - deleteThisFile("Components", "libucvcn.so"); - deleteThisFile("Components", "libucvibm.so"); - deleteThisFile("Program", "defaults/pref/config.js"); - deleteThisFile("Program", "defaults/pref/initpref.js"); - deleteThisFile("Program", "defaults/wallet/URLFieldSchema.tbl"); - deleteThisFile("Program", "libcmt.so"); - deleteThisFile("Program", "libjpeg.so"); - deleteThisFile("Program", "libprotocol.so"); + deleteThisFile("Chrome", "chrome.rdf"); + deleteThisFolder("Chrome", "overlayinfo"); } -var srDest = $SpaceRequired$; +// main +var srDest; +var err; +var fProgram; -var err = initInstall("Mozilla Navigator", "Browser", "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall("$ProductName$", "Browser", "$Version$"); logComment("initInstall: " + err); -var communicatorFolder = getFolder("Program"); -logComment("communicatorFolder: " + communicatorFolder); +fProgram = getFolder("Program"); +logComment("fProgram: " + fProgram); -if (verifyDiskSpace(communicatorFolder, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - // Call upgradeCleanup() before addDirectory() in case we accidentaly - // delete files that we happen to be also installing. This way, if we do, - // it will just get reinstalled. This is for safety measure. - upgradeCleanup(); - err = addDirectory("Program", - "$Version$", - "bin", // jar source folder - communicatorFolder, // target folder - "", // target subdir - true ); // force flag + setPackageFolder(fProgram); - logComment("addDirectory() returned: " + err); + upgradeCleanup(); + err = addDirectory("", + "$Version$", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + "", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() of Program returned: " + err); - // create the plugins folder next to mozilla - var pluginsFolder = getFolder("Plugins"); - var ignoreErr = dirCreate(pluginsFolder); - logComment("dirCreate() returned: " + ignoreErr); + // check return value + if( err == SUCCESS ) + { + // register chrome + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-platform/"); - var cf = getFolder("Chrome"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-platform/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-platform/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-region/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","content-packs.jar"), "content/content-packs/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-region/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/editor/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/editor-region/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-region/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/necko/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/mozldap/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"content/forms/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"skin/classic/forms/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/editor/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/global/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/messenger/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/communicator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/editor/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-region/"); + /* Log files that are created after the installer is done, so they can be uninstalled */ + logComment("Installing: " + fProgram + "Xpcs Registry.dat"); + logComment("Installing: " + fProgram + "xpcom.log"); + logComment("Create Folder: " + fProgram + "components"); + logComment("Installing: " + fProgram + "components\\xpti.dat"); + logComment("Installing: " + fProgram + "components\\xptitemp.dat"); + logComment("Create Folder: " + fProgram + "chrome"); + logComment("Installing: " + fProgram + "chrome\\installed-chrome.txt"); + logComment("Installing: " + fProgram + "chrome\\chrome.rdf"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\communicator"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\communicator\\content"); + logComment("Installing: " + fProgram + "chrome\\overlayinfo\\communicator\\content\\overlays.rdf"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\editor"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\editor\\content"); + logComment("Installing: " + fProgram + "chrome\\overlayinfo\\editor\\content\\overlays.rdf"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\messenger"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\messenger\\content"); + logComment("Installing: " + fProgram + "chrome\\overlayinfo\\messenger\\content\\overlays.rdf"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator\\content"); + logComment("Installing: " + fProgram + "chrome\\overlayinfo\\navigator\\content\\overlays.rdf"); + logComment("Create Folder: " + fProgram + "chrome\\overlayinfo\\navigator\\skin"); + logComment("Installing: " + fProgram + "chrome\\overlayinfo\\navigator\\skin\\stylesheets.rdf"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/autoconfig/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/cookie/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/wallet/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"content-packs.jar"),"content/content-packs/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/necko/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/mozldap/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"forms.jar"),"content/forms/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"forms.jar"),"skin/classic/forms/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/communicator/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/editor/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/messenger/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/navigator/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/communicator/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/"); - - if (err==SUCCESS) + err = getLastError(); + if (err == SUCCESS) { - err = performInstall(); - logComment("performInstall() returned: " + err); - if (! ('buildID' in Install)) - { - logComment("Running Pre-Mozilla 0.9.1"); - initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "$Version$"); - cleanupUtility = getFolder(communicatorFolder, "xpicleanup"); - err = File.execute(cleanupUtility); - logComment("execute() returned: " + err); - err = performInstall(); - } + err = performInstall(); + logComment("performInstall() returned: " + err); } else - { - cancelInstall(err); - logComment("cancelInstall() due to error: " + err); - } + cancelInstall(err); + } + else + cancelInstall(err); } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + + +// end main diff --git a/mozilla/xpinstall/packager/os2/chatzilla.jst b/mozilla/xpinstall/packager/os2/chatzilla.jst index 8f0ad4f347b..f474634c5f2 100644 --- a/mozilla/xpinstall/packager/os2/chatzilla.jst +++ b/mozilla/xpinstall/packager/os2/chatzilla.jst @@ -1,30 +1,23 @@ -var srDest = $SpaceRequired$; - var err = initInstall("Chatzilla v0.5", "Chatzilla", "$Version$"); logComment("initInstall: " + err); -if (verifyDiskSpace(getFolder("Program"), srDest)) -{ - addFile("Chatzilla service", - "$Version$", - "bin/components/chatzilla-service.js", - getFolder("Components"), - "chatzilla-service.js", - true); +addFile("Chatzilla service", + "bin/components/chatzilla-service.js", + getFolder("Components"), + ""); - addFile("Chatzilla Chrome", - "bin/chrome/chatzilla.jar", // jar source folder - getFolder("Chrome"), // target folder - ""); // target subdir +addFile("Chatzilla Chrome", + "bin/chrome/chatzilla.jar", // jar source folder + getFolder("Chrome"), // target folder + ""); // target subdir - registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "content/chatzilla/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "skin/modern/chatzilla/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "locale/en-US/chatzilla/"); +registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "content/chatzilla/"); +registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "skin/modern/chatzilla/"); +registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar"), "locale/en-US/chatzilla/"); - if (err==SUCCESS) - performInstall(); - else - cancelInstall(err); -} +err = getLastError(); +if (err==SUCCESS) + performInstall(); else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(err); + diff --git a/mozilla/xpinstall/packager/os2/config.it b/mozilla/xpinstall/packager/os2/config.it index 04c838371f2..dacee50e011 100644 --- a/mozilla/xpinstall/packager/os2/config.it +++ b/mozilla/xpinstall/packager/os2/config.it @@ -601,22 +601,12 @@ Message= ;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 File1] -;Timing=post smartupdate -;Source=[XPI PATH]\$UninstallFile$ -;Destination=[WINDIR] -;Fail If Exists=FALSE -;Do Not Uninstall=TRUE +[Copy File0] +Timing=post smartupdate +Source=[XPI PATH]\$MainIcoFile$ +Destination=[SETUP PATH] +Fail If Exists=FALSE +Do Not Uninstall=FALSE ;Copy File SequentialX sections @@ -672,6 +662,65 @@ Decrypt Key=FALSE Decrypt Key Value=TRUE Timing=pre smartupdate +[OS2 INI1] +App=$ProductName$ $UserAgent$ +Key=Install Directory +Key Value=[SETUP PATH] +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[OS2 INI2] +App=$ProductName$ $UserAgent$ +Key=Uninstall Log Folder +Key Value=[SETUP PATH]\Uninstall +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[OS2 INI3] +App=$ProductName$ +Key=Current Version +Key Value=$ProductName$ $UserAgent$ +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[OS2 INI4] +App=$ProductName$ $UserAgent$ +Key=Plugins +Key Value=[SETUP PATH]\Plugins +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[OS2 INI5] +App=Mozilla 1.0 (en) +Key=Components +Key Value=[SETUP PATH]\Components +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[OS2 INI6] +App=$ProductName$ $UserAgent$ +Key=PathToExe +Key Value=[SETUP PATH]\$MainExeFile$ +Decrypt App=FALSE +Decrypt Key=FALSE +Decrypt Key Value=TRUE +Timing=pre smartupdate + +[Cleanup Previous Product RegKeys] +Product Name0=Mozilla +Product Reg Key0=Software\Mozilla.org\Mozilla +Current Version0=1.0 (en) + [Cleanup Previous Product RegKeys] Product Name0=Mozilla Product Reg Key0=Software\Mozilla.org\Mozilla diff --git a/mozilla/xpinstall/packager/os2/deflenus.jst b/mozilla/xpinstall/packager/os2/deflenus.jst index 5d787991bae..f13fc7f97ad 100644 --- a/mozilla/xpinstall/packager/os2/deflenus.jst +++ b/mozilla/xpinstall/packager/os2/deflenus.jst @@ -1,38 +1,42 @@ -var srDest = $SpaceRequired$; +// main +var srDest; var err; var fProgram; // ----LOCALIZATION NOTE: translate only these ------ -var prettyName = "US Regional Pack"; -var regName = "defaults/mozilla/US"; +var prettyName = "US English profile default"; +var regName = "defaults/mozilla/en-US"; // --- END CHANGABLE STUFF --- +srDest = $SpaceRequired$:bin; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); fProgram = getFolder("Program"); logComment("fProgram: " + fProgram); -if (verifyDiskSpace(fProgram, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - err = addDirectory("", - "$Version$", - "bin", - fProgram, - "", - true); - logComment("addDirectory() returned: " + err); + setPackageFolder(fProgram); - if (err == SUCCESS) - { - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall due to error: " + err); - } + err = addDirectory("", + "$Version$", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + "", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); + + // check return value + if(err == SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main diff --git a/mozilla/xpinstall/packager/os2/editor.jst b/mozilla/xpinstall/packager/os2/editor.jst index a0519e4238a..cc7fb19b383 100644 --- a/mozilla/xpinstall/packager/os2/editor.jst +++ b/mozilla/xpinstall/packager/os2/editor.jst @@ -1,33 +1,18 @@ -var srDest = $SpaceRequired$; - var err = initInstall("Mozilla Editor", "Editor", "$Version$"); logComment("initInstall: " + err); -var communicatorFolder = getFolder("Program"); +var communicatorFolder = getFolder("Communicator"); logComment("communicatorFolder: " + communicatorFolder); -if (verifyDiskSpace(communicatorFolder, srDest)) -{ - err = addDirectory("Program", - "$Version$", - "bin", // jar source folder - communicatorFolder, // target folder - "", // target subdir - true ); // force Flag +err = addDirectory("Program", + "$Version$", + "bin", // fileName in jar, + communicatorFolder, // Where to put this file (Returned from getFolder) + "", // fileName in jar, + true); // Force Flag - logComment("addDirectory() returned: " + err); +logComment("addDirectory() returned: " + err); + +err = performInstall(); +logComment("performInstall() returned: " + err); - err = getLastError(); - if (err==SUCCESS) - { - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall() due to error: " + err); - } -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); diff --git a/mozilla/xpinstall/packager/os2/inspector.jst b/mozilla/xpinstall/packager/os2/inspector.jst index c89edb967dd..a8802abeb14 100644 --- a/mozilla/xpinstall/packager/os2/inspector.jst +++ b/mozilla/xpinstall/packager/os2/inspector.jst @@ -2,24 +2,19 @@ var err = initInstall("DOM Inspector", "Inspector", "$Version$"); logComment("initInstall: " + err); var fProgram = getFolder("Program"); -var srDest = $SpaceRequired$; +logComment("fProgram: " + fProgram); -if (verifyDiskSpace(fProgram, srDest)) -{ - err = addDirectory("", "$Version$", "bin", fProgram, "", true); - logComment("addDirectory: " + err); - - var jarFolder = getFolder("Chrome", "inspector.jar"); - registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/"); - registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/inspector/"); - registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/"); - registerChrome(LOCALE | DELAYED_CHROME, jarFolder, "locale/en-US/inspector/"); - - err = getLastError(); - if (err==SUCCESS) - performInstall(); - else - cancelInstall(err); -} +err = addDirectory("", "$Version$", "bin", fProgram, "", true); +logComment("addDirectory: " + err); + +var jarFolder = getFolder("Chrome", "inspector.jar"); +registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/"); +registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/inspector/"); +registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/"); +registerChrome(LOCALE | DELAYED_CHROME, jarFolder, "locale/en-US/inspector/"); + +err = getLastError(); +if (err==SUCCESS) + performInstall(); else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(err); diff --git a/mozilla/xpinstall/packager/os2/install.it b/mozilla/xpinstall/packager/os2/install.it index 2509f42d2f0..9fa5558cb1a 100644 --- a/mozilla/xpinstall/packager/os2/install.it +++ b/mozilla/xpinstall/packager/os2/install.it @@ -1,16 +1,6 @@ [General] FONTNAME=WarpSans FONTSIZE=9 -CHARSET=0 -;Here is a partial list CHAR_SETS -; ANSI_CHARSET = 0 -; DEFAULT_CHARSET = 1 -; SYMBOL_CHARSET = 2 -; SHIFTJIS_CHARSET = 128 -; GB2312_CHARSET = 134 -; HANGEUL_CHARSET = 129 -; CHINESEBIG5_CHARSET = 136 -; OEM_CHARSET 255 OK_=~OK OK=OK @@ -33,9 +23,7 @@ URL=URL: TO=To Path: ACCEPT_=~Accept DECLINE_=~Decline -PROGRAMFOLDER_=~Program Folder: -EXISTINGFOLDERS_=E~xisting Folders: -SETUPMESSAGE=Setup has finished copying files to your computer. Before you can use the program, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup. +SETUPMESSAGE=Setup has finished copying files to your computer. Before you can use the program, you must restart OS/2 or your computer. Choose one of the following options and click OK to finish setup. YESRESTART=Yes, I want to restart my computer now. NORESTART=No, I will restart my computer later. ADDITIONALCOMPONENTS_=~Additional Components: @@ -51,8 +39,6 @@ DELETE_=~Delete README=Re~ad Me PAUSE_=~Pause RESUME_=~Resume -CHECKED=Checked -UNCHECKED=Unchecked EXTRACTING=Extracting... @@ -62,27 +48,22 @@ EXTRACTING=Extracting... ERROR_DIALOG_CREATE=Could not create %s dialog. ERROR_FAILED=%s failed. ERROR_FILE_NOT_FOUND=File not found: %s -ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed. -ERROR_GET_WINDOWS_DIRECTORY_FAILED =GetWindowsDirectory() failed. DLGQUITTITLE=Exit Setup DLGQUITMSG=Setup is not complete. If you quit the Setup program now, the program will not be installed. You may run the Setup program at a later time to complete the installation. Are you sure you want to cancel Setup? -DLG_REBOOT_TITLE=Restarting Windows -ERROR_GETPROCADDRESS=GetProcAddress() of %s failed. +DLG_REBOOT_TITLE=Restarting OS/2 +ERROR_DOSQUERYPROCADDR=DosQueryProcAddr() of %s failed. ERROR_WRITEPRIVATEPROFILESTRING=WritePrivateProfileString() failed for file %s MSG_RETRIEVE_CONFIGINI=Please wait while Setup is attempting to retrieve Config.ini, required by Setup, from the Web... ERROR_CREATE_TEMP_DIR=Setup was unable to create the TEMP directory: %s DLGBROWSETITLE=Select a directory ERROR_DETERMINING_DISK_SPACE=Could not determine available disk space for: %s DLG_DISK_SPACE_CHECK_TITLE=Disk space check -DLG_DISK_SPACE_CHECK_CRUTIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup. +DLG_DISK_SPACE_CHECK_CRUCIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup. DLG_DISK_SPACE_CHECK_MSG=Setup has detected insufficient disk space to continue with installation process on %s for the path: %sRequired: %sAvailable: %sClick OK to go back and choose a different destination path. ERROR_CREATE_DIRECTORY=Could not create folder: %sMake sure you have access to create the folder. -STR_FILE_NUMBER=File count: -STR_FILENAME=Filename: MSG_SMARTUPDATE_START=Preparing Install, please wait... MSG_CONFIGURING=Configuring %s, please wait... ERROR_XPI_INSTALL=Error occurred during installation -ERROR_SETUP_REQUIREMENT=Windows95 or greater Operating System is required! Exiting setup... DLG_EXTRACTING_TITLE=Install Progress STR_PROCESSINGFILE=Preparing file: %s STR_INSTALLING=Currently installing %s @@ -92,29 +73,14 @@ MB_MESSAGE_STR=Message MB_ATTENTION_STR=Attention MSG_CREATE_DIRECTORY=The following directory does not exist:%sWould you like to create it? STR_CREATE_DIRECTORY=Create Directory? -ERROR_PROGRAM_FOLDER_NAME=Invalid Program folder name entered. CB_DEFAULT=Default ERROR_DESTINATION_PATH=Invalid path entered. STR_SETUP_TYPE=Setup Type: STR_SELECTED_COMPONENTS=Selected Components: STR_DESTINATION_DIRECTORY=Destination Directory: -STR_PROGRAM_FOLDER=Program Folder: -STR_DELETING_DESTINATION_DIR=Deleting destination directory to be able to upgrade, please wait... STR_SETUP=Setup STR_DOWNLOAD_SITE=Download Site: STR_SAVE_INSTALLER_FILES=Save downloaded and Setup program files to: MSG_INIT_SETUP=Initializing Setup, please wait... STR_MESSAGEBOX_TITLE=%s Setup -ERROR_GETVERSION=GetVersionEx() failed! - -STATUS_EXTRACTING=Extracting %s -STATUS_LAUNCHING_SETUP=Launching Setup... -ERROR_FILE_WRITE=Unable to write file %s -TITLE=Installation -ERROR_OUT_OF_MEMORY=Out of memory! - -ERROR_DLL_LOAD=Could not load %s -ERROR_STRING_LOAD=Could not load string resource ID %d -ERROR_STRING_NULL=Null pointer encountered. -ERROR_GLOBALALLOC=Memory allocation error. diff --git a/mozilla/xpinstall/packager/os2/langenus.jst b/mozilla/xpinstall/packager/os2/langenus.jst index a13087bc4f0..d896cea1356 100644 --- a/mozilla/xpinstall/packager/os2/langenus.jst +++ b/mozilla/xpinstall/packager/os2/langenus.jst @@ -1,91 +1,94 @@ -var srDest = $SpaceRequired$; +// main +var srDest; var err; var fProgram; var platformNode; platformNode = getPlatform(); +/* BEGIN TEMPORARY UNTIL xpinstall/packager/common/share.t is fixed*/ +platformNode = "win"; +/* END TEMPORARY */ logComment("initInstall: platformNode=" + platformNode); // end // end - OS type detection -// --- LOCALIZATION NOTE: translate only these --- +// ----LOCALIZATION NOTE: translate only these ------ var prettyName = "English (US) Language Pack"; var langcode = "en"; var chromeNode = langcode + "-US"; -// --- END LOCALIZABLE RESOURCES --- +// --- END CHANGABLE STUFF --- var regName = "locales/mozilla/" + chromeNode; var chromeName = chromeNode + ".jar"; var platformName = langcode + "-" + platformNode + ".jar"; var localeName = "locale/" + chromeNode + "/"; -err = initInstall(prettyName, regName, "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); fProgram = getFolder("Program"); logComment("fProgram: " + fProgram); -if (verifyDiskSpace(fProgram, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - var chromeType = LOCALE; - err = addDirectory("", - "bin", - fProgram, - ""); - logComment("addDirectory() returned: " + err); + var chromeType = LOCALE; + err = addDirectory("", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + ""); // Force Flag + logComment("addDirectory() returned: " + err); - if (err != SUCCESS) - { - logComment("addDirectory() to " + fProgram + "failed!"); - // couldn't install globally, try installing to the profile - resetError(); - chromeType |= PROFILE_CHROME; - fProgram = getFolder("Profile"); - logComment("try installing to the user profile:" + fProgram); - err = addDirectory("","bin",fProgram,""); - } + if (err != SUCCESS) + { + logComment("addDirectory() to " + fProgram + "failed!"); + // couldn't install globally, try installing to the profile + resetError(); + chromeType |= PROFILE_CHROME; + fProgram = getFolder("Profile"); + logComment("try installing to the user profile:" + fProgram); + err = addDirectory("","bin",fProgram,""); + } - setPackageFolder(fProgram); + setPackageFolder(fProgram); - // check return value - if (err == SUCCESS) - { - // register chrome - var cf = getFolder(fProgram, "chrome/"+chromeName); - var pf = getFolder(fProgram, "chrome/"+platformName); + // check return value + if (err == SUCCESS) + { + // register chrome + var cf = getFolder(fProgram, "chrome/"+chromeName); + var pf = getFolder(fProgram, "chrome/"+platformName); - registerChrome(chromeType, cf, localeName + "global/"); - registerChrome(chromeType, cf, localeName + "communicator/"); + registerChrome(chromeType, cf, localeName + "global/"); + registerChrome(chromeType, cf, localeName + "communicator/"); + registerChrome(chromeType, cf, localeName + "messenger/"); + registerChrome(chromeType, cf, localeName + "messenger-smime/"); + registerChrome(chromeType, cf, localeName + "editor/"); + registerChrome(chromeType, cf, localeName + "navigator/"); + registerChrome(chromeType, cf, localeName + "necko/"); + registerChrome(chromeType, cf, localeName + "mozldap/"); + registerChrome(chromeType, cf, localeName + "autoconfig/"); + registerChrome(chromeType, cf, localeName + "cookie/"); + registerChrome(chromeType, cf, localeName + "wallet/"); + registerChrome(chromeType, cf, localeName + "content-packs/"); + registerChrome(chromeType, cf, localeName + "help/"); + registerChrome(chromeType, cf, localeName + "pippki/"); + registerChrome(chromeType, cf, localeName + "pipnss/"); + registerChrome(chromeType, cf, localeName + "forms/"); - registerChrome(chromeType, cf, localeName + "messenger/"); - registerChrome(chromeType, cf, localeName + "messenger-smime/"); - - registerChrome(chromeType, cf, localeName + "editor/"); - registerChrome(chromeType, cf, localeName + "navigator/"); - registerChrome(chromeType, cf, localeName + "aim/"); - registerChrome(chromeType, cf, localeName + "necko/"); - registerChrome(chromeType, cf, localeName + "mozldap/"); - registerChrome(chromeType, cf, localeName + "autoconfig/"); - registerChrome(chromeType, cf, localeName + "cookie/"); - registerChrome(chromeType, cf, localeName + "wallet/"); - registerChrome(chromeType, cf, localeName + "content-packs/"); - registerChrome(chromeType, cf, localeName + "help/"); - registerChrome(chromeType, cf, localeName + "net2phone/"); - registerChrome(chromeType, cf, localeName + "pipnss/"); - registerChrome(chromeType, cf, localeName + "pippki/"); - registerChrome(chromeType, cf, localeName + "forms/"); - - registerChrome(chromeType, pf, localeName + "global-platform/"); - registerChrome(chromeType, pf, localeName + "communicator-platform/"); - registerChrome(chromeType, pf, localeName + "navigator-platform/"); - - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall due to error: " + err); - } + registerChrome(chromeType, pf, localeName + "global-platform/"); + registerChrome(chromeType, pf, localeName + "communicator-platform/"); + registerChrome(chromeType, pf, localeName + "navigator-platform/"); + + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + { + cancelInstall(err); + logComment("cancelInstall due to error: " + err); + } } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main diff --git a/mozilla/xpinstall/packager/os2/mail.jst b/mozilla/xpinstall/packager/os2/mail.jst index 86cee7e9998..8f5ca775499 100644 --- a/mozilla/xpinstall/packager/os2/mail.jst +++ b/mozilla/xpinstall/packager/os2/mail.jst @@ -1,55 +1,66 @@ function upgradeCleanup() { - // Obsolete files from Netscape 6.0 and Netscape 6.01 that + // Obsolete files and generated files that // need to be cleaned up. - deleteThisFile("Components", "libsigned.so"); + deleteThisFile("Program", "msgMapi.dll"); + deleteThisFile("Components", "signed.dll"); + deleteThisFile("Components", "smimestb.dll"); + deleteThisFile("Components", "nsMapiRegistry.dll"); } -var srDest = $SpaceRequired$; +// main +var srDest; +var err; +var fProgram; -var err = initInstall("Mozilla Mail", "Mail", "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall("Mozilla Mail", "Mail", "$Version$"); logComment("initInstall: " + err); -var communicatorFolder = getFolder("Program"); -logComment("communicatorFolder: " + communicatorFolder); +fProgram = getFolder("Program"); +logComment("fProgram: " + fProgram); -if (verifyDiskSpace(communicatorFolder, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - // Call upgradeCleanup() before addDirectory() in case we accidentaly - // delete files that we happen to be also installing. This way, if we do, - // it will just get reinstalled. This is for safety measure. - upgradeCleanup(); - err = addDirectory("Program", - "$Version$", - "bin", // jar source folder - communicatorFolder, // target folder - "", // target subdir - true ); // force flag + setPackageFolder(fProgram); - logComment("addDirectory() returned: " + err); + upgradeCleanup(); + err = addDirectory("", + "$Version$", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + "", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() returned: " + err); - registerChrome(CONTENT | DELAYED_CHROME, + // check return value + if( err == SUCCESS ) + { + // register chrome + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","messenger.jar"), "content/messenger/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","messenger.jar"), "content/messenger-region/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","messenger.jar"), "content/messenger-smime/"); - if (err==SUCCESS) + // check return value + err = getLastError(); + if(err == SUCCESS) { - err = performInstall(); - logComment("performInstall() returned: " + err); + err = performInstall(); + logComment("performInstall() returned: " + err); } else - { - cancelInstall(err); - logComment("cancelInstall() due to error: " + err); - } + cancelInstall(err); + } + else + cancelInstall(err); } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main diff --git a/mozilla/xpinstall/packager/os2/makeall.pl b/mozilla/xpinstall/packager/os2/makeall.pl index 12e238bb6fc..78215caf85e 100644 --- a/mozilla/xpinstall/packager/os2/makeall.pl +++ b/mozilla/xpinstall/packager/os2/makeall.pl @@ -109,6 +109,7 @@ $ENV{WIZ_nameCompany} = "mozilla.org"; $ENV{WIZ_nameProduct} = "Mozilla"; $ENV{WIZ_nameProductNoVersion} = "Mozilla"; $ENV{WIZ_fileMainExe} = "Mozilla.exe"; +$ENV{WIZ_fileMainIco} = "Mozilla.ico"; $ENV{WIZ_fileUninstall} = $seuFileNameSpecific; $ENV{WIZ_fileUninstallZip} = $seuzFileNameSpecific; # The following variables are for displaying version info in the @@ -225,6 +226,12 @@ if(system("cp $ENV{MOZ_SRC}\\mozilla\\LICENSE $inDistPath\\setup\\license.txt")) die "\n Error: copy $ENV{MOZ_SRC}\\mozilla\\LICENSE $inDistPath\\setup\\license.txt\n"; } +# copy the icons +if(system("cp $inDistPath\\mozilla.ico $inDistPath\\setup\\mozilla.ico")) +{ + die "\n Error: copy $inDistPath\\mozilla.ico $inDistPath\\setup\\mozilla.ico\n"; +} + # build the self-extracting .exe (installer) file. print "\nbuilding self-extracting stub installer ($seiFileNameSpecificStub)...\n"; if(system("cp $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecificStub")) diff --git a/mozilla/xpinstall/packager/os2/makecfgini.pl b/mozilla/xpinstall/packager/os2/makecfgini.pl index daddd036462..9422f81dc12 100644 --- a/mozilla/xpinstall/packager/os2/makecfgini.pl +++ b/mozilla/xpinstall/packager/os2/makecfgini.pl @@ -91,6 +91,7 @@ $nameCompany = $ENV{WIZ_nameCompany}; $nameProduct = $ENV{WIZ_nameProduct}; $nameProductNoVersion = $ENV{WIZ_nameProductNoVersion}; $fileMainExe = $ENV{WIZ_fileMainExe}; +$fileMainIco = $ENV{WIZ_fileMainIco; $fileUninstall = $ENV{WIZ_fileUninstall}; $fileUninstallZip = $ENV{WIZ_fileUninstallZip}; @@ -176,6 +177,7 @@ while($line = ) $line =~ s/\$ProductName\$/$nameProduct/gi; $line =~ s/\$ProductNameNoVersion\$/$nameProductNoVersion/gi; $line =~ s/\$MainExeFile\$/$fileMainExe/gi; + $line =~ s/\$MainIcoFile\$/$fileMainIco/gi; $line =~ s/\$UninstallFile\$/$fileUninstall/gi; $line =~ s/\$UninstallFileZip\$/$fileUninstallZip/gi; print fpOutIni $line; diff --git a/mozilla/xpinstall/packager/os2/makejs.pl b/mozilla/xpinstall/packager/os2/makejs.pl index 90b418c6980..155c5143510 100644 --- a/mozilla/xpinstall/packager/os2/makejs.pl +++ b/mozilla/xpinstall/packager/os2/makejs.pl @@ -64,6 +64,7 @@ $nameCompany = $ENV{WIZ_nameCompany}; $nameProduct = $ENV{WIZ_nameProduct}; $nameProductNoVersion = $ENV{WIZ_nameProductNoVersion}; $fileMainExe = $ENV{WIZ_fileMainExe}; +$fileMainIco = $ENV{WIZ_fileMainIco}; $fileUninstall = $ENV{WIZ_fileUninstall}; # Get the name of the file replacing the .jst extension with a .js extension @@ -117,6 +118,7 @@ while($line = ) $line =~ s/\$ProductName\$/$nameProduct/i; $line =~ s/\$ProductNameNoVersion\$/$nameProductNoVersion/i; $line =~ s/\$MainExeFile\$/$fileMainExe/i; + $line =~ s/\$MainIcoFile\$/$fileMainIco/i; $line =~ s/\$UninstallFile\$/$fileUninstall/i; } diff --git a/mozilla/xpinstall/packager/os2/mozilla-os2-stub-installer.jst b/mozilla/xpinstall/packager/os2/mozilla-os2-stub-installer.jst new file mode 100644 index 00000000000..a3dd53eb6c3 --- /dev/null +++ b/mozilla/xpinstall/packager/os2/mozilla-os2-stub-installer.jst @@ -0,0 +1,47 @@ +// main +var srDest; +var err; +var fDesktop; +var szFolderDesktop; + +srDest = $SpaceRequired$; +err = initInstall("Mozilla Installer", "/mozilla.org/Mozilla Installer", "$Version$"); +logComment("initInstall: " + err); + +// Find the current user's desktop +// Doesn't appear to be possible from the OS2.INI +// Currently hardcoding to C:\\DESKTOP - THIS IS WRONG (especially for translation) +szFolderDesktop = "C:\\Desktop"; + +fDesktop = getFolder("file:///", szFolderDesktop); +logComment("Desktop location: " + fDesktop); + +if(verifyDiskSpace(fDesktop, srDest)) +{ + setPackageFolder(fDesktop); + + err = addFile("", + "", + "mozilla-os2-stub-installer.exe", // dir name in jar to extract + fDesktop, // Where to put this file (Returned from getFolder) + ""); // subdir name to create relative to fProgram + + logComment("addFile() returned: " + err); + + err = execute("mozilla-os2-stub-installer.exe", "", false); + logComment("execute() returned: " + err); + + // check return value + if(err==SUCCESS) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); +} +else + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main + diff --git a/mozilla/xpinstall/packager/os2/psm.jst b/mozilla/xpinstall/packager/os2/psm.jst index 094ca65e952..1864af4f443 100644 --- a/mozilla/xpinstall/packager/os2/psm.jst +++ b/mozilla/xpinstall/packager/os2/psm.jst @@ -1,46 +1,51 @@ function upgradeCleanup() { - // Obsolete files that need to be cleaned up. - deleteThisFolder("Communicator", "psm"); + // Obsolete files and generated files that + // need to be cleaned up. + deleteThisFile("Program", "psm.exe"); + deleteThisFile("Components", "psmglue.dll"); } -var srDest = $SpaceRequired$; +// main +var srDest; var err; +var fProgram; -err = initInstall("Personal Security Manager", "Personal Security Manager", "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall("Personal Security Manager", "Personal Security Manager", "$Version$"); logComment("initInstall: " + err); -var communicatorFolder = getFolder("Communicator"); -logComment("communicatorFolder: " + communicatorFolder); +fProgram = getFolder("Program"); +logComment("fProgram: " + fProgram); -if(verifyDiskSpace(communicatorFolder, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - // Call upgradeCleanup() before addDirectory() in case we accidentaly - // delete files that we happen to be also installing. This way, if we do, - // it will just get reinstalled. This is for safety measure. + setPackageFolder(fProgram); + upgradeCleanup(); - err = addDirectory("Program", // reg entry - "$Version$", // version - "bin", // jar source - communicatorFolder, // target folder - "", // relative subdir - true ); // force flag + err = addDirectory("", + "$Version$", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + "", // subdir name to create relative to fProgram + true); // Force Flag logComment("addDirectory() returned: " + err); - if(err==SUCCESS) + // check return value + if(err == SUCCESS) { - var pki = getFolder("Chrome","pippki.jar"); - var nss = getFolder("Chrome","pipnss.jar"); + + var pki = getFolder("Chrome", "pippki.jar"); + var nss = getFolder("Chrome", "pipnss.jar"); registerChrome(CONTENT | DELAYED_CHROME, pki, "content/pippki/"); registerChrome(CONTENT | DELAYED_CHROME, nss, "content/pipnss/"); err = performInstall(); logComment("performInstall() returned: " + err); } else - { - cancelInstall(); - logComment("cancelInstall() due to error: "+err); - } + cancelInstall(err); } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main diff --git a/mozilla/xpinstall/packager/os2/regus.jst b/mozilla/xpinstall/packager/os2/regus.jst index 9bfd287e80d..14220aaa284 100644 --- a/mozilla/xpinstall/packager/os2/regus.jst +++ b/mozilla/xpinstall/packager/os2/regus.jst @@ -1,61 +1,98 @@ -var srDest = $SpaceRequired$; +// main +var srDest; var err; var fProgram; +var searchPlugins = "searchplugins"; +var platformNode = getPlatform(); +/* BEGIN TEMPORARY UNTIL xpinstall/packager/common/share.t is fixed*/ +platformNode = "win"; +/* END TEMPORARY */ -// --- LOCALIZATION NOTE: translate only these --- -var prettyName = "US Regional Pack"; +// ----LOCALIZATION NOTE: translate only these ------ +var prettyName = "US Region Pack"; var chromeNode = "US"; -// --- END LOCALIZABLE RESOURCES --- +// --- END CHANGABLE STUFF --- + var regName = "locales/mozilla/" + chromeNode; var chromeName = chromeNode + ".jar"; var localeName = "locale/" + chromeNode + "/"; -err = initInstall(prettyName, regName, "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); +if (platformNode == 'mac') +{ + searchPlugins = "Search Plugins"; +} + fProgram = getFolder("Program"); logComment("fProgram: " + fProgram); -if (verifyDiskSpace(fProgram, srDest)) +if(verifyDiskSpace(fProgram, srDest)) { - var chromeType = LOCALE; + var chromeType = LOCALE; + var fTarget; + + setPackageFolder(fProgram); + + fTarget = getFolder("Chrome"); + err = addDirectory("", + "bin/chrome", // dir name in jar to extract + fTarget, // Where to put this file (Returned from GetFolder) + ""); // subdir name to create relative to fProgram + logComment("addDirectory() returned: " + err); + if (err == SUCCESS) + { + fTarget = getFolder("Program", "defaults"); + logComment("fTarget: " + fTarget); err = addDirectory("", - "bin", - fProgram, - ""); + "bin/defaults", // dir name in jar to extract + fTarget, // Where to put this file (Returned from GetFolder) + ""); // subdir name to create relative to fProgram logComment("addDirectory() returned: " + err); - - if (err != SUCCESS) - { - logComment("addDirectory() to " + fProgram + "failed!"); - // couldn't install globally, try installing to the profile - resetError(); - chromeType |= PROFILE_CHROME; - fProgram = getFolder("Profile"); - logComment("try installing to the profile: " + fProgram); - err = addDirectory("","bin/chrome",fProgram,"chrome"); - } - - setPackageFolder(fProgram); - if (err == SUCCESS) { - // register chrome - var cf = getFolder(fProgram, "chrome/"+ chromeName); - registerChrome(chromeType, cf, localeName + "global-region/"); - registerChrome(chromeType, cf, localeName + "communicator-region/"); - registerChrome(chromeType, cf, localeName + "editor-region/"); - registerChrome(chromeType, cf, localeName + "messenger-region/"); - registerChrome(chromeType, cf, localeName + "navigator-region/"); + fTarget = getFolder("Program", searchPlugins); + logComment("fTarget: " + fTarget); + err = addDirectory("", + "bin/searchplugins", // dir name in jar to extract + fTarget, // Where to put this file (Returned from GetFolder) + ""); // subdir name to create relative to fProgram + logComment("addDirectory() returned: " + err); + } + } + if (err != SUCCESS) + { + logComment("addDirectory() to " + fProgram + "failed!"); + // couldn't install globally, try installing to the profile + resetError(); + chromeType |= PROFILE_CHROME; + fProgram = getFolder("Profile"); + logComment("try installing to the profile: " + fProgram); + err = addDirectory("","bin/chrome",fProgram,"chrome"); + } - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall due to error: " + err); - } + if (err == SUCCESS) + { + // register chrome + var cf = getFolder(fProgram, "chrome/"+ chromeName); + registerChrome(chromeType, cf, localeName + "global-region/"); + registerChrome(chromeType, cf, localeName + "communicator-region/"); + registerChrome(chromeType, cf, localeName + "editor-region/"); + registerChrome(chromeType, cf, localeName + "messenger-region/"); + registerChrome(chromeType, cf, localeName + "navigator-region/"); + + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + { + cancelInstall(err); + logComment("cancelInstall due to error: " + err); + } } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + +// end main diff --git a/mozilla/xpinstall/packager/os2/uninstall.it b/mozilla/xpinstall/packager/os2/uninstall.it index f6f702bddc5..c11ddc7be73 100644 --- a/mozilla/xpinstall/packager/os2/uninstall.it +++ b/mozilla/xpinstall/packager/os2/uninstall.it @@ -11,40 +11,10 @@ Company Name=$CompanyName$ Product Name=$ProductName$ ; Valid Path values: -; PROGRAMFILESDIR -; WINDISK -; WINDIR -; WINSYSDIR -; COMMON_STARTUP -; COMMON_PROGRAMS -; COMMON_STARTMENU -; COMMON_DESKTOP -; -; PERSONAL_STARTUP -; PERSONAL_PROGRAMS -; PERSONAL_STARTMENU -; PERSONAL_DESKTOP -; -; PERSONAL_APPDATA -; PERSONAL_CACHE -; PERSONAL_COOKIES -; PERSONAL_FAVORITES -; PERSONAL_FONTS -; PERSONAL_HISTORY -; PERSONAL_NETHOOD -; PERSONAL_PERSONAL -; PERSONAL_PRINTHOOD (supported only under Windows NT) -; PERSONAL_RECENT -; PERSONAL_SENDTO -; PERSONAL_TEMPLATES -; -; PROGRAMFILESDIR -; COMMONFILESDIR -; MEDIAPATH -; CONFIGPATH (supported only under Windows95 and Windows98) -; DEVICEPATH +; OS2DISK +; OS2DIR -; This provides information on where in the Windows Registry to locate the Uninstall log files +; This provides information on where in the OS/2 INI to locate the Uninstall log files ; Main Root Key=HKEY_LOCAL_MACHINE Main Key=[Product WinRegKey] @@ -72,31 +42,21 @@ Extra Cmd Parameter=-kill [Dialog Uninstall] -FONTNAME=MS Sans Serif -FONTSIZE=8 -CHARSET=0 -;Here is a partial list CHAR_SETS -; ANSI_CHARSET = 0 -; DEFAULT_CHARSET = 1 -; SYMBOL_CHARSET = 2 -; SHIFTJIS_CHARSET = 128 -; GB2312_CHARSET = 134 -; HANGEUL_CHARSET = 129 -; CHINESEBIG5_CHARSET = 136 -; OEM_CHARSET 255 +FONTNAME=WarpSans +FONTSIZE=9 Show Dialog=TRUE Title=$ProductName$ Uninstaller Message0=Are you sure you want to completely remove %s and all of its components? -Uninstall=&Uninstall -Cancel=&Cancel +Uninstall=~Uninstall +Cancel=~Cancel Message1=Uninstall has detected that the following shared file is no longer used by any programs. If any programs still require the shared file and it is removed, those programs may no longer function. Are you sure you want to remove this shared file? Message2=Leaving this file will not harm your system. If you are not sure, it is recommended that the shared file be not removed from the system. FileName=File name: -No=&No -NoToAll=N&o to all -Yes=&Yes -YesToAll=Y&es to all +No=~No +NoToAll=N~o to all +Yes=~Yes +YesToAll=Y~es to all ;[Check Instance0] ;Class Name=MozillaWindowClass @@ -111,10 +71,6 @@ YesToAll=Y&es to all [Restore Desktop Integration] Enabled=TRUE -; This section attempts to cleanup the UnreadMail registry keys set up by mail. -[Cleanup Mail Integration] -Enabled=TRUE - [Messages] ERROR_DLL_LOAD=Could not load %s ERROR_STRING_LOAD=Could not load string resource ID %d @@ -127,10 +83,8 @@ DLGQUITMSG=Are you sure you want to cancel? ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed. ERROR_GET_WINDOWS_DIRECTORY_FAILED=GetWindowsDirectory() failed. ERROR_CREATE_TEMP_DIR=Setup was unable to create the TEMP directory: %s -ERROR_SETUP_REQUIREMENT=Windows95 or greater Operating System is required! Exiting setup... MB_WARNING_STR=Warning ERROR_UNINSTALL_LOG_FOLDER=Uninstall log folder not found:%s MB_MESSAGE_STR=Message DLG_REMOVE_FILE_TITLE=Remove File? -ERROR_GETVERSION=GetVersionEx() failed! diff --git a/mozilla/xpinstall/packager/os2/venkman.jst b/mozilla/xpinstall/packager/os2/venkman.jst index 596ee756276..5c374bd3f43 100644 --- a/mozilla/xpinstall/packager/os2/venkman.jst +++ b/mozilla/xpinstall/packager/os2/venkman.jst @@ -1,30 +1,22 @@ -var srDest = $SpaceRequired$; - var err = initInstall("JavaScript Debugger", "Venkman", "$Version$"); logComment("initInstall: " + err); -if (verifyDiskSpace(getFolder("Program"), srDest)) -{ - addFile("Venkman Service", - "$Version$", - "bin/components/venkman-service.js", - getFolder("Components"), - "venkman-service.js", - true); +addFile("Venkman Service", + "bin/components/venkman-service.js", + getFolder("Components"), + ""); - addFile("Venkman Chrome", - "bin/chrome/venkman.jar", // jar source folder - getFolder("Chrome"), // target folder - ""); // target subdir +addFile("Venkman Chrome", + "bin/chrome/venkman.jar", // jar source folder + getFolder("Chrome"), // target folder + ""); // target subdir - registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "content/venkman/"); - registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "skin/modern/venkman/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "locale/en-US/venkman/"); +registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "content/venkman/"); +registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "skin/modern/venkman/"); +registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "locale/en-US/venkman/"); - if (err==SUCCESS) - performInstall(); - else - cancelInstall(err); -} +err = getLastError(); +if (err==SUCCESS) + performInstall(); else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(err); diff --git a/mozilla/xpinstall/packager/os2/xpcom.jst b/mozilla/xpinstall/packager/os2/xpcom.jst index 77c02da1480..378647eb0ea 100644 --- a/mozilla/xpinstall/packager/os2/xpcom.jst +++ b/mozilla/xpinstall/packager/os2/xpcom.jst @@ -1,47 +1,53 @@ function upgradeCleanup() { - // Obsolete files from Netscape 6.0 and Netscape 6.01 that + // Obsolete files and generated files that // need to be cleaned up. deleteThisFile("Program", "component.reg"); - deleteThisFile("Program", "libjsdom.so"); - deleteThisFile("Program", "libz.so"); deleteThisFile("Components", "xpti.dat"); deleteThisFile("Components", "xptitemp.dat"); } -var srDest = $SpaceRequired$; +// main +var srDest; +var err; +var fProgram; -var err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$"); +srDest = $SpaceRequired$:bin; +err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$"); logComment("initInstall: " + err); -var communicatorFolder = getFolder("Program"); -logComment("communicatorFolder: " + communicatorFolder); +fProgram = getFolder("Program"); +logComment("fProgram: " + fProgram); -if (verifyDiskSpace(communicatorFolder, srDest)) +// Log component.reg file so it can be deleted by the uninstaller. +// These two files are created after installation is done, thus +// are normally not logged for uninstall. +logComment("Installing: " + fProgram + "component.reg"); + +if(verifyDiskSpace(fProgram, srDest)) { - // Call upgradeCleanup() before addDirectory() in case we accidentaly - // delete files that we happen to be also installing. This way, if we do, - // it will just get reinstalled. This is for safety measure. - upgradeCleanup(); - err = addDirectory("Program", - "$Version$", - "bin", // jar source folder - communicatorFolder, // target folder - "", // target subdir - true ); // force flag + setPackageFolder(fProgram); - logComment("addDirectory() returned: " + err); + upgradeCleanup(); + err = addDirectory("", + "$Version$", + "bin", // dir name in jar to extract + fProgram, // Where to put this file (Returned from GetFolder) + "", // subdir name to create relative to fProgram + true); // Force Flag + logComment("addDirectory() of Program returned: " + err); - if (err==SUCCESS) - { - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall() returned: " + err); - } + if( err == SUCCESS ) + { + err = performInstall(); + logComment("performInstall() returned: " + err); + } + else + cancelInstall(err); } else - cancelInstall(INSUFFICIENT_DISK_SPACE); + cancelInstall(INSUFFICIENT_DISK_SPACE); + + +// end main +