Revert CpuArch

Signed-off-by: Vadym Hrynchyshyn <[email protected]>
vadimgrn · Sep 19, 2024 · 7d2f33c · 7d2f33c
1 parent b2de21a
commit 7d2f33c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/userspace/innosetup/innosetup.vcxproj b/userspace/innosetup/innosetup.vcxproj
@@ -65,35 +65,35 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
     <NMakeOutput>
     </NMakeOutput>
-    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <NMakeCleanCommandLine>del /F /Q $(SolutionDir)$(Platform)\$(Configuration)\USBip-*-$(Configuration).exe</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
     <NMakeOutput />
-    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <NMakeCleanCommandLine>del /F /Q $(SolutionDir)$(Platform)\$(Configuration)\USBip-*-$(Configuration).exe</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
     <NMakeOutput>
     </NMakeOutput>
-    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <NMakeCleanCommandLine>del /F /Q $(SolutionDir)$(Platform)\$(Configuration)\USBip-*-$(Configuration).exe</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeBuildCommandLine>
     <NMakeOutput />
-    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>$(InnoSetupCompiler) /DSolutionDir=$(SolutionDir) /DPlatform=$(Platform) /DConfiguration=$(Configuration) /DCpuArch=$(PROCESSOR_ARCHITECTURE) /DExePath=$(SolutionDir)$(Platform)\$(Configuration)\usbip.exe /DGuiExePath=$(SolutionDir)$(Platform)\$(Configuration)\wusbip.exe /DVCToolsRedistInstallDir="$(VCToolsRedistInstallDir)" setup.iss</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <NMakeCleanCommandLine>del /F /Q $(SolutionDir)$(Platform)\$(Configuration)\USBip-*-$(Configuration).exe</NMakeCleanCommandLine>

diff --git a/userspace/innosetup/setup.iss b/userspace/innosetup/setup.iss
@@ -20,6 +20,10 @@
         #error Use option /DConfiguration=<cfg>
 #endif
 
+#ifndef CpuArch
+        #error Use option /DCpuArch=<ARCH>
+#endif
+
 #ifdef ExePath
         #define BuildDir AddBackslash(ExtractFilePath(ExePath))
 #else
@@ -141,7 +145,7 @@ Filename: {tmp}\{#VCToolsRedistExe}; Parameters: "/quiet /norestart"; Tasks: vcr
 Filename: {sys}\certutil.exe; Parameters: "-f -p ""{#CertPwd}"" -importPFX root ""{tmp}\{#CertFile}"" FriendlyName=""{#CertName}"""; Flags: runhidden
 
 Filename: {cmd}; Parameters: "/c mklink classfilter.exe devnode.exe"; WorkingDir: "{app}"; Flags: runhidden; Components: client
-Filename: {app}\classfilter.exe; Parameters: "install {tmp}\{#FilterDriver}.inf DefaultInstall.NT{#Platform}"; Flags: runhidden; Components: client
+Filename: {app}\classfilter.exe; Parameters: "install {tmp}\{#FilterDriver}.inf DefaultInstall.NT{#CpuArch}"; Flags: runhidden; Components: client
 
 Filename: {app}\devnode.exe; Parameters: "install {tmp}\{#UdeDriver}.inf {#CLIENT_HWID}"; Flags: runhidden; Components: client
 
@@ -152,7 +156,7 @@ Filename: {app}\devnode.exe; Parameters: "remove {#CLIENT_HWID} root"; Flags: ru
 ; FIXME: usbip2_ude service is not deleted on Win10 version 1809
 Filename: {cmd}; Parameters: "/c FOR /f %P IN ('findstr /M /L ""{#CLIENT_HWID}"" {win}\INF\oem*.inf') DO {sys}\pnputil.exe /delete-driver %~nxP /uninstall"; Flags: runhidden
 
-Filename: {app}\classfilter.exe; Parameters: "uninstall .\{#FilterDriver}.inf DefaultUninstall.NT{#Platform}"; Flags: runhidden
+Filename: {app}\classfilter.exe; Parameters: "uninstall .\{#FilterDriver}.inf DefaultUninstall.NT{#CpuArch}"; Flags: runhidden
 Filename: {cmd}; Parameters: "/c del /F ""{app}\classfilter.exe"""; Flags: runhidden
 
 Filename: {sys}\certutil.exe; Parameters: "-f -delstore root ""{#CertName}"""; Flags: runhidden