Merge pull request BOINC#5927 from BOINC/vko_installer_cleanup_for_pr

[Windows][Installer] Clean-up installer project
Vulpine05 · Nov 30, 2024 · 9d73abf · 9d73abf
2 parents 7cc54fc + 9247be1
commit 9d73abf
Show file tree

Hide file tree

Showing 36 changed files with 182 additions and 736 deletions.
diff --git a/clientsetup/win/CACCConfigMd5sum.cpp b/clientsetup/win/CACCConfigMd5sum.cpp
diff --git a/clientsetup/win/CACCConfigMd5sum.h b/clientsetup/win/CACCConfigMd5sum.h
diff --git a/clientsetup/win/CARestoreSetupState.cpp b/clientsetup/win/CARestoreSetupState.cpp
@@ -171,11 +171,14 @@ UINT CARestoreSetupState::OnExecution()
         if (strOverrideEnableUseByAllUsers.empty()) {
             if (_T("1") == strEnableUseByAllUsers) {
                 SetProperty( _T("ENABLEUSEBYALLUSERS"), _T("1") );
+                SetProperty(_T("ALLUSERS"), _T("1"));
             } else {
                 SetProperty( _T("ENABLEUSEBYALLUSERS"), _T("") );
+                SetProperty(_T("ALLUSERS"), _T(""));
             }
         } else {
             SetProperty( _T("ENABLEUSEBYALLUSERS"), strOverrideEnableUseByAllUsers );
+            SetProperty(_T("ALLUSERS"), strOverrideEnableUseByAllUsers);
         }
     }
 
@@ -194,6 +197,10 @@ UINT CARestoreSetupState::OnExecution()
         SetProperty( _T("DATADIR"), strDataDirectory );
     }
 
+    // Check if we are upgrading
+    if (IsUpgrading()) {
+        SetProperty(_T("IS_MAJOR_UPGRADE"), _T("Yes"));
+    }
     return ERROR_SUCCESS;
 }
 

diff --git a/clientsetup/win/CAShutdownUD.cpp b/clientsetup/win/CAShutdownUD.cpp
diff --git a/clientsetup/win/CAShutdownUD.h b/clientsetup/win/CAShutdownUD.h
diff --git a/clientsetup/win/boinccas.def b/clientsetup/win/boinccas.def
@@ -16,7 +16,6 @@ EXPORTS
 	ShutdownBOINC
 	ShutdownBOINCManager
 	ShutdownBOINCScreensaver
-	ShutdownUD
 	GrantBOINCAdminsRights
 	GrantBOINCAdminsVirtualBoxRights
 	GrantBOINCUsersRights
@@ -38,7 +37,6 @@ EXPORTS
 	ValidateRebootRequest
 	SaveExecutionState
 	RestoreExecutionState
-	CCConfigMd5sum
 	CreateProjectInitFile
 	CreateAcctMgrLoginFile
 	RestorePermissionBOINCData