Remove installation types and components

rcaelers · Dec 16, 2023 · f4af948 · f4af948
1 parent efe615b
commit f4af948
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/ui/app/toolkits/gtkmm/dist/windows/PrepareInnoSetup.cmake b/ui/app/toolkits/gtkmm/dist/windows/PrepareInnoSetup.cmake
@@ -8,7 +8,7 @@ foreach(file ${FILES64BIT})
   get_filename_component(file ${file} NAME)
   set(flags "ignoreversion restartreplace uninsrestartdelete")
   if (${file} MATCHES "applet.*\\.dll$")
-    set(flags "${flags} regserver; Components: applet; Check: IsAdmin")
+    set(flags "${flags} regserver; Check: IsAdmin")
   endif()
   file(APPEND ${LIBS_ISS} "Source: \"${INSTALL_WIN_PATH}\\${BINDIR}\\${file}\"; DestDir: \"{app}\\${BINDIR}\"; Flags: ${flags};\n")
 endforeach()
@@ -19,7 +19,7 @@ foreach(file ${FILES32BIT})
   get_filename_component(file ${file} NAME)
   set(flags "ignoreversion restartreplace uninsrestartdelete 32bit")
   if (${file} MATCHES "applet.*\\.dll$")
-    set(flags "${flags} regserver; Components: applet; Check: IsAdmin")
+    set(flags "${flags} regserver; Check: IsAdmin")
   endif()
   file(APPEND ${LIBS_ISS} "Source: \"${INSTALL_WIN_PATH}\\${BINDIR32}\\${file}\"; DestDir: \"{app}\\${BINDIR32}\"; Flags: ${flags};\n")
 endforeach()

diff --git a/ui/app/toolkits/gtkmm/dist/windows/setup.iss.in b/ui/app/toolkits/gtkmm/dist/windows/setup.iss.in
@@ -41,15 +41,6 @@ SignTool={#SignTool}
 SignedUninstaller=yes
 #endif
 
-[Types]
-Name: "full"; Description: "Full installation"
-;;Name: "compact"; Description: "Compact installation (excludes DBus runtime)"
-
-[Components]
-Name: "main"; Description: "Main Files"; Types: full; Flags: fixed
-Name: "dbus"; Description: "D-BUS Runtime Environment"; Types: full
-Name: "applet"; Description: "Windows Taskbar applet"; Types: full
-
 [Tasks]
 Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional tasks:"
 Name: "startupmenu"; Description: "Start Workrave when Windows starts"; GroupDescription: "Additional tasks:"
@@ -59,9 +50,9 @@ Name: "autoupdate"; Description: "Automatically check for updates"; GroupDescrip
 Source: "@INSTALL_WIN_PATH@\dist\libzapper-0.dll"; DestDir: "{app}";
 Source: "@INSTALL_WIN_PATH@\etc\*.*"; DestDir: "{app}\etc"; Flags: ignoreversion recursesubdirs;
 Source: "@INSTALL_WIN_PATH@\bin\harpoon64.dll"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs restartreplace uninsrestartdelete;
-Source: "@INSTALL_WIN_PATH@\bin\workrave-applet64.dll"; DestDir: "{app}\bin"; Flags: ignoreversion restartreplace uninsrestartdelete regserver; Components: applet; Check: IsAdmin
+Source: "@INSTALL_WIN_PATH@\bin\workrave-applet64.dll"; DestDir: "{app}\bin"; Flags: ignoreversion restartreplace uninsrestartdelete regserver; Check: IsAdmin
 Source: "@INSTALL_WIN_PATH@\bin\workrave.exe"; DestDir: "{app}\bin"; DestName: "Workrave.exe"; Flags: ignoreversion;
-Source: "@INSTALL_WIN_PATH@\bin\gdbus.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: dbus;
+Source: "@INSTALL_WIN_PATH@\bin\gdbus.exe"; DestDir: "{app}\bin"; Flags: ignoreversion;
 Source: "@INSTALL_WIN_PATH@\lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs
 Source: "@INSTALL_WIN_PATH@\share\images\*.png"; DestDir: "{app}\share\images\"; Flags: ignoreversion recursesubdirs
 Source: "@INSTALL_WIN_PATH@\share\images\*.svg"; DestDir: "{app}\share\images\"; Flags: ignoreversion recursesubdirs

diff --git a/ui/app/toolkits/qt/dist/windows/PrepareInnoSetup.cmake b/ui/app/toolkits/qt/dist/windows/PrepareInnoSetup.cmake
@@ -8,7 +8,7 @@ foreach(file ${FILES64BIT})
   get_filename_component(file ${file} NAME)
   set(flags "ignoreversion restartreplace uninsrestartdelete")
   if (${file} MATCHES "applet.*\\.dll$")
-    set(flags "${flags} regserver; Components: applet; Check: IsAdmin")
+    set(flags "${flags} regserver; Check: IsAdmin")
   endif()
   file(APPEND ${LIBS_ISS} "Source: \"${INSTALL_WIN_PATH}\\${BINDIR}\\${file}\"; DestDir: \"{app}\\${BINDIR}\"; Flags: ${flags};\n")
 endforeach()
@@ -19,7 +19,7 @@ foreach(file ${FILES32BIT})
   get_filename_component(file ${file} NAME)
   set(flags "ignoreversion restartreplace uninsrestartdelete 32bit")
   if (${file} MATCHES "applet.*\\.dll$")
-    set(flags "${flags} regserver; Components: applet; Check: IsAdmin")
+    set(flags "${flags} regserver; Check: IsAdmin")
   endif()
   file(APPEND ${LIBS_ISS} "Source: \"${INSTALL_WIN_PATH}\\${BINDIR32}\\${file}\"; DestDir: \"{app}\\${BINDIR32}\"; Flags: ${flags};\n")
 endforeach()