Skip to content

Commit

Permalink
ci/windows: update Scopy installer
Browse files Browse the repository at this point in the history 
 - added options to select which components of Scopy to install
 - removed the need for administrator rights

Signed-off-by: Bindea Cristian <[email protected]>
  • Loading branch information
@bindea-cristian
bindea-cristian committed Sep 15, 2023
1 parent 3b3e79b commit 8b2462a
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 13 deletions.
1 change: 1 addition & 0 deletions core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if(${WITH_PYTHON})
set(Python_ADDITIONAL_VERSIONS 3)
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
set(PYTHON_VERSION python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
#set(PYTHON_VERSION ${PYTHON_VERSION} PARENT_SCOPE)
if(NOT Python3_FOUND)
set(WITH_PYTHON OFF)
message(STATUS "Python not found")
Expand Down
84 changes: 71 additions & 13 deletions windows/scopy-64.iss.cmakein
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ AllowNoIcons=yes
Compression=lzma
SolidCompression=yes
ArchitecturesInstallIn64BitMode=x64
DefaultDirName={pf}\{#AppDev}\{#AppName}
DefaultDirName={code:SetInstallLocation}
DefaultGroupName={#AppName}
AlwaysRestart=yes
DisableDirPage=no
MinVersion=6.2
PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
SetupIconFile="@SCOPY_ICON_ICO@"
WizardStyle=modern

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
Expand All @@ -52,10 +55,18 @@ Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"

[Code]
function SetInstallLocation(Param: string): string;
begin
if IsAdminLoggedOn then
Result := ExpandConstant('{pf}\{#AppDev}\{#AppName}')
else
Result := ExpandConstant('{sd}\{#AppDev}\{#AppName}');
end;

function isDriverInstalled(): Boolean;
begin
Result := True;
if not RegKeyExists(HKLM, 'Software\Analog Devices\{#AppName}\Settings') then
if not RegKeyExists(HKA, 'Software\Analog Devices\{#AppName}\Settings') then
begin
Result := False;
end;
Expand Down Expand Up @@ -187,7 +198,7 @@ var
begin
regPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#SetupSetting("AppId")}_is1');
installLocationString := '';
if not RegQueryStringValue(HKLM, regPath, 'InstallLocation', installLocationString) then
if not RegQueryStringValue(HKA, regPath, 'InstallLocation', installLocationString) then
RegQueryStringValue(HKCU, regPath, 'InstallLocation', installLocationString);
Result := installLocationString;
end;
Expand All @@ -199,7 +210,7 @@ var
begin
regPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#SetupSetting("AppId")}_is1');
uninstallerString := '';
if not RegQueryStringValue(HKLM, regPath, 'UninstallString', uninstallerString) then
if not RegQueryStringValue(HKA, regPath, 'UninstallString', uninstallerString) then
RegQueryStringValue(HKCU, regPath, 'UninstallString', uninstallerString);
Result := uninstallerString;
end;
Expand Down Expand Up @@ -242,6 +253,46 @@ begin
end;
end;

[Types]
Name: "full"; Description: "Full installation"
Name: "compact"; Description: "Compact installation"
Name: "custom"; Description: "Custom installation"; Flags: iscustom

[Components]
Name: "main"; Description: "Scopy"; Types: full compact custom; Flags: fixed
Name: "plugins"; Description: "Plugins"; Types: full; Flags: disablenouninstallwarning
Name: "plugins\m2kplugin"; Description: "M2K plugin"; Types: full; Flags: disablenouninstallwarning
Name: "plugins\swiotplugin"; Description: "SWIOT plugin"; Types: full; Flags: disablenouninstallwarning
Name: "plugins\regmapplugin"; Description: "Regmap plugin"; Types: full; Flags: disablenouninstallwarning
Name: "plugins\debuggerplugin"; Description: "Debugger plugin"; Types: full; Flags: disablenouninstallwarning
Name: "emu"; Description: "IIO Emulator"; Types: full; Flags: disablenouninstallwarning
Name: "debug"; Description: "Executable with console output"; Types: full; Flags: disablenouninstallwarning

[Files]
//Executables
Source: "C:\msys64\home\docker\scopy_x86_64\scopy.exe"; DestDir: "{app}"; Components: main; Flags: ignoreversion
Source: "C:\msys64\home\docker\scopy_x86_64\scopy-cl.exe"; DestDir: "{app}"; Components: debug; Flags: ignoreversion skipifsourcedoesntexist
Source: "C:\msys64\home\docker\iio-emu\build\iio-emu.exe"; DestDir: "{app}"; Components: emu; Flags: ignoreversion skipifsourcedoesntexist
//Folders
Source: "C:\msys64\home\docker\scopy_x86_64\decoders\*"; DestDir: "{app}\decoders"; Components: plugins\m2kplugin; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\drivers\*"; DestDir: "{app}\drivers"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\iconengines\*"; DestDir: "{app}\iconengines"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\imageformats\*"; DestDir: "{app}\imageformats"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\platforms\*"; DestDir: "{app}\platforms"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\printsupport\*"; DestDir: "{app}\printsupport"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\@PYTHON_VERSION@\*"; DestDir: "{app}\@PYTHON_VERSION@"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\resources\*"; DestDir: "{app}\resources"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist skipifsourcedoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\styles\*"; DestDir: "{app}\styles"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\translations\*"; DestDir: "{app}\translations"; Components: main; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist
//DLLs
Source: "C:\msys64\home\docker\scopy_x86_64\*.dll"; DestDir: "{app}"; Components: main; Flags: ignoreversion onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\qt.conf"; DestDir: "{app}"; Components: main; Flags: ignoreversion onlyifdoesntexist
//Plugins
Source: "C:\msys64\home\docker\scopy_x86_64\plugins\plugins\xmls\*"; DestDir: "{app}\plugins\plugins\xmls"; Components: plugins\regmapplugin; Flags: ignoreversion skipifsourcedoesntexist recursesubdirs createallsubdirs onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\plugins\plugins\libscopy-regmapplugin.dll"; DestDir: "{app}\plugins\plugins"; Components: plugins\regmapplugin; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\plugins\plugins\libscopy-debuggerplugin.dll"; DestDir: "{app}\plugins\plugins"; Components: plugins\debuggerplugin; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\plugins\plugins\libscopy-m2kplugin.dll"; DestDir: "{app}\plugins\plugins"; Components: plugins\m2kplugin; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist
Source: "C:\msys64\home\docker\scopy_x86_64\plugins\plugins\libscopy-swiot.dll"; DestDir: "{app}\plugins\plugins"; Components: plugins\swiotplugin; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
Expand All @@ -250,23 +301,30 @@ Name: "deletepreferences"; Description: Delete previous application preferences
Name: "drivers"; Description: Install drivers for ADALM2000; Check: not isDriverInstalled;
Name: "drivers_overwrite"; Description: Install drivers for ADALM2000; Check: isDriverInstalled; Flags: unchecked

[Files]
Source: "c:\msys64\home\docker\scopy_x86_64\*"; DestDir: "{app}"; Check: Is64BitInstallMode; Flags: ignoreversion recursesubdirs createallsubdirs

[Icons]
Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
Name: "{userdesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon

[InstallDelete]
Type: files; Name: "{userappdata}\ADI\Scopy.ini"; Tasks: deleteini
Type: files; Name: "{userappdata}\ADI\Preferences.ini"; Tasks: deletepreferences
Type: filesandordirs; Name: "{app}\decoders"; Check: not WizardIsComponentSelected('plugins\m2kplugin')
Type: files; Name: "{app}\plugins\plugins\libscopy-m2kplugin.dll"; Check: not WizardIsComponentSelected('plugins\m2kplugin')
Type: files; Name: "{app}\plugins\plugins\libscopy-swiot.dll"; Check: not WizardIsComponentSelected('plugins\swiotplugin')
Type: filesandordirs; Name: "{app}\plugins\plugins\xmls"; Check: not WizardIsComponentSelected('plugins\regmapplugin')
Type: files; Name: "{app}\plugins\plugins\libscopy-regmapplugin.dll"; Check: not WizardIsComponentSelected('plugins\regmapplugin')
Type: files; Name: "{app}\plugins\plugins\libscopy-debuggerplugin.dll"; Check: not WizardIsComponentSelected('plugins\debuggerplugin')
Type: files; Name: "{app}\iio-emu.exe"; Check: not WizardIsComponentSelected('emu')

[UninstallDelete]
Type: filesandordirs; Name: "{app}\decoders"

[Run]
Filename: "{app}\drivers\dpinst.exe"; Parameters: "/PATH ""{app}\drivers"" {param:dpinstflags|/F}" ; Flags: waituntilterminated; Tasks: drivers drivers_overwrite
Filename: "{app}\drivers\dpinst.exe"; Parameters: "/PATH ""{app}\drivers"" {param:dpinstflags|/F}" ; Verb: runas; Flags: waituntilterminated shellexec; Tasks: drivers drivers_overwrite; StatusMsg: "Installing ADALM2000/ADALM-PLUTO drivers..."

[Registry]
Root: HKLM; Subkey: "Software\Analog Devices"
Root: HKLM; Subkey: "Software\Analog Devices\{#AppName}"
Root: HKLM; Subkey: "Software\Analog Devices\{#AppName}\Settings"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
Root: HKLM; Subkey: "Software\Analog Devices\{#AppName}\Settings"; ValueType: string; ValueName: "InstallVersion"; ValueData: {#DriverVersion}
Root: HKA; Subkey: "Software\Analog Devices"; Flags: uninsdeletekey
Root: HKA; Subkey: "Software\Analog Devices\{#AppName}"; Flags: uninsdeletekey
Root: HKA; Subkey: "Software\Analog Devices\{#AppName}\Settings"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"; Flags: uninsdeletekey
Root: HKA; Subkey: "Software\Analog Devices\{#AppName}\Settings"; ValueType: string; ValueName: "InstallVersion"; ValueData: {#DriverVersion}; Flags: uninsdeletekey

0 comments on commit 8b2462a

Please sign in to comment.