diff --git a/mozilla/browser/branding/unofficial/Makefile.in b/mozilla/browser/branding/unofficial/Makefile.in index cb2c3122d71..f80437bc2b2 100644 --- a/mozilla/browser/branding/unofficial/Makefile.in +++ b/mozilla/browser/branding/unofficial/Makefile.in @@ -47,8 +47,6 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) endif ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico - cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp - cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp diff --git a/mozilla/browser/installer/windows/7zip.bat b/mozilla/browser/installer/windows/7zip.bat deleted file mode 100755 index 8d53f632529..00000000000 --- a/mozilla/browser/installer/windows/7zip.bat +++ /dev/null @@ -1,6 +0,0 @@ -cd 7zstage -7z a -t7z ..\7z\app.7z *.* -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 -cd ..\7z -upx --best 7zSD.sfx -copy /b 7zSD.sfx+app.tag+app.7z SetupGeneric.exe -cd .. diff --git a/mozilla/browser/installer/windows/Header.bmp b/mozilla/browser/installer/windows/Header.bmp deleted file mode 100644 index 75559d1b4bd..00000000000 Binary files a/mozilla/browser/installer/windows/Header.bmp and /dev/null differ diff --git a/mozilla/browser/installer/windows/Makefile.in b/mozilla/browser/installer/windows/Makefile.in index 7f1a9e7f4e4..1860567eb74 100644 --- a/mozilla/browser/installer/windows/Makefile.in +++ b/mozilla/browser/installer/windows/Makefile.in @@ -121,8 +121,6 @@ include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk export:: ifndef MOZ_BRANDING_DIRECTORY $(NSINSTALL) -D $(DIST)/branding - cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp - cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp diff --git a/mozilla/browser/installer/windows/Watermrk.bmp b/mozilla/browser/installer/windows/Watermrk.bmp deleted file mode 100644 index 3cf524f16d3..00000000000 Binary files a/mozilla/browser/installer/windows/Watermrk.bmp and /dev/null differ diff --git a/mozilla/browser/installer/windows/ab-CD.jst b/mozilla/browser/installer/windows/ab-CD.jst deleted file mode 100644 index e42f240d087..00000000000 --- a/mozilla/browser/installer/windows/ab-CD.jst +++ /dev/null @@ -1,433 +0,0 @@ -#filter substitution -// main -var srDest; -var err; -var fProgram; -var platformNode; -var searchPlugins = "searchplugins"; -var restrictedAccess; - -function registerProgramFolderKey(winreg, fFolderPath) -{ - var subkey; - var err; - var szCurrentMozillaVersion; - - /* set the Program Folder Path in the Mozilla key in the Windows Registry */ - winreg.createKey("SOFTWARE\\$CompanyName$",""); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "CurrentVersion", "$UserAgent$"); - - subkey = "SOFTWARE\\$CompanyName$\\Mozilla"; - szCurrentMozillaVersion = winreg.getValueString(subkey, "CurrentVersion"); - logComment("szCurrentMozillaVersion: " + szCurrentMozillaVersion); - - if((szCurrentMozillaVersion == "") || (szCurrentMozillaVersion == null)) - { - // A Mozilla\CurrentVersion key must be set so that Java can work. - // (bug 229627) - subkey = "SOFTWARE\\$CompanyName$\\Mozilla"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "CurrentVersion", "$GreVersion$"); - } - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$"; - winreg.createKey(subkey,""); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath); -} - -function createShortcuts() -{ - var subkey; - var valname; - var szStartMenuPrograms; - var szStartMenu; - var szFolderDesktop; - var szFolderQuickLaunch; - var szFolderAppData; - var winreg; - var fTemp; - var fProgram; - var fDefShortcuts; - var fileExe; - var scExeDesc; - var scFolderName; - var fFolderDesktop; - var fFolderPrograms; - var fFolderProgramsStr; - var fFolderQuickLaunch; - var is_winnt; - var szCurrentVersion; - var folderQuickLaunchExists; - - winreg = getWinRegistry(); - fProgram = getFolder("Program"); - fDefShortcuts = getFolder("Program","defaults/shortcuts"); - fTemp = fProgram + "$MainExeFile$"; - fileExe = getFolder("file:///", fTemp); - scExeDesc = "$ProductName$"; - scFolderName = "$ProductName$"; - scSafeModeDesc = "$ProductName$ (Safe Mode)"; - scSafeModeParam = "-safe-mode"; - - if (winreg) { - // determine if the script is running under NT or not - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - subkey = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"; - szCurrentVersion = winreg.getValueString(subkey, "CurrentVersion"); - logComment("szCurrentVersion: " + szCurrentVersion); - is_winnt = szCurrentVersion != ""; - logComment("is_winnt value: " + is_winnt); - - // Locate the various folders we're about to install shortcuts into. - if(!is_winnt || restrictedAccess) { - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; - szStartMenuPrograms = winreg.getValueString(subkey, "Programs"); - szStartMenu = winreg.getValueString(subkey, "Start Menu"); - szFolderDesktop = winreg.getValueString(subkey, "Desktop"); - } - else { - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; - szStartMenuPrograms = winreg.getValueString(subkey, "Common Programs"); - szStartMenu = winreg.getValueString(subkey, "Common Start Menu"); - szFolderDesktop = winreg.getValueString(subkey, "Common Desktop"); - } - - // Locate the Start Menu Programs Folder - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main"; - fFolderProgramsStr = winreg.getValueString(subkey, "Program Folder Path"); - fFolderPrograms = getFolder("file:///", fFolderProgramsStr || szStartMenuPrograms); - - // Locate the Desktop Folder - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - fFolderDesktop = getFolder("file:///", szFolderDesktop); - - // Locate the Quick Launch folder - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; - szFolderAppData = winreg.getValueString(subkey, "AppData"); - szFolderQuickLaunch = szFolderAppData + "\\Microsoft\\Internet Explorer\\Quick Launch"; - fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch); - folderQuickLaunchExists = File.isDirectory(fFolderQuickLaunch); - if(!folderQuickLaunchExists) { - subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups"; - szFolderQuickLaunch = winreg.getValueString(subkey, "Quick Launch"); - folderQuickLaunchExists = File.isDirectory(fFolderPrograms); - if(folderQuickLaunchExists) - fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch); - } - logComment("folderQuickLaunchExists: " + folderQuickLaunchExists); - - logComment("Folder StartMenuPrograms: " + szStartMenuPrograms); - logComment("Folder StartMenu : " + szStartMenu); - logComment("Folder FolderDesktop : " + szFolderDesktop); - logComment("Folder FolderQuickLaunch: " + szFolderQuickLaunch); - logComment("fileExe : " + fileExe); - logComment("fFolderPrograms : " + fFolderPrograms); - logComment("scExeDesc : " + scExeDesc); - logComment("fProgram : " + fProgram); - - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main"; - - // Explicitly create the fFolderPrograms even though the windowsShortcut - // function creates the folder. This is so that the folder creation gets - // logged for uninstall to remove it. - - // Only create the Start Menu folder if the user selected start menu icons - if (winreg.getValueNumber(subkey, "Create Start Menu Shortcut") != 0 && !File.exists(fFolderPrograms)) - File.dirCreate(fFolderPrograms); - - // Always create default shortcuts folder - if (!File.exists(fDefShortcuts)) - File.dirCreate(fDefShortcuts); - - // Create the Shortcuts - if (winreg.getValueNumber(subkey, "Create Desktop Shortcut") != 0) - File.windowsShortcut(fileExe, fFolderDesktop, scExeDesc, fProgram, "", fileExe, 0); - if (winreg.getValueNumber(subkey, "Create Start Menu Shortcut") != 0) { - File.windowsShortcut(fileExe, fFolderPrograms, scExeDesc, fProgram, "", fileExe, 0); - File.windowsShortcut(fileExe, fFolderPrograms, scSafeModeDesc, fProgram, scSafeModeParam, fileExe, 0); - } - if (winreg.getValueNumber(subkey, "Create Quick Launch Shortcut") != 0 && folderQuickLaunchExists) - File.windowsShortcut(fileExe, fFolderQuickLaunch, scExeDesc, fProgram, "", fileExe, 0); - // Always create the default shortcuts. - File.windowsShortcut(fileExe, fDefShortcuts, scExeDesc, fProgram, "", fileExe, 0); - File.windowsShortcut(fileExe, fDefShortcuts, scSafeModeDesc, fProgram, scSafeModeParam, fileExe, 0); - - if(!restrictedAccess) { - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - registerProgramFolderKey(winreg, fFolderPrograms); - - // This is so that Windows Media Player works with us - var subkey = "SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\$MainExeFile$"; - winreg.createKey(subkey, ""); - } - - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - registerProgramFolderKey(winreg, fFolderPrograms); - } - else - logComment("winreg is null"); -} - -function IsWinnt() -{ - /* Determines if the script is running under NT or not. - * - */ - var winreg = getWinRegistry(); - var subkey; - var szCurrentVersion; - - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - subkey = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"; - szCurrentVersion = winreg.getValueString(subkey, "CurrentVersion"); - logComment("szCurrentVersion: " + szCurrentVersion); - - return szCurrentVersion != ""; -} - -function registerMainKeys(winreg) -{ - var subkey; //the name of the subkey you are poking around in - var data; - var err; - - winreg.createKey("SOFTWARE\\$CompanyName$",""); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "CurrentVersion", "$UserAgent$"); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$"; - winreg.createKey(subkey,""); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main"; - winreg.createKey(subkey,""); - - err = winreg.setValueString(subkey, "Install Directory", fProgram); - - // The following keys are required to be created to supply information - // about the location of the Gecko Embedded Client to 3rd party apps. - // "SOFTWARE\\Mozilla" must not be localized! - subkey = "SOFTWARE\\Mozilla\\$ProductName$ $UserAgentShort$"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "GeckoVer", "$GreVersion$"); - - subkey = "SOFTWARE\\Mozilla\\$ProductName$ $UserAgentShort$\\Extensions"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "Components", fProgram + "Components"); - err = winreg.setValueString(subkey, "Plugins", fProgram + "Plugins"); - - subkey = "SOFTWARE\\Mozilla\\$ProductName$ $UserAgentShort$\\bin"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "PathToExe", fProgram + "$MainExeFile$"); - - subkey = "SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main"; - err = winreg.setValueString(subkey, "PathToExe", fProgram + "$MainExeFile$"); - - // Register as a windows XP internet browser - if( IsWinnt() ) - { - subkey = "Software\\Clients\\StartMenuInternet\\$MainExeFile$"; - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - - winreg.createKey(subkey, ""); - winreg.createKey(subkey + "\\DefaultIcon", ""); - winreg.createKey(subkey + "\\shell", ""); - winreg.createKey(subkey + "\\shell\\open", ""); - winreg.createKey(subkey + "\\shell\\open\\command", ""); - winreg.createKey(subkey + "\\InstallInfo", ""); - winreg.setValueString(subkey, "", "$ProductNameInternal$"); - - // path does not need to be quoted per MS doc - data = fProgram + "$MainExeFile$,0"; - winreg.setValueString(subkey + "\\DefaultIcon", "", data); - - data = "\"" + fProgram + "$MainExeFile$\""; - winreg.setValueString(subkey + "\\shell\\open\\command", "", data); - - data = "\"" + fProgram + "uninstall\\uninstall.exe\" /ua \"$UserAgent$\" /hs browser"; - winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data); - - winreg.setValueNumber(subkey + "\\InstallInfo", "IconsVisible", 1); - - data = "\"" + fProgram + "$MainExeFile$\" -silent -nosplash -setDefaultBrowser "; - winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data); - - data = "\"" + fProgram + "uninstall\\uninstall.exe\" /ua \"$UserAgent$\" /ss browser"; - winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data); - } -} - -function updateWinReg() -{ - //Notes: - // can't use a double backslash before subkey - Windows already puts it in. - // subkeys have to exist before values can be put in. - var winreg = getWinRegistry(); - var subkey; //the name of the subkey you are poking around in - var err; - var ikwDefined; - - if(winreg != null) - { - /* This will check to see if the user has restricted access or not. - * It checks to see if HKEY_LOCALMACHINE\SOFTWARE is writable. If - * it is, then access is not restricted. This is only used to - * determine which Desktop, Programs, and Start Menu folders - * are to used: common or per user - */ - restrictedAccess = false; - ikwDefined = typeof(winreg.isKeyWritable); - logComment("winreg.isKeyWritable(): " + ikwDefined); - if(ikwDefined == "function") - { - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - if(!winreg.isKeyWritable("SOFTWARE")) - restrictedAccess = true; - } - - logComment("restrictedAccess value: " + restrictedAccess); - if(!restrictedAccess) - { - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - registerMainKeys(winreg); - - // set the App Paths key here - subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$MainExeFile$"; - winreg.createKey(subkey,""); - err = winreg.setValueString(subkey, "", fProgram + "$MainExeFile$"); - err = winreg.setValueString(subkey, "Path", fProgram); - - // XPInstall content type mappings. - subkey = "SOFTWARE\\Classes\\MIME\\Database\\Content Type\\application/x-xpinstall;app=firefox" - winreg.createKey(subkey, ""); - winreg.setValueString(subkey, "Extension", ".xpi"); - } - - winreg.setRootKey(winreg.HKEY_CURRENT_USER); - registerMainKeys(winreg); - } - - // Now clean up Uninstall entries that may be laying around in the - // registry for older versions of the software that we're overwriting/ - // upgrading... - var wr = getWinRegistry(); - wr.setRootKey(wr.HKEY_LOCAL_MACHINE); - var i = 0; - const uninstallKey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; - do { - var key = wr.enumKeys(uninstallKey, i++); - if (!key) - break; - key = uninstallKey + "\\" + key; - - // For us to remove the entry from the ARP uninstall list, the install - // folder paths must *match* and the display version strings must *NOT - // MATCH* - i.e. we don't want to remove the entry we just created for - // this version. - var itemInstallFolder = wr.getValueString(key, "InstallLocation"); - var thisInstallFolder = wr.getValueString("SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main", - "Install Directory"); - var itemInstallFolderShortName = File.windowsGetShortName(getFolder("file:///", itemInstallFolder)); - var thisInstallFolderShortName = File.windowsGetShortName(getFolder("file:///", thisInstallFolder)); - - var itemDisplayVersion = wr.getValueString(key, "DisplayVersion"); - var thisDisplayVersion = "$UserAgent$"; - - // It is possible that a user might have installed several products into - // the same directory that have the same "DisplayVersion" (e.g. "1.0")... - // in this case we don't want to trash the Uninstall info for the others - // so we have to be sure to make sure Comment matches... we use Comment - // instead of DisplayName since DisplayName varies from version to version - // as it contains the version number, and this instance of javascript is - // crippled so as not to contain any useful string parsing. - var itemComment = wr.getValueString(key, "Comment"); - var thisComment = "$ProductName$"; - - if ((itemComment == thisComment || itemComment == "The Browser, Reloaded.") && - itemInstallFolderShortName == thisInstallFolderShortName && - thisDisplayVersion != itemDisplayVersion && - wr.isKeyWritable(key)) { - wr.deleteKey(key); - logComment("Removing obsolete uninstall key with upgrade: " + key); - } - } - while (true); -} - -logComment("initInstall: platformNode=" + platformNode); -// end -// end - OS type detection - -var chromeNode = "@AB_CD@"; - -var regName = "locales/mozilla/" + chromeNode; -var chromeName = chromeNode + ".jar"; -var localeName = "locale/" + chromeNode + "/"; - -srDest = $SpaceRequired$:bin; -err = initInstall("@AB_CD@ Langpack", "@AB_CD@", "$Version$"); -logComment("initInstall: " + err); - -fProgram = getFolder("Program"); -logComment("fProgram: " + fProgram); - -if(verifyDiskSpace(fProgram, srDest)) -{ - var chromeType = LOCALE; - var fTarget; - - err = addDirectory("", - "bin", // dir name in jar to extract - fProgram, // Where to put this file (Returned from GetFolder) - ""); // Force Flag - logComment("addDirectory() returned: " + err); - - setPackageFolder(fProgram); - - // check return value - if (err == SUCCESS) - { - fTarget = getFolder("Program", "defaults"); - logComment("fTarget: " + fTarget); - err = addDirectory("", - "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); - - 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); - - updateWinReg(); - createShortcuts(); - - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - { - cancelInstall(err); - logComment("cancelInstall due to error: " + err); - } -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); - -// end main diff --git a/mozilla/browser/installer/windows/abe.jst b/mozilla/browser/installer/windows/abe.jst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mozilla/browser/installer/windows/adt.jst b/mozilla/browser/installer/windows/adt.jst deleted file mode 100644 index 988eef26068..00000000000 --- a/mozilla/browser/installer/windows/adt.jst +++ /dev/null @@ -1,14 +0,0 @@ -var err = initInstall("Developer Tools", "Developer Tools", "$Version$"); -logComment("initInstall: " + err); - -// DOM Inspector -var fProgram = getFolder("Program"); -logComment("fProgram: " + fProgram); - -err = addDirectory("", "$Version$", "bin", fProgram, "", true); -logComment("addDirectory: " + err); - -if (err==SUCCESS) - performInstall(); -else - cancelInstall(err); diff --git a/mozilla/browser/installer/windows/browser.jst b/mozilla/browser/installer/windows/browser.jst deleted file mode 100644 index f9606391777..00000000000 --- a/mozilla/browser/installer/windows/browser.jst +++ /dev/null @@ -1,174 +0,0 @@ -function copyFlashXPT() -{ - /* - * Check if Netscape Navigator (pre 6.0) is installed and if the - * flash player is installed in Netscape's plugin folder. If it is, - * try to copy the flashplayer.xpt file into our plugins folder to - * make ensure that flash is scriptable if we're using it from - * Netscape's plugins folder. - */ - - var winreg = getWinRegistry(); - - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - var subkey = "Software\\Netscape\\Netscape Navigator"; - var nsver = winreg.getValueString(subkey, "CurrentVersion"); - - if (!nsver) - return; - - subkey += "\\" + nsver + "\\Main"; - - var navPluginsDir = winreg.getValueString(subkey, "Plugins Directory"); - - if (!navPluginsDir) - return; - - var navFlashXPT = getFolder("file:///", navPluginsDir + "\\flashplayer.xpt"); - - if (!File.exists(navFlashXPT)) - return; - - var target = getFolder("file:///", fProgram + "\\plugins\\flashplayer.xpt"); - - // Copy the file flashplayer.xpt from Netscape's plugin directory to - // Firefox's plugin directory. - File.copy(navFlashXPT, target); - - logComment("Copied Flash xpt file from '" + navFlashXPT + "' to '" + target + - "'"); -} - -function copyQuickTimeXPT() -{ - /* - * Check if QuickTime is installed and copy - * nsIQTScriptablePlugin.xpt from its plugins directory into our - * plugins directory. If we don't do this, QuickTime will load in - * Firefox, but it won't be scriptable. - */ - - var winreg = getWinRegistry(); - - winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE); - var subkey = "Software\\Apple Computer, Inc.\\QuickTime"; - var qtdir = winreg.getValueString(subkey, "InstallDir"); - - if (!qtdir) - return; - - var qtXPT = getFolder("file:///", - qtdir + "\\Plugins\\nsIQTScriptablePlugin.xpt"); - - if (!File.exists(qtXPT)) - return; - - var target = getFolder("file:///", - fProgram + "\\plugins\\nsIQTScriptablePlugin.xpt"); - - // Copy the file nsIQTScriptablePlugin.xpt from the QuickTime - // installation directory to Firefox's plugin directory. - File.copy(qtXPT, target); - - logComment("Copied QuickTime xpt file from '" + qtXPT + "' to '" + target + - "'"); -} - -// main -var srDest; -var err; -var err2; -var fProgram; -var fWindowsSystem; -var fileComponentRegStr; -var fileComponentReg; -var fileToRegister; -var args; - -args = new String(Install.arguments); -logComment("args: " + args); - -srDest = $SpaceRequired$:bin; -err = initInstall("$ProductName$", "Firefox", "$Version$"); -logComment("initInstall: " + err); - -fProgram = getFolder("Program"); -fWindowsSystem = getFolder("Win System"); -logComment("fProgram: " + fProgram); - -if(verifyDiskSpace(fProgram, srDest)) -{ - setPackageFolder(fProgram); - - removeOldFiles(); - 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); - - // check return value - if( err == SUCCESS ) - { - fileToRegister = getFolder(fProgram, "AccessibleMarshal.dll"); - err2 = File.windowsRegisterServer(fileToRegister); - logComment("windowsRegisterServer() returned: " + err2); - - // we don't want to fail on errors for the above two - resetError(); - - // Create the uninstall folder. - err = File.dirCreate(getFolder("Program", "uninstall")); - logComment("dirCreate() of Program/uninstall returned: " + err); - - copyFlashXPT(); - copyQuickTimeXPT(); - - /* Log files that are created after the installer is done, so they can be uninstalled */ - logComment("Installing: " + fProgram + ".autoreg"); - 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("Installing: " + fProgram + "components\\compreg.dat"); - logComment("Create Folder: " + fProgram + "components\\Netscape"); - logComment("Create Folder: " + fProgram + "components\\Netscape\\MozillaTrunk"); - logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\manifest.ini"); - logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\permdata.box"); - logComment("Installing: " + fProgram + "components\\Netscape\\MozillaTrunk\\Talkback.ini"); - logComment("Create Folder: " + fProgram + "chrome"); - logComment("Create Folder: " + fProgram + "uninstall"); - logComment("Installing: " + fProgram + "active-update.xml"); - logComment("Installing: " + fProgram + "updates.xml"); - logComment("Installing: " + fProgram + "last-update.log"); - logComment("Create Folder: " + fProgram + "updates"); - - 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(fProgram, "xpicleanup.exe"); - err = File.execute(cleanupUtility); - logComment("execute() returned: " + err); - err = performInstall(); - } - } - else - cancelInstall(err); - } - else - cancelInstall(err); -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); - - -// end main diff --git a/mozilla/browser/installer/windows/chatzilla.jst b/mozilla/browser/installer/windows/chatzilla.jst deleted file mode 100644 index 3252498a3ee..00000000000 --- a/mozilla/browser/installer/windows/chatzilla.jst +++ /dev/null @@ -1,28 +0,0 @@ -var err = initInstall("Chatzilla v0.5", "Chatzilla", "$Version$"); -logComment("initInstall: " + err); - -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 - -addDirectory("Chatzilla Icons", - "bin/chrome/icons", // jar source folder - getFolder("Chrome", "icons"), // 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/"); - -err = getLastError(); -if (err==SUCCESS) - performInstall(); -else - cancelInstall(err); - diff --git a/mozilla/browser/installer/windows/config.it b/mozilla/browser/installer/windows/config.it deleted file mode 100644 index 9db6b7d84d2..00000000000 --- a/mozilla/browser/installer/windows/config.it +++ /dev/null @@ -1,1079 +0,0 @@ -[General] -; Run Mode values: -; Normal - Shows all dialogs. Requires user input. -; Auto - Shows some dialogs, but none requiring user input. It will -; automatically install the product using default values. -; Silent - Show no dialogs at all. It will install product using default -; values. -Run Mode=Normal - -Company Name=$CompanyName$ -Product Name=$ProductName$ -Product NameInternal=$ProductName$ -User Agent=$UserAgent$ - -; Destination Path values: -; PROGRAMFILESDIR -; WINDISK -; WINDIR -; WINSYSDIR -Path=[PROGRAMFILESDIR]\$ProductName$ - -; Sub Path, when set will indicate to Setup to create a subfolder from -; what is offered to the user to change. It will not be shown to the user -; but simply created: -; -; ie: shown to user : [Path] -; actually created: [Path]\[Sub Path] -; (where [Path] is the Path= key above) -Sub Path= - -; Controls the Browse button that allows the user to -; change the destination path of the product. -; Default value is FALSE; -Lock Path=FALSE - -Program Name=$MainExeFile$ - -; Program Folder Path values: -; 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 -; -; PROGRAMS (Default value is the same as COMMON_PROGRAMS, but if the user -; has restricted access to the system, then it's the same as -; PERSONAL_PROGRAMS) -; -; PROGRAMFILESDIR -; COMMONFILESDIR -; MEDIAPATH -; CONFIGPATH (supported only under Windows95 and Windows98) -; DEVICEPATH -Program Folder Name=$ProductName$ -Program Folder Path=[PROGRAMS] - -; This key is used as a fail over key. This url will be used when the -; url in the Site Selector fails. -url=$ArchiveUrl$ - -; Default Setup Type values: -; Setup Type 0 - first radio button (easy install) -; Setup Type 1 - second radio button (custom) -Default Setup Type=Setup Type 0 - -; Forces the icons on the system to be refreshed. -; Default value is FALSE. -; Possible values: -; FALSE -; TRUE -Refresh Icons=FALSE - -; Setting to control whether or not GRE should be installed to app's dir -; to be used as a private/local GRE. -; -; Possible values (default is 'Shared'): -; Local -; Shared -; -; If this key is set to 'Local', make -; sure to provide a GRE Private Key= below! -GRE Type=Shared -GRE ID=$GreUniqueID$ - -; Private key that overrides the default shared key -; (HKEY_LOCAL_MACHINE\Software\mozilla.org\GRE) set by GRE's installer. -; This key will be created under HKEY_LOCAL_MACHINE and should be -; declared in the following format: -; -; Software\[company name]\[product name] -; (ie: Software\mozilla.org\GRE_1.4a_0000000000_PRIVATE) -; -; If it is not in the above format, the GRE installer/uninstaller can -; fail to work properly. -; The value to Prodduct Name Internal= (at the beginning of this -; config.ini file) will be appended as follows: -; -; Software\mozilla.org\GRE_1.4a_0000000000_PRIVATE_[Product Name Internal] -GRE Private Key=Software\mozilla.org\GRE_$GreUniqueID$_PRIVATE_$ProductNameInternal$ - -; Controls the display of the banner image in the download and install progress dialogs. -; Default value is TRUE. -Show Banner Image=TRUE - -; Controls the check to see if user is installing on top of a previous -; installation of the product. If so, then prompt the user that cleanup -; of destination folder is highly recommended, or instability of product -; can occurr. -[Cleanup On Upgrade] -Cleanup=TRUE -ObjectToIgnore0=plugins -ObjectToIgnore1=uninstall -ObjectToIgnore2=install_status.log - -; List of files/dirs that is used to determine if a directory is a profile -; or not. This is so the directory is not deleted as part of the Cleanup -; On Upgrade. -; All of the object files must be found in order for a dir to be assumed -; to be a Profile dir. -[Profile Dir Object List] -Object0=chrome -Object1=bookmarks.html -Object2=localstore.rdf - -; This section contains info on how to send error information in case of -; either a download or xpinstall error. -; By default, this feature is enabled, unless disabled. -[Message Stream] -; Values: -; Enabled -; Disabled -; default is Enabled. -Status=Disabled - -; URL to cgi script to send error information to. The information will -; be appended to the url in the form of parameters to the cgi script. -url=http://orb.mcom.com/install/error.cgi - -; Indicates whether to show a confirmation dialog or not. If this -; dialog is not shown, the error information will be *automatically* -; sent without any indication to the user unless the Status= is set -; to Disabled. -; -; Default value is TRUE if nothing is set. -Show Confirmation=TRUE -Confirmation Message=There was an error encountered during installation of $ProductShortName$. The following information will be sent back to us to help us improve the product: %s - - - -; HKey: valid decryptable setup key is [Product CurrentVersion] or [Product PreviousVersion] -; Decrypt HKey: there are times when '[' and ']' are valid part of windows registry key names. -; Contains Filename: tells setup that the path contains filename needed to be removed before -; using it as a path. -; Verify Existence: FILE or PATH -; -[Locate Previous Product Path0] -HRoot=HKEY_LOCAL_MACHINE -HKey=[Product CurrentVersion]\Main -Name=Install Directory -Decrypt HKey=TRUE -Contains Filename=FALSE -Verify Existence= - -[Dialog Welcome] -Show Dialog=TRUE -Title={SETUP_TITLE} -MessageWelcome={SETUP_WELCOME} -Message0={SETUP_MESSAGE0} -Message1={SETUP_MESSAGE1} -Message2={SETUP_MESSAGE2} -Message3={SETUP_MESSAGE3} - -[Dialog License] -Show Dialog=TRUE -Title={LICENSE_TITLE} -Sub Title={LICENSE_SUBTITLE} -License File=license.txt -Message0={LICENSE_MESSAGE0} -RadioAccept={LICENSE_ACCEPT} -RadioDecline={LICENSE_DECLINE} - -[Dialog Setup Type] -Show Dialog=TRUE -Title={SETUP_TYPE_TITLE} -Sub Title={SETUP_TYPE_SUBTITLE} -Message0={SETUP_TYPE_MESSAGE0} - -; at least one Setup Type needs to be set, and up to 4 can be -; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3). -[Setup Type0] -Description Short={TYPE_STANDARD} -Description Long={TYPE_STANDARD_DESC} - -; List of components to install/enable for this Setup Type. -; All other components not listed here will be disabled if -; this Setup Type is selected. -C0=Component XPCOM -C1=Component Browser -C2=Component Langpack -; Make sure Component QFA is LAST so 3rd party developers who might not want -; this component can easily remove it. -C3=Component QFA - -[Setup Type1] -Description Short={TYPE_CUSTOM} -Description Long={TYPE_CUSTOM_DESC} - -; List of components to install/enable for this Setup Type. -; All other components not listed here will be disabled if -; this Setup Type is selected. -C0=Component XPCOM -C1=Component Browser -C2=Component ADT -C3=Component Langpack -; Make sure Component QFA is LAST so 3rd party developers who might not want -; this component can easily remove it. -C4=Component QFA - -[Dialog Select Components] -Show Dialog=TRUE -Title={SELECT_TITLE} -Sub Title={SELECT_SUBTITLE} -Message0={SELECT_MESSAGE0} - -[Dialog Select Install Path] -Show Dialog=TRUE -Title={LOCATION_TITLE} -Sub Title={LOCATION_SUBTITLE} -Message0={LOCATION_MESSAGE0} - -[Dialog Upgrade] -Show Dialog=FALSE -Show In Easy Install=FALSE -Title={UPGRADE_TITLE} -Sub Title={UPGRADE_SUBTITLE} -Message Cleanup={UPGRADE_CLEANUP} -; XXXben - we need a strategy for uninstallation that obviates the need for "Safe Upgrade" which can doing nasty things if you have installed the app into a stupid location. - -Checkbox Clean Install={UPGRADE_CLEAN} -Message Clean Install={UPGRADE_CLEAN_MSG} -Message Install Over={UPGRADE_OVER} -Message Install Over Windir={UPGRADE_OVER_WINDIR} - -;Checkbox Clean Install=Perform a Safe Upgrade -;Message Clean Install=A Safe Upgrade will completely remove the old installation. Any third party components you have installed will be lost. This is recommended as it may prevent incompatibilities. -;Message Install Over=If you choose not to perform a Safe Upgrade, third party components will not be removed, which may cause unpredictable behavior. - -[Dialog Select Additional Components] -Show Dialog=FALSE -Title={ADD_TITLE} -Message0={ADD_MESSAGE0} - -[Dialog Windows Integration] -; Note - this dialog isn't actually used yet! -Show Dialog=TRUE -Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main -Title={WININT_TITLE} -Sub Title={WININT_SUBTITLE} -Message0={WININT_MESSAGE0} - - -; Only a maximum of 3 "Windows Integration-Item"s are allowed. Each Item -; shows up as a checkbox in the Windows Integration dialog. -[Windows Integration-Item0] -CheckBoxState=TRUE -Description={WININT_DESKTOP} -Archive= - -[Windows Integration-Item1] -CheckBoxState=TRUE -Description={WININT_START} -Archive= - -[Windows Integration-Item2] -CheckBoxState=TRUE -Description={WININT_QUICKL} -Archive= - -[Dialog Program Folder] -Show Dialog=TRUE -Title={WININT_PFOLDER_TITLE} -Message0={WININT_PFOLDER_MESSAGE0} - -[Dialog Additional Options] -Show Dialog=TRUE -Title={ADDL_OPTIONS_TITLE} -Message1={ADDL_OPTIONS_MSG1} -Save Installer= - -[Dialog Advanced Settings] -Show Dialog=TRUE -Title={ADV_SETTINGS_TITLE} -Message0={ADV_SETTINGS_MSG} -Proxy Server= -Proxy Port= -Proxy User= -Proxy Password= -; Use Protocol accepts only two options: -; FTP -; HTTP -; Default is FTP if key is not set. -Use Protocol=HTTP -; Use Protocol Settings key shows or hides the -; Use FTP/Use HTTP radio buttons in the Download Dialog. -; Default value is ENABLED unless DISABLED is specified. -Use Protocol Settings=ENABLED -; Controls the radio buttons visibility -; Default value is TRUE -Show Protocols=TRUE - -[Dialog Quick Launch] -Show Dialog=TRUE -Title=$ProductShortName$ Setup - Quick Launch -Message0=Quick Launch starts Mozilla faster by keeping portions of the program in computer memory. -Message1=You can access Quick Launch through the icon on the Windows taskbar tray. -Message2=Check the box below to activate Quick Launch when you restart your computer. -; Turbo Mode (Quick Launch) values: TRUE, FALSE -; Defaults to FALSE if not set -Turbo Mode=FALSE -; Turbo Mode Settings value: TRUE, FALSE -; Defaults to FALSE if not set. -; This will hide the turbo mode checkbox in the Start Install dialog -; and ignore the Turbo Mode= key, thus disabling it. -Turbo Mode Enabled=TRUE - -[Dialog Start Install] -Show Dialog=TRUE -Title={START_TITLE} -Sub Title={START_SUBTITLE} -Message Install={START_INSTALL} -Message Download={START_DOWNLOAD} -Message0={START_MESSAGE0} - -[Dialog Downloading] -Show Dialog=TRUE -Title={DL_TITLE} -Sub Title={DL_SUBTITLE} -Blurb={DL_BLURB} -File Name={DL_FILENAME} -Time Remaining={DL_TIMELEFT} - -[Dialog Installing] -Show Dialog=TRUE -Title={INSTALL_TITLE} -Sub Title={INSTALL_SUBTITLE} -Blurb={INSTALL_BLURB} -Status File={INSTALL_STATUSFILE} -Status Component={INSTALL_STATUSCOMP} - -[Dialog Install Successful] -Show Dialog=TRUE -Title={COMPLETE_TITLE} -MessageHeader={COMPLETE_TITLE} -Message0={COMPLETE_MESSAGE0} -Message1={COMPLETE_MESSAGE1} -Launch App={COMPLETE_LAUNCH} -Launch App Checked=TRUE -Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$ - -[Dialog Download] -Show Dialog=TRUE -Title={DL2_TITLE} -Message Download0={DL2_MESSAGE0} -Message Retry0={DL2_RETRY} - -[Dialog Reboot] -; Show Dialog values are: -; TRUE - Always show -; FALSE - Don't show unless at least one component has its reboot show value set -; to TRUE. This will not show even if some files were in use and a reboot -; is necessary. -; AUTO - Don't show unless a component has its reboot show value set to -; TRUE or there was at least one file in use and a reboot is -; is required for the file to be replaced correctly. -Show Dialog=AUTO - -[Check Instance0] -Class Name=FirefoxMessageWindow -Window Name= -Process Name=$MainExeFile$ -Pretty Name=$ProductNameInternal$ -Message={CLOSE_CHECK} -Message Full Installer={CLOSE_CHECK2} -Message wait={CLOSE_WAIT} - -; This key indicates whether or not to close all the windows associated with -; the process id of this app instance window found. -Close All Process Windows=TRUE - -; These keys are not normally necessary for checking instances. They are -; set here because Mozilla requires a way to shut down its turbo mode. -Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE -Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\$MainExeFile$ -Extra Cmd0 Reg Name= -Extra Cmd0 Parameter=-kill - -;DependeeX=Component A means -; - if Component A gets checked this component gets checked -; - if Component A gets unchecked this component gets unchecked -; - if this component is visible it can still be checked/unchecked -; independantly after Component A has changed its state. I.e -; this components checkbox will not be disabled or hidden. -;Dependee0= -; -;DependencyX= is not supported at this time. -;Dependency0= -; -; Attributes can be the following values: -; -; The following Attributes can be overridden: -; ------------------------------------------ -; -; SELECTED - Component is selected to be installed by default. -; -; UNSELECTED - Component is to be displayed unselected in the Options -; dialog. If the component is listed in the non-custom -; Setup Type section, it will be assumed to be selected -; by default. -; -; ADDITIONAL - Component is to be shown in the Additional Options -; dialog (2nd Options dialog) instead of the 1st Options -; dialog. -; -; NOTADDITIONAL - Component will be shown (if visible) in the 1st -; 1st Options dialog rather than the Additional Options -; dialog (default). -; -; VISIBLE - Component is shown in one of the two Options dialogs -; (default). -; -; INVISIBLE - Component is not shown in either of the two Options dialogs. -; -; ENABLED - Component is to be shown as enabled (not greyed out) in -; either of the two Options dialogs. -; (default). -; -; DISABLED - Component is to be shown as disabled (greyed out) in -; either of two Options dialog. -; -; -; The following attributes cannot be overridden: -; --------------------------------------------- -; -; LAUNCHAPP - Component is downloaded and simply run (like a .exe file) -; after all the components have been downloaded and -; xpinstall'ed. -; -; DOWNLOAD_ONLY - Component is to be only downloaded to the ns_temp folder, -; then deleted as Setup is quitting. -; -; FORCE_UPGRADE - Force Upgrade checks for a particular file or directory -; provided in the Force Upgrade FileX= key(s). If any of -; the listed file or directory exists, then this component -; will have its SELECTED and DISABLED Attributes set -; automatically. Force Upgrade will override the following: -; -; Random Install Percentage= setting -; UNSELECTED Attribute setting -; Dependency settings -; Dependee settings -; Setup Type settings - meaning that even if this -; component is not listed in the -; selected Setup Type, it will be -; affected. -; -; IGNORE_DOWNLOAD_ERROR - If the component needs to be downloaded from a -; server, setting this attribute will indicate that -; any download error encountered will be ignored -; and treated as if there were no error. -; If the component does not need to be downloaded, -; then this attribute has no effect. -; -; IGNORE_XPINSTALL_ERROR - If the component is a .xpi file, then any error -; resulting from the installation of the .xpi file -; will be ignored. If the .xpi file is not to be -; installed, then this attribute is ignored. -; -; SUPERSEDE - Component is to be shown as disabled and unselected -; if a file exists. -; Use SupersedeType=File Exists to specify the type of comparison -; Use SupersedeFileX=File Name to specify the file -; Use SupersedeMinVersionX=a.b.c.d (optional) to specify the -; minimum version of the file. If the version of the existing file -; is greater than or equal to the SupersedeMinVersion the component -; will be superseded. -; - -;We're not installing Component XPCOM because we're using it -;for it's xpinstall engine from the TEMP dir. The files that -;this component has are already in Component GRE. -[Component XPCOM] -Description Short={XPCOM_SHORT} -Description Long={XPCOM_SHORT} -Archive=xpcom.xpi -$InstallSize$:xpcom -$InstallSizeSystem$ -$InstallSizeArchive$:xpcom.xpi -Attributes=SELECTED|INVISIBLE -FileCount=$FileCount$ - -[Component Browser] -Description Short={BROWSER_SHORT} -Description Long={BROWSER_SHORT} -Archive=browser.xpi -$InstallSize$:browser -$InstallSizeSystem$ -$InstallSizeArchive$:browser.xpi -Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE|MAIN_COMPONENT -Force Upgrade File0=[SETUP PATH]\$MainExeFile$ -FileCount=$FileCount$ - -[Component ADT] -Description Short={ADT_SHORT} -Description Long={ADT_LONG} -Archive=adt.xpi -$InstallSize$:adt -$InstallSizeArchive$:adt.xpi -Attributes=FORCE_UPGRADE|VISIBLE -;Force Upgrade File0=[SETUP PATH]\chrome\venkman.jar -Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar -FileCount=$FileCount$ - -[Component Langpack] -Description Short={AB_CD} {LANGPACK_TITLE} -Description Long={AB_CD} {LANGPACK_TITLE} -Archive={AB_CD}.xpi -Install Size=512 -Install Size System=1 -Install Size Archive=512 -Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE -Force Upgrade File0=[SETUP PATH]\chrome\{AB_CD}.jar -FileCount=$FileCount$ - -[Component QFA] -Description Short={QFA_SHORT} -Description Long={QFA_LONG} -Archive=talkback.xpi -Install Size=870 -Install Size System=1 -Install Size Archive=248 -Attributes=SELECTED|FORCE_UPGRADE -Force Upgrade File0=[SETUP PATH]\extensions\talkback@mozilla.org\components\fullsoft.dll -FileCount=$FileCount$ -; This is to randomly set the default checkbox for this component. -; This particular value will set the checkbox checked [number]% of the time. -; This logic is done only during the initialization of setup, not in any -; particular dialog. -Random Install Percentage=100 - -[Core] -Source=[XPI PATH]\xpcom.xpi -Destination=[WIZTEMP]\xpcom.ns -$InstallSize$:xpcom -Cleanup=TRUE -Message={CORE_PREPARING} -; Status= values: Disabled, Enabled -; If nothing is set, default value is Enabled. If set to Disabled, -; it will then use GRE as the xpinstall engine, in which case, there -; should be a GRE component in this installer package! -Status=Enabled - -[Redirect] -Status=Disabled -; This is used in conjunction with the Site Selector info to build a -; url to where to download the needed redirect.ini file from. -; If there's more than one server path, they will be used as fail -; over paths. -; -; The Server Path= keys need to be named in the following convention: -; -; Server Path0= -; Server Path1= -; Server Path2= -; -; and so on... -Server Path=redirect.ini -Description=Redirect File -Message= - - -; The Timing key needs to be one of the following values: -; pre download - process before any files have been downloaded. -; post download - process after all files have been downloaded. -; pre xpcom - process before the xpcom file has been uncompressed. -; post xpcom - process after the xpcom file has been uncompressed. -; pre smartupdate - process before the smartupdate engine has been launched. -; post smartupdate - process after the smartupdate engine has been launched. -; pre launchapp - process before the launching of executables. -; post launchapp - process after the launching of executables. -; pre archive - process before the launching of each individual archive file. -; post archive - process after the launching of each individual archive file. -; depend reboot - process depending on if a reboot is necessary or not. -; if reboot is necessary, installer can set it up so -; the app runs once upon windows reboot. - - -;Copy FileX sections - -; nss3.dll, softokn3.dll, ssl3.dll, and smime3.dll all need to be copied from -; the GRE dir to the destination app folder (see bug 202326) -[Copy File2] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\nss3.dll -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File3] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\softokn3.dll -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File4] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\softokn3.chk -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File5] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\ssl3.dll -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File6] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\smime3.dll -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File7] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\freebl3.dll -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Copy File8] -Timing=post smartupdate -Source=[$GRE_INSTALL_DIR]\freebl3.chk -Destination=[SETUP PATH] -Fail If Exists=FALSE -Do Not Uninstall=FALSE - -[Path Lookup $GRE_INSTALL_DIR] -Path Reg Key Root=HKEY_LOCAL_MACHINE -Path Reg Key=Software\mozilla.org\GRE\$GreUniqueID$\Main -Path Reg Name=Install Directory -Strip Filename=FALSE - - -;Copy File SequentialX sections -[Copy File Sequential0] -Timing=post smartupdate -Filename=install_wizard.log -Source=[SETUP PATH] -Destination=[SETUP PATH]\uninstall - - -;Create DirectoryX sections -[Create Directory0] -Timing=post download -Destination=[SETUP PATH]\plugins - - -;Delete FileX sections -[Delete File0] -Timing=post download -Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk - -[Delete File1] -Timing=post smartupdate -Destination=[SETUP PATH]\install_wizard.log - - -;Remove DirectoryX sections -;[Remove Directory0] -;Timing=post launchapp -;Destination=[TEMP]\xtratest -;Remove subdirs=TRUE - - -;RunAppX sections -[RunApp0] -Timing=depend reboot -Wait=FALSE -Target=[SETUP PATH]\$MainExeFile$ -Parameters=-installer -WorkingDir=[SETUP PATH] - -[Windows Registry0] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry1] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$\$ProductName$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry2] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$\$ProductName$\$UserAgent$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry3] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main -Name=Program Folder Path -Name Value=[Default Folder] -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry4] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall -Name=Description -Name Value=$ProductName$ ($UserAgentShort$) -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=FALSE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry5] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall -Name=Uninstall Log Folder -Name Value=[SETUP PATH]\uninstall -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry6] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry7] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$\$ProductName$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry8] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$\$ProductName$\$UserAgent$ -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry9] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main -Name=Program Folder Path -Name Value=[Default Folder] -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry10] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall -Name=Description -Name Value=$ProductName$ ($UserAgentShort$) -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=FALSE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry11] -Root Key=HKEY_CURRENT_USER -Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall -Name=Uninstall Log Folder -Name Value=[SETUP PATH]\uninstall -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Windows Registry12] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=DisplayName -Name Value=$ProductName$ ($UserAgentShort$) -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=FALSE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry13] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=UninstallString -Name Value=[SETUP PATH]\uninstall\uninstall.exe /ua "$UserAgent$" -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry14] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=DisplayIcon -Name Value=[SETUP PATH]\$MainExeFile$,0 -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry15] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=DisplayVersion -Name Value=$UserAgent$ -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry16] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=Comment -Name Value=$ProductName$ -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry17] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=InstallLocation -Name Value=[SETUP PATH] -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry18] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=NoModify -Name Value=0x00000001 -Type=REG_DWORD -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=FALSE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry19] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=NoRepair -Name Value=0x00000001 -Type=REG_DWORD -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=FALSE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry20] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=Publisher -Name Value=$CompanyName$ -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry21] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=URLInfoAbout -Name Value=http://www.mozilla.org/ -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -[Windows Registry22] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) -Name=URLUpdateInfo -Name Value=http://www.mozilla.org/products/firefox/ -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=post smartupdate - -; The following keys are to help JRE's installer locate where mozilla gets -; installed to. It has not been updated to look for the new keys. -[Windows Registry23] -Root Key=HKEY_LOCAL_MACHINE -Key=Software\Mozilla -Name= -Name Value= -Type=REG_SZ -Decrypt Key=FALSE -Decrypt Name=FALSE -Decrypt Name Value=TRUE -Overwrite Key=TRUE -Overwrite Name=TRUE -Timing=pre smartupdate - -[Cleanup Previous Product RegKeys] -Reg Key Root0=HKEY_LOCAL_MACHINE -Product Name0=$ProductName$ -Product Reg Key0=Software\$CompanyName$\$ProductName$ -Current Version0=$UserAgent$ - -Reg Key Root1=HKEY_CURRENT_USER -Product Name1=$ProductName$ -Product Reg Key1=Software\$CompanyName$\$ProductName$ -Current Version1=$UserAgent$ - -[Strings] -Message Unfinished Download Restart={MSG_UNFINISHED_DL} -Message Unfinished Install Xpi Restart={MSG_UNFINISHED_INSTALL} -Error Corrupted Archives Detected={MSG_CORRUPTED} -Error Corrupted Archives Detected AUTO mode={MSG_CORRUPTED_AUTO} -Error Too Many CRC Failures={MSG_TOO_MANY_CRC} -Error Too Many Network Errors={MSG_TOO_MANY_NETWORK} -Message Verifying Archives={MSG_VERIFYING} -Error Undefined={MSG_UNDEFINED} -Error Out Of Memory={MSG_OOM} -Status Download={MSG_STATUS_DL} -Status Retry={MSG_STATUS_DL} -Status File Info=%s -Status Percentage Completed=%d%% -Dialog Download Title Minimized={MSG_COMPLETED} -STR Force Upgrade Required={MSG_REQUIRED} -Message Cancel Setup AUTO mode={MSG_CANCELING} -Error File Uncompress={MSG_ERROR_UNCOMPRESS} -UsageMsg Usage={MSG_USAGE} -IDC Use FTP={MSG_USE_FTP} -IDC Use HTTP={MSG_USE_HTTP} -IDC Save Installer Files={MSG_SAVE_LOCALLY} -IDC Turbo Mode=&Use Quick Launch for faster startup times when possible -Message Download Paused={MSG_DL_PAUSED} -Message NORMAL Restricted Access={MSG_NOT_ADMIN} -Message AUTO Restricted Access={MSG_NOT_ADMIN_AUTO} - - -[Site Selector] -; Dictates whether or not to show the pull down menu. -; Default value is SHOW. -; If Status= is set to HIDE, then Identifier0 will be used -; and all other IdentifiersX will be ignored. -Status=HIDE - -Identifier0=Site0 -Description0=Default -Domain0=$ArchiveUrl$ - -Identifier1=Site1 -Description1=North America -Domain1=$ArchiveUrl$ diff --git a/mozilla/browser/installer/windows/editor.jst b/mozilla/browser/installer/windows/editor.jst deleted file mode 100644 index cc7fb19b383..00000000000 --- a/mozilla/browser/installer/windows/editor.jst +++ /dev/null @@ -1,18 +0,0 @@ -var err = initInstall("Mozilla Editor", "Editor", "$Version$"); -logComment("initInstall: " + err); - -var communicatorFolder = getFolder("Communicator"); -logComment("communicatorFolder: " + communicatorFolder); - -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); - -err = performInstall(); -logComment("performInstall() returned: " + err); - diff --git a/mozilla/browser/installer/windows/firebird-win32-stub-installer.jst b/mozilla/browser/installer/windows/firebird-win32-stub-installer.jst deleted file mode 100644 index c459071b70a..00000000000 --- a/mozilla/browser/installer/windows/firebird-win32-stub-installer.jst +++ /dev/null @@ -1,49 +0,0 @@ -// 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 -winreg = getWinRegistry(); -winreg.setRootKey(winreg.HKEY_CURRENT_USER); -subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; -valname = "Desktop"; -szFolderDesktop = winreg.getValueString(subkey, valname); - -fDesktop = getFolder("file:///", szFolderDesktop); -logComment("Desktop location: " + fDesktop); - -if(verifyDiskSpace(fDesktop, srDest)) -{ - setPackageFolder(fDesktop); - - err = addFile("", - "", - "mozilla-win32-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-win32-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/browser/installer/windows/firefox-win32-stub-installer.jst b/mozilla/browser/installer/windows/firefox-win32-stub-installer.jst deleted file mode 100644 index 3283ac53c24..00000000000 --- a/mozilla/browser/installer/windows/firefox-win32-stub-installer.jst +++ /dev/null @@ -1,49 +0,0 @@ -// main -var srDest; -var err; -var fDesktop; -var szFolderDesktop; - -srDest = $SpaceRequired$; -err = initInstall("Firefox Installer", "/mozilla.org/Firefox Installer", "$Version$"); -logComment("initInstall: " + err); - -// Find the current user's desktop -winreg = getWinRegistry(); -winreg.setRootKey(winreg.HKEY_CURRENT_USER); -subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; -valname = "Desktop"; -szFolderDesktop = winreg.getValueString(subkey, valname); - -fDesktop = getFolder("file:///", szFolderDesktop); -logComment("Desktop location: " + fDesktop); - -if(verifyDiskSpace(fDesktop, srDest)) -{ - setPackageFolder(fDesktop); - - err = addFile("", - "", - "FirefoxNetSetup.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("FirefoxNetSetup.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/browser/installer/windows/inspector.jst b/mozilla/browser/installer/windows/inspector.jst deleted file mode 100644 index f449b6ba53e..00000000000 --- a/mozilla/browser/installer/windows/inspector.jst +++ /dev/null @@ -1,24 +0,0 @@ -var err = initInstall("DOM Inspector", "Inspector", "$Version$"); -logComment("initInstall: " + err); - -var fProgram = getFolder("Program"); -logComment("fProgram: " + fProgram); - -err = addDirectory("", "$Version$", "bin", fProgram, "", true); -logComment("addDirectory: " + err); - -addFile("Inspector Command Line Handler", - "bin/components/inspector-cmdline.js", - getFolder("Components"), - ""); - -var jarFolder = getFolder("Chrome", "inspector.jar"); -registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/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); diff --git a/mozilla/browser/installer/windows/install.it b/mozilla/browser/installer/windows/install.it deleted file mode 100644 index 82bdfb470ba..00000000000 --- a/mozilla/browser/installer/windows/install.it +++ /dev/null @@ -1,110 +0,0 @@ -#filter substitution -AB_CD=@AB_CD@ -LANGPACK_TITLE=@LANGPACK_TITLE@ -SETUP_TITLE=@SETUP_TITLE@ -SETUP_WELCOME=@SETUP_WELCOME@ -SETUP_MESSAGE0=@SETUP_MESSAGE0@ -SETUP_MESSAGE1=@SETUP_MESSAGE1@ -SETUP_MESSAGE2=@SETUP_MESSAGE2@ -SETUP_MESSAGE3=@SETUP_MESSAGE3@ -LICENSE_TITLE=@LICENSE_TITLE@ -LICENSE_SUBTITLE=@LICENSE_SUBTITLE@ -LICENSE_MESSAGE0=@LICENSE_MESSAGE0@ -LICENSE_ACCEPT=@LICENSE_ACCEPT@ -LICENSE_DECLINE=@LICENSE_DECLINE@ -SETUP_TYPE_TITLE=@SETUP_TYPE_TITLE@ -SETUP_TYPE_SUBTITLE=@SETUP_TYPE_SUBTITLE@ -SETUP_TYPE_MESSAGE0=@SETUP_TYPE_MESSAGE0@ -TYPE_STANDARD=@TYPE_STANDARD@ -TYPE_STANDARD_DESC=@TYPE_STANDARD_DESC@ -TYPE_CUSTOM=@TYPE_CUSTOM@ -TYPE_CUSTOM_DESC=@TYPE_CUSTOM_DESC@ -SELECT_TITLE=@SELECT_TITLE@ -SELECT_SUBTITLE=@SELECT_SUBTITLE@ -SELECT_MESSAGE0=@SELECT_MESSAGE0@ -LOCATION_TITLE=@LOCATION_TITLE@ -LOCATION_SUBTITLE=@LOCATION_SUBTITLE@ -LOCATION_MESSAGE0=@LOCATION_MESSAGE0@ -UPGRADE_TITLE=@UPGRADE_TITLE@ -UPGRADE_SUBTITLE=@UPGRADE_SUBTITLE@ -UPGRADE_CLEANUP=@UPGRADE_CLEANUP@ -UPGRADE_CLEAN=@UPGRADE_CLEAN@ -UPGRADE_CLEAN_MSG=@UPGRADE_CLEAN_MSG@ -UPGRADE_OVER=@UPGRADE_OVER@ -UPGRADE_OVER_WINDIR=@UPGRADE_OVER_WINDIR@ -ADD_TITLE=@ADD_TITLE@ -ADD_MESSAGE0=@ADD_MESSAGE0@ -WININT_TITLE=@WININT_TITLE@ -WININT_SUBTITLE=@WININT_SUBTITLE@ -WININT_MESSAGE0=@WININT_MESSAGE0@ -WININT_DESKTOP=@WININT_DESKTOP@ -WININT_START=@WININT_START@ -WININT_QUICKL=@WININT_QUICKL@ -WININT_PFOLDER_TITLE=@WININT_PFOLDER_TITLE@ -WININT_PFOLDER_MESSAGE0=@WININT_PFOLDER_MESSAGE0@ -ADDL_OPTIONS_TITLE=@ADDL_OPTIONS_TITLE@ -ADDL_OPTIONS_MSG1=@ADDL_OPTIONS_MSG1@ -ADV_SETTINGS_TITLE=@ADV_SETTINGS_TITLE@ -ADV_SETTINGS_MSG=@ADV_SETTINGS_MSG@ -START_TITLE=@START_TITLE@ -START_SUBTITLE=@START_SUBTITLE@ -START_INSTALL=@START_INSTALL@ -START_DOWNLOAD=@START_DOWNLOAD@ -START_MESSAGE0=@START_MESSAGE0@ -DL_TITLE=@DL_TITLE@ -DL_SUBTITLE=@DL_SUBTITLE@ -DL_BLURB=@DL_BLURB@ -DL_FILENAME=@DL_FILENAME@ -DL_TIMELEFT=@DL_TIMELEFT@ -INSTALL_TITLE=@INSTALL_TITLE@ -INSTALL_SUBTITLE=@INSTALL_SUBTITLE@ -INSTALL_BLURB=@INSTALL_BLURB@ -INSTALL_STATUSFILE=@INSTALL_STATUSFILE@ -INSTALL_STATUSCOMP=@INSTALL_STATUSCOMP@ -COMPLETE_TITLE=@COMPLETE_TITLE@ -COMPLETE_TITLE=@COMPLETE_TITLE@ -COMPLETE_MESSAGE0=@COMPLETE_MESSAGE0@ -COMPLETE_MESSAGE1=@COMPLETE_MESSAGE1@ -COMPLETE_LAUNCH=@COMPLETE_LAUNCH@ -DL2_TITLE=@DL2_TITLE@ -DL2_MESSAGE0=@DL2_MESSAGE0@ -DL2_RETRY=@DL2_RETRY@ -CLOSE_CHECK=@CLOSE_CHECK@ -CLOSE_CHECK2=@CLOSE_CHECK2@ -CLOSE_WAIT=@CLOSE_WAIT@ -XPCOM_SHORT=@XPCOM_SHORT@ -XPCOM_SHORT=@XPCOM_SHORT@ -BROWSER_SHORT=@BROWSER_SHORT@ -BROWSER_SHORT=@BROWSER_SHORT@ -ADT_SHORT=@ADT_SHORT@ -ADT_LONG=@ADT_LONG@ -HELP_SHORT=@HELP_SHORT@ -UNINSTALL_SHORT=@UNINSTALL_SHORT@ -RPT_SHORT=@RPT_SHORT@ -RPT_LONG=@RPT_LONG@ -QFA_SHORT=@QFA_SHORT@ -QFA_LONG=@QFA_LONG@ -CORE_PREPARING=@CORE_PREPARING@ -INST_UNINST=@INST_UNINST@ -MSG_UNFINISHED_DL=@MSG_UNFINISHED_DL@ -MSG_UNFINISHED_INSTALL=@MSG_UNFINISHED_INSTALL@ -MSG_CORRUPTED=@MSG_CORRUPTED@ -MSG_CORRUPTED_AUTO=@MSG_CORRUPTED_AUTO@ -MSG_TOO_MANY_CRC=@MSG_TOO_MANY_CRC@ -MSG_TOO_MANY_NETWORK=@MSG_TOO_MANY_NETWORK@ -MSG_VERIFYING=@MSG_VERIFYING@ -MSG_UNDEFINED=@MSG_UNDEFINED@ -MSG_OOM=@MSG_OOM@ -MSG_STATUS_DL=@MSG_STATUS_DL@ -MSG_STATUS_DL=@MSG_STATUS_DL@ -MSG_COMPLETED=@MSG_COMPLETED@ -MSG_REQUIRED=@MSG_REQUIRED@ -MSG_CANCELING=@MSG_CANCELING@ -MSG_ERROR_UNCOMPRESS=@MSG_ERROR_UNCOMPRESS@ -MSG_USAGE=@MSG_USAGE@ -MSG_USE_FTP=@MSG_USE_FTP@ -MSG_USE_HTTP=@MSG_USE_HTTP@ -MSG_SAVE_LOCALLY=@MSG_SAVE_LOCALLY@ -MSG_DL_PAUSED=@MSG_DL_PAUSED@ -MSG_NOT_ADMIN=@MSG_NOT_ADMIN@ -MSG_NOT_ADMIN_AUTO=@MSG_NOT_ADMIN_AUTO@ diff --git a/mozilla/browser/installer/windows/installer.cfg b/mozilla/browser/installer/windows/installer.cfg deleted file mode 100644 index 53408db9a04..00000000000 --- a/mozilla/browser/installer/windows/installer.cfg +++ /dev/null @@ -1,15 +0,0 @@ -#filter substitution -VersionLanguage = @AB_CD@ -NameCompany = Mozilla -NameProduct = Minefield -NameProductInternal = Minefield -ShortNameProduct = Minefield -VersionProduct = @MOZ_APP_VERSION@ -FileInstallerEXE = @PKG_BASENAME@.installer.exe -FileInstallerMSI = @PKG_BASENAME@.installer.msi -FileMainEXE = @MOZ_APP_NAME@.exe -FileInstallerNETRoot = @PKG_BASENAME@.net-installer -ComponentList = xpcom,browser,talkback,@AB_CD@,adt -LicenseFile = browser/EULA -7ZipSFXModule = other-licenses/7zstub/firefox/7zSD.sfx -GREVersion = 1.9a1 diff --git a/mozilla/browser/installer/windows/psm.jst b/mozilla/browser/installer/windows/psm.jst deleted file mode 100644 index f69a871d611..00000000000 --- a/mozilla/browser/installer/windows/psm.jst +++ /dev/null @@ -1,51 +0,0 @@ -function upgradeCleanup() -{ - // Obsolete files from Netscape 6.0 and Netscape 6.01 that - // need to be cleaned up. - deleteThisFile("Program", "psm.exe"); - deleteThisFile("Components", "psmglue.dll"); -} - -// main -var srDest; -var err; -var fProgram; - -srDest = $SpaceRequired$:bin; -err = initInstall("Personal Security Manager", "Personal Security Manager", "$Version$"); -logComment("initInstall: " + err); - -fProgram = getFolder("Program"); -logComment("fProgram: " + fProgram); - -if(verifyDiskSpace(fProgram, srDest)) -{ - setPackageFolder(fProgram); - - 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); - - // check return value - if(err == SUCCESS) - { - - 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(err); -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); - -// end main diff --git a/mozilla/browser/installer/windows/redirect.it b/mozilla/browser/installer/windows/redirect.it deleted file mode 100644 index 2688387c263..00000000000 --- a/mozilla/browser/installer/windows/redirect.it +++ /dev/null @@ -1,4 +0,0 @@ -[Site Selector] -Site0=$ArchiveUrl$ -Site1=$ArchiveUrl$ - diff --git a/mozilla/browser/installer/windows/talkback.jst b/mozilla/browser/installer/windows/talkback.jst deleted file mode 100644 index d92aac94271..00000000000 --- a/mozilla/browser/installer/windows/talkback.jst +++ /dev/null @@ -1,45 +0,0 @@ -function upgradeCleanup() -{ - // Obsolete files from previous Netscape installation which - // need to be cleaned up. - deleteThisFile("Components", "l10n.ini"); -} - -// main -var srDest; -var err; -var communicatorFolder; - -srDest = $SpaceRequired$; -err = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "$Version$"); -logComment("initInstall: " + err); - -communicatorFolder = getFolder("Communicator"); -logComment("communicatorFolder: " + communicatorFolder); - -if(verifyDiskSpace(communicatorFolder, srDest)) -{ - setPackageFolder(communicatorFolder); - - upgradeCleanup(); - err = addDirectory("", - "$Version$", - "bin", // dir name in jar to extract - communicatorFolder, // Where to put this file (Returned from getFolder) - "", // subdir name to create relative to communicatorFolder - true ); // Force Flag - logComment("addDirectory() returned: " + err); - - // check return value - if(!err) - { - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - cancelInstall(err); -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); - -// end main diff --git a/mozilla/browser/installer/windows/uninstall.it b/mozilla/browser/installer/windows/uninstall.it deleted file mode 100644 index 5e06efc9541..00000000000 --- a/mozilla/browser/installer/windows/uninstall.it +++ /dev/null @@ -1,158 +0,0 @@ -#filter substitution - -[General] -; Run Mode values: -; Normal - Shows all dialogs. Requires user input. -; Auto - Shows some dialogs, but none requiring user input. It will -; automatically uninstall the product using default values. -; Silent - Show no dialogs at all. It will uninstall product using default -; values. -Run Mode=Normal - -Company Name=@BRAND_COMPANY_NAME@ -Product Name=@BRAND_PRODUCT_NAME@ - -; 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 - -; This provides information on where in the Windows Registry to locate the Uninstall log files -; -Main Root Key=HKEY_LOCAL_MACHINE -Main Key=[Product WinRegKey] -Decrypt Main Key=TRUE - -Root Key=HKEY_LOCAL_MACHINE -Key=[Product CurrentVersion]\Uninstall -Decrypt Key=TRUE - -[Check Instance0] -Class Name=FirefoxMessageWindow -Window Name= -Process Name=firefox.exe -Pretty Name=@BRAND_PRODUCT_NAME@ -Message=@UNINST_RUNNING@ -Message wait=@UNINST_SHUTDOWN@ - -; This key indicates whether or not to close all the windows associated with -; the process id of this app instance window found. -Close All Process Windows=TRUE - -; These keys are not normally necessary for checking instances. They are -; set here because Mozilla requires a way to shut down it's turbo mode. -Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE -Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe -Extra Cmd0 Reg Name= -Extra Cmd0 Parameter=-kill - -[Check Instance1] -Class Name=Netscape6MessageWindow -Window Name= -Process Name=Netscp.exe -Pretty Name=Netscape -;*** LOCALIZE ME BABY *** -Message=Netscape is detected to be currently running. Please quit Netscape before continuing. Click OK to exit Netscape automatically and proceed with uninstallation. -;*** LOCALIZE ME BABY *** -Message wait=Shutting down Netscape. Please wait... - -; This key indicates whether or not to close all the windows associated with -; the process id of this app instance window found. -Close All Process Windows=TRUE - -; These keys are not normally necessary for checking instances. They are -; set here because Netscape 6 requires a way to shut down it's turbo mode. -; This will stop at the first one that succeeds (key and file found). -Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE -Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Netscp6.exe -Extra Cmd0 Reg Name= -Extra Cmd0 Parameter=-kill - -Extra Cmd1 Reg Key Root=HKEY_LOCAL_MACHINE -Extra Cmd1 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Netscp.exe -Extra Cmd1 Reg Name= -Extra Cmd1 Parameter=-kill - - -[Dialog Uninstall] -FONTNAME=@UNINST_FONT@ -FONTSIZE=@UNINST_FONTSIZE@ -CHARSET=@UNINST_CHARSET@ -Show Dialog=TRUE -Title=@UNINST_TITLE@ -Message0=@UNINST_MESSAGE0@ - -Uninstall=@BTN_UNINST@ -Cancel=@BTN_CANCEL@ -Message1=@BTN_MESSAGE1@ -Message2=@BTN_MESSAGE2@ -FileName=@BTN_FILENAME@ -No=@BTN_NO@ -NoToAll=@BTN_NOTOALL@ -Yes=@BTN_YES@ -YesToAll=@BTN_YESTOALL@ -OK=@BTN_OK@ - -; This section attempts to restore/undo the desktop integration performed by the browser/mail -[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=@ERROR_DLL_LOAD@ -ERROR_STRING_LOAD=@ERROR_STRING_LOAD@ -ERROR_STRING_NULL=@ERROR_STRING_NULL@ -ERROR_GLOBALALLOC=@ERROR_GLOBALALLOC@ -ERROR_FAILED=@ERROR_FAILED@ -ERROR_DIALOG_CREATE=@ERROR_DIALOG_CREATE@ -DLGQUITTITLE=@DLGQUITTITLE@ -DLGQUITMSG=@DLGQUITMSG@ -ERROR_GET_SYSTEM_DIRECTORY_FAILED=@ERROR_GET_SYSTEM_DIRECTORY_FAILED@ -ERROR_GET_WINDOWS_DIRECTORY_FAILED=@ERROR_GET_WINDOWS_DIRECTORY_FAILED@ -ERROR_CREATE_TEMP_DIR=@ERROR_CREATE_TEMP_DIR@ -ERROR_SETUP_REQUIREMENT=@ERROR_SETUP_REQUIREMENT@ -MB_WARNING_STR=@MB_WARNING_STR@ -ERROR_UNINSTALL_LOG_FOLDER=@ERROR_UNINSTALL_LOG_FOLDER@ -MB_MESSAGE_STR=@MB_MESSAGE_STR@ -DLG_REMOVE_FILE_TITLE=@DLG_REMOVE_FILE_TITLE@ -ERROR_GETVERSION=@ERROR_GETVERSION@ -MB_ATTENTION_STR=@MB_ATTENTION_STR@ -MSG_FORCE_QUIT_PROCESS=@MSG_FORCE_QUIT_PROCESS@ -MSG_FORCE_QUIT_PROCESS_FAILED=@MSG_FORCE_QUIT_PROCESS_FAILED@ -MSG_DELETE_INSTALLATION_PATH=@MSG_DELETE_INSTALLATION_PATH@ -MSG_INSTALLATION_PATH_WITHIN_WINDIR=@MSG_INSTALLATION_PATH_WITHIN_WINDIR@ -; Localize me!! -MSG_UNINSTALL_COMPLETE=@BRAND_PRODUCT_NAME@ has been removed from your computer. -MSG_UNINSTALL_SURVEY=Tell us what you thought of @BRAND_PRODUCT_NAME@. diff --git a/mozilla/browser/installer/windows/uninstaller.inc b/mozilla/browser/installer/windows/uninstaller.inc deleted file mode 100644 index a33e0d8f158..00000000000 --- a/mozilla/browser/installer/windows/uninstaller.inc +++ /dev/null @@ -1,76 +0,0 @@ -#filter emptyLines - -# This file is in the UTF-8 encoding - -#define BRAND_COMPANY_NAME Mozilla -#ifdef OFFICIAL_BRANDING -#define BRAND_PRODUCT_NAME Mozilla Firefox -#else -#define BRAND_PRODUCT_NAME Minefield -#endif - -#ifdef OFFICIAL_BRANDING -#define UNINST_RUNNING Mozilla Firefox is detected to be currently running. Please quit Mozilla Firefox before continuing. Click OK to exit Mozilla Firefox automatically and proceed with uninstallation. -#define UNINST_SHUTDOWN Shutting down Mozilla Firefox. Please wait... -#else -#define UNINST_RUNNING Minefield is detected to be currently running. Please quit Minefield before continuing. Click OK to exit Minefield automatically and proceed with uninstallation. -#define UNINST_SHUTDOWN Shutting down Minefield. Please wait... -#endif -#define UNINST_FONT MS Sans Serif -#define UNINST_FONTSIZE 8 -#define UNINST_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 - -#ifdef OFFICIAL_BRANDING -#define UNINST_TITLE Mozilla Firefox Uninstaller -#else -#define UNINST_TITLE Minefield Uninstaller -#endif -#define UNINST_MESSAGE0 Are you sure you want to completely remove %s and all of its components? -#define BTN_UNINST &Uninstall -#define BTN_CANCEL &Cancel -#define BTN_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? -#define BTN_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. -#define BTN_FILENAME File name: -#define BTN_NO &No -#define BTN_NOTOALL N&o to all -#define BTN_YES &Yes -#define BTN_YESTOALL Y&es to all -#define BTN_OK OK - -#define ERROR_DLL_LOAD Could not load %s -#define ERROR_STRING_LOAD Could not load string resource ID %d -#define ERROR_STRING_NULL Null pointer encountered. -#define ERROR_GLOBALALLOC Memory allocation error. -#define ERROR_FAILED %s failed. -#define ERROR_DIALOG_CREATE Could not create %s dialog. -#define DLGQUITTITLE Question -#define DLGQUITMSG Are you sure you want to cancel? -#define ERROR_GET_SYSTEM_DIRECTORY_FAILED GetSystemDirectory() failed. -#define ERROR_GET_WINDOWS_DIRECTORY_FAILED GetWindowsDirectory() failed. -#define ERROR_CREATE_TEMP_DIR Uninstall was not able to create the TEMP directory: %s -#define ERROR_SETUP_REQUIREMENT Windows95 or greater Operating System is required! Exiting Uninstall... -#define MB_WARNING_STR Warning -#define ERROR_UNINSTALL_LOG_FOLDER Uninstall log folder not found:%s -#define MB_MESSAGE_STR Message -#define DLG_REMOVE_FILE_TITLE Remove File? -#define ERROR_GETVERSION GetVersionEx() failed! -#define MB_ATTENTION_STR Attention -#define MSG_FORCE_QUIT_PROCESS Uninstall has detected that %s (%s) is still running. Click OK to quit %s and proceed with uninstallation. Alternatively, use the Windows Task Manager to quit %s, and then click OK to continue with uninstallation. -#define MSG_FORCE_QUIT_PROCESS_FAILED Uninstall will now exit. Uninstall could not continue because %s (%s) is still running. Try manually quitting %s using Windows Task Manager, and then run Uninstall again. -#define MSG_DELETE_INSTALLATION_PATH Not all files were uninstalled from the installation directory:\n\n %s\n\nDo you want to completely delete this directory? -#ifdef OFFICIAL_BRANDING -#define MSG_INSTALLATION_PATH_WITHIN_WINDIR Uninstall has detected that the installation path of Mozilla Firefox is installed to a folder within your Windows folder. Uninstall will not attempt to delete this installation due to the potential removal of critical system files. -#else -#define MSG_INSTALLATION_PATH_WITHIN_WINDIR Uninstall has detected that the installation path of Minefield is installed to a folder within your Windows folder. Uninstall will not attempt to delete this installation due to the potential removal of critical system files. -#endif - -#unfilter emptyLines diff --git a/mozilla/browser/installer/windows/venkman.jst b/mozilla/browser/installer/windows/venkman.jst deleted file mode 100644 index 5c374bd3f43..00000000000 --- a/mozilla/browser/installer/windows/venkman.jst +++ /dev/null @@ -1,22 +0,0 @@ -var err = initInstall("JavaScript Debugger", "Venkman", "$Version$"); -logComment("initInstall: " + err); - -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 - -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/"); - -err = getLastError(); -if (err==SUCCESS) - performInstall(); -else - cancelInstall(err); diff --git a/mozilla/browser/installer/windows/xpcom.jst b/mozilla/browser/installer/windows/xpcom.jst deleted file mode 100644 index 93a30ffbcee..00000000000 --- a/mozilla/browser/installer/windows/xpcom.jst +++ /dev/null @@ -1,101 +0,0 @@ -// main -var srDest; -var err; -var szUninstall; -var fProgram; -var fWindowsSystem; -var fileComponentReg; -var fileComponentRegStr; -var fileMsvcrt; -var fileMsvcirt; - -srDest = $SpaceRequired$:bin; -err = initInstall("Mozilla XPCOM", "XPCOM", "$Version$"); -logComment("initInstall: " + err); - -fProgram = getFolder("Program"); -fWindowsSystem = getFolder("Win System"); -logComment("fProgram: " + fProgram); - -// build the uninstall folder path -szUninstall = fProgram + "Uninstall"; - -// 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)) -{ - setPackageFolder(fProgram); - - 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 ) - { - // install msvcrt.dll *only* if it does not exist - // we don't care if addFile() fails (if the file does not exist in the archive) - // bacause it will still install - fileMsvcrt = getFolder(fWindowsSystem, "msvcrt.dll"); - rv = File.exists(fileMsvcrt); - logComment("fileExists() returned: " + rv); - if(rv == false) - { - logComment("File not found: " + fileMsvcrt); - addFile("/Microsoft/Shared/msvcrt.dll", - "$Version$", - "msvcrt.dll", // dir name in jar to extract - fWindowsSystem, // Where to put this file (Returned from getFolder) - "", // subdir name to create relative to fProgram - WIN_SHARED_FILE); - logComment("addFile() of msvcrt.dll returned: " + err); - } - else - { - logComment("File found: " + fileMsvcrt); - } - - // install msvcirt.dll *only* if it does not exist - // we don't care if addFile() fails (if the file does not exist in the archive) - // bacause it will still install - fileMsvcirt = getFolder(fWindowsSystem, "msvcirt.dll"); - rv = File.exists(fileMsvcirt); - logComment("fileExists() returned: " + rv); - if(rv == false) - { - logComment("File not found: " + fileMsvcirt); - addFile("/Microsoft/Shared/msvcirt.dll", - "$Version$", - "msvcirt.dll", // dir name in jar to extract - fWindowsSystem, // Where to put this file (Returned from getFolder) - "", // subdir name to create relative to fProgram - WIN_SHARED_FILE); - logComment("addFile() of msvcirt.dll returned: " + err); - } - else - { - logComment("File found: " + fileMsvcirt); - } - } - - // 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/other-licenses/branding/firefox/Makefile.in b/mozilla/other-licenses/branding/firefox/Makefile.in index cb2c3122d71..f80437bc2b2 100644 --- a/mozilla/other-licenses/branding/firefox/Makefile.in +++ b/mozilla/other-licenses/branding/firefox/Makefile.in @@ -47,8 +47,6 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) endif ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico - cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp - cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp