Build: Introduce debug configurations without test signing

Signed-off-by: Dmitry Fleytman <[email protected]>
daynix · Apr 6, 2017 · 446daec · 446daec
1 parent 7abd2b9
commit 446daec
Show file tree

Hide file tree

Showing 10 changed files with 2,663 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.suo
 *.sdf
 Win*Debug
+Win*Debug_NoSign
 Win*Release
 *.opensdf
 *.ipch
@@ -10,7 +11,9 @@ Resource.aps
 Install
 Install_debug
 XP Debug
+XP Debug_NoSign
 XP Release
 XPDebug
+XPDebug_NoSign
 XPRelease
 x64
diff --git a/Tools/Installer/buildmsi.bat b/Tools/Installer/buildmsi.bat
@@ -3,11 +3,13 @@ SETLOCAL EnableExtensions EnableDelayedExpansion
 IF [%UsbDkVersion%] == [] SET UsbDkVersion=99.99.90
 IF [%UsbDkVersion%] == [".."] SET UsbDkVersion=99.99.90
 
+if [%1] EQU [NOSIGN] (SET DEBUG_CFG=Debug_NoSign) ELSE (SET DEBUG_CFG=Debug)
+
 pushd ..\..\Install_Debug\x86
 
 del *.msi *.wixobj *.wixpdb
 
-"C:\Program Files (x86)\WiX Toolset v3.8\bin\candle.exe" ..\..\Tools\Installer\UsbDkInstaller.wxs -out UsbDk_Debug.wixobj -dUsbDkVersion=%UsbDkVersion% -dConfig=Debug
+"C:\Program Files (x86)\WiX Toolset v3.8\bin\candle.exe" ..\..\Tools\Installer\UsbDkInstaller.wxs -out UsbDk_Debug.wixobj -dUsbDkVersion=%UsbDkVersion% -dConfig=%DEBUG_CFG%
 if !ERRORLEVEL! NEQ 0 exit /B 1
 "C:\Program Files (x86)\WiX Toolset v3.8\bin\light.exe" UsbDk_Debug.wixobj -out UsbDk_Debug_%UsbDkVersion%_x86.msi -sw1076
 if !ERRORLEVEL! NEQ 0 exit /B 1
@@ -18,7 +20,7 @@ pushd ..\..\Install_Debug\x64
 
 del *.msi *.wixobj *.wixpdb
 
-"C:\Program Files (x86)\WiX Toolset v3.8\bin\candle.exe" ..\..\Tools\Installer\UsbDkInstaller.wxs -out UsbDk_Debug.wixobj -dUsbDkVersion=%UsbDkVersion% -dConfig=Debug -dUsbDk64Bit=1
+"C:\Program Files (x86)\WiX Toolset v3.8\bin\candle.exe" ..\..\Tools\Installer\UsbDkInstaller.wxs -out UsbDk_Debug.wixobj -dUsbDkVersion=%UsbDkVersion% -dConfig=%DEBUG_CFG% -dUsbDk64Bit=1
 if !ERRORLEVEL! NEQ 0 exit /B 1
 "C:\Program Files (x86)\WiX Toolset v3.8\bin\light.exe" UsbDk_Debug.wixobj -out UsbDk_Debug_%UsbDkVersion%_x64.msi -sw1076
 if !ERRORLEVEL! NEQ 0 exit /B 1

diff --git a/UsbDk Package/UsbDk Package.vcxproj b/UsbDk Package/UsbDk Package.vcxproj
diff --git a/UsbDk.sln b/UsbDk.sln
diff --git a/UsbDk/UsbDk.vcxproj b/UsbDk/UsbDk.vcxproj
diff --git a/UsbDk/UsbDk.vcxproj.user b/UsbDk/UsbDk.vcxproj.user
@@ -30,4 +30,34 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP Release|Win32'">
     <SignMode>Off</SignMode>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug_NoSign|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug_NoSign|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug_NoSign|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug_NoSign|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug_NoSign|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug_NoSign|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug_NoSign|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug_NoSign|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP Debug_NoSign|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP Debug_NoSign|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
 </Project>
diff --git a/UsbDkController/UsbDkController.vcxproj b/UsbDkController/UsbDkController.vcxproj
diff --git a/UsbDkHelper/UsbDkHelper.vcxproj b/UsbDkHelper/UsbDkHelper.vcxproj
diff --git a/UsbDkInstHelper/UsbDkInstHelper.vcxproj b/UsbDkInstHelper/UsbDkInstHelper.vcxproj
diff --git a/buildAll.bat b/buildAll.bat
@@ -3,11 +3,12 @@
 SETLOCAL EnableExtensions EnableDelayedExpansion
 
 if [%1] EQU [MSIONLY] goto BUILD_MSI
+if [%2] EQU [NOSIGN] (SET DEBUG_CFG=Debug_NoSign) ELSE (SET DEBUG_CFG=Debug)
 
 del *.log
 
 for %%x in (Win7, Win8, Win8.1, Win10, XP) do (
-  for %%y in (Debug, Release) do (
+  for %%y in (%DEBUG_CFG%, Release) do (
     for %%z in (win32, x64) do (
       call tools\vs_run.bat UsbDk.sln /Rebuild "%%x %%y|%%z" /Out build%%y_%%x_%%z.log
       if !ERRORLEVEL! NEQ 0 exit /B 1
@@ -22,7 +23,7 @@ if [%1] EQU [NOMSI] goto NOMSI
 pushd Tools\Installer
 
 SET UsbDkVersion="%USBDK_MAJOR_VERSION%.%USBDK_MINOR_VERSION%.%USBDK_BUILD_NUMBER%"
-buildmsi.bat
+buildmsi.bat %2
 
 popd