From 357e76484df1af2773b7ab71b4ab9a82e2d428a3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 28 Jun 2010 15:51:03 +0300 Subject: [PATCH] Remove remaining Innosetup installer files. Innosetup installer was removed earlier but some files related to it were not removed. --- win_installer/LargeLogo.bmp | Bin 52574 -> 0 bytes win_installer/icon.bmp | Bin 4158 -> 0 bytes win_installer/modpath.iss | 157 ----------------------------- win_installer/readme_InnoSetup.txt | 69 ------------- 4 files changed, 226 deletions(-) delete mode 100644 win_installer/LargeLogo.bmp delete mode 100644 win_installer/icon.bmp delete mode 100644 win_installer/modpath.iss delete mode 100644 win_installer/readme_InnoSetup.txt diff --git a/win_installer/LargeLogo.bmp b/win_installer/LargeLogo.bmp deleted file mode 100644 index a2fbdaa9e12b9d789e86f1f49b657f85aa55a32d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52574 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 -// Homepage: http://www.legroom.net/software -// -// Script Function: -// Enable modification of system path directly from Inno Setup installers -// -// Instructions: -// Copy modpath.iss to the same directory as your setup script -// -// Add this statement to your [Setup] section -// ChangesEnvironment=yes -// -// Add this statement to your [Tasks] section -// You can change the Description or Flags, but the Name must be modifypath -// Name: modifypath; Description: &Add application directory to your system path; Flags: unchecked -// -// Add the following to the end of your [Code] section -// setArrayLength must specify the total number of dirs to be added -// Dir[0] contains first directory, Dir[1] contains second, etc. -// function ModPathDir(): TArrayOfString; -// var -// Dir: TArrayOfString; -// begin -// setArrayLength(Dir, 1) -// Dir[0] := ExpandConstant('{app}'); -// Result := Dir; -// end; -// #include "modpath.iss" -// ---------------------------------------------------------------------------- - -procedure ModPath(); -var - oldpath: String; - newpath: String; - pathArr: TArrayOfString; - aExecFile: String; - aExecArr: TArrayOfString; - i, d: Integer; - pathdir: TArrayOfString; -begin - - // Get array of new directories and act on each individually - pathdir := ModPathDir(); - for d := 0 to GetArrayLength(pathdir)-1 do begin - - // Modify WinNT path - if UsingWinNT() = true then begin - - // Get current path, split into an array - RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', oldpath); - oldpath := oldpath + ';'; - i := 0; - while (Pos(';', oldpath) > 0) do begin - SetArrayLength(pathArr, i+1); - pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1); - oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath)); - i := i + 1; - - // Check if current directory matches app dir - if pathdir[d] = pathArr[i-1] then begin - // if uninstalling, remove dir from path - if IsUninstaller() = true then begin - continue; - // if installing, abort because dir was already in path - end else begin - abort; - end; - end; - - // Add current directory to new path - if i = 1 then begin - newpath := pathArr[i-1]; - end else begin - newpath := newpath + ';' + pathArr[i-1]; - end; - end; - - // Append app dir to path if not already included - if IsUninstaller() = false then - newpath := newpath + ';' + pathdir[d]; - - // Write new path - RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', newpath); - - // Modify Win9x path - end else begin - - // Convert to shortened dirname - pathdir[d] := GetShortName(pathdir[d]); - - // If autoexec.bat exists, check if app dir already exists in path - aExecFile := 'C:\AUTOEXEC.BAT'; - if FileExists(aExecFile) then begin - LoadStringsFromFile(aExecFile, aExecArr); - for i := 0 to GetArrayLength(aExecArr)-1 do begin - if IsUninstaller() = false then begin - // If app dir already exists while installing, abort add - if (Pos(pathdir[d], aExecArr[i]) > 0) then - abort; - end else begin - // If app dir exists and = what we originally set, then delete at uninstall - if aExecArr[i] = 'SET PATH=%PATH%;' + pathdir[d] then - aExecArr[i] := ''; - end; - end; - end; - - // If app dir not found, or autoexec.bat didn't exist, then (create and) append to current path - if IsUninstaller() = false then begin - SaveStringToFile(aExecFile, #13#10 + 'SET PATH=%PATH%;' + pathdir[d], True); - - // If uninstalling, write the full autoexec out - end else begin - SaveStringsToFile(aExecFile, aExecArr, False); - end; - end; - - // Write file to flag modifypath was selected - // Workaround since IsTaskSelected() cannot be called at uninstall and AppName and AppId cannot be "read" in Code section - if IsUninstaller() = false then - SaveStringToFile(ExpandConstant('{app}') + '\uninsTasks.txt', WizardSelectedTasks(False), False); - end; -end; - -procedure CurStepChanged(CurStep: TSetupStep); -begin - if CurStep = ssPostInstall then - if IsTaskSelected('modifypath') then - ModPath(); -end; - -procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); -var - appdir: String; - selectedTasks: String; -begin - appdir := ExpandConstant('{app}') - if CurUninstallStep = usUninstall then begin - if LoadStringFromFile(appdir + '\uninsTasks.txt', selectedTasks) then - if Pos('modifypath', selectedTasks) > 0 then - ModPath(); - DeleteFile(appdir + '\uninsTasks.txt') - end; -end; - -function NeedRestart(): Boolean; -begin - if IsTaskSelected('modifypath') and not UsingWinNT() then begin - Result := True; - end else begin - Result := False; - end; -end; diff --git a/win_installer/readme_InnoSetup.txt b/win_installer/readme_InnoSetup.txt deleted file mode 100644 index c8bdd3392..000000000 --- a/win_installer/readme_InnoSetup.txt +++ /dev/null @@ -1,69 +0,0 @@ -InnoSetup Windows installer for the cppcheck --------------------------------------------- - -NOTE: This installer is OLD and not maintained anymore. See readme.txt for -information about new WiX installer! - -Windows installer for both command line cppcheck and for QT-based GUI. All -needed runtimes and libraries are installed. - -Command line cppccheck shortcuts are created to start cmd.exe in installation -folder. So when the user selects start menu/desktop icon he gets command prompt -in cppcheck folder. - -Get the InnoSetup from: -http://www.innosetup.com/ -Be sure to download the 'QuickStart Pack' as it installs some nice tools -like ISTool and preprocessor support. - -Files the installer needs: -/COPYING -/readme.txt -/AUTHORS -/src/Release/cppcheck.exe -/win_installer/icon.bmp -/win_installer/LargeLogo.bmp -/win_installer/ -/gui/release/gui.exe -/gui/cppcheck_de.qm -/gui/cppcheck_en.qm -/gui/cppcheck_fi.qm -/gui/cppcheck_pl.qm -/gui/cppcheck_ru.qm -/gui/cppcheck_se.qm - -NOTE: Remember to convert COPYING and AUTHORS to Windows EOL format! Otherwise -Windows Notepad (default viewer) can't show then properly. - -VS Runtime files: -Copy following files to same folder: -- Microsoft.VC90.CRT.manifest -- msvcp90.dll -- msvcr90.dll -and modify RuntimesFolder -macro in begin of cppcheck.iss to point to the -folder where files are. You can find runtime files from VS installation or from -net. - -NOTE: To make local installation of runtimes to work you must remove the -publicKeyToken="blahblah" -attribute from the manifest file. - -QT Libraries: -Visual Studio is used to build the GUI executable. And QT must be build with VS -also. When building QT make sure you build release targets! - -Copy following files to same RuntimesFolder than VS runtime files: -- QtCore4.dll -- QtGui4.dll -- QtXml4.dll - -Creating the installer executable: -#1 Open the ISTool and load cppcheck.iss -#2 Update the release version number: - - look for line "#define AppVersion" -#3 Check all files are present: - - from menu: Project / Verify files... -#4 Compile the installer - - from menu: Project / Compile Setup - -If compilation succeeds, the installer executable is created into /Build --folder. The filename is cppcheck-[version]-setup.exe.