#38: Refactored location of presets folder and added zadig_driver ske…

…leton folder. Updated solution and project to copy these to the build output location
OOPMan · Jul 26, 2022 · 334c83c · 334c83c
1 parent 747888f
commit 334c83c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/XBOFS.win.qt/XBOFS.win.qt.vcxproj b/XBOFS.win.qt/XBOFS.win.qt.vcxproj
@@ -109,10 +109,12 @@
       <QtRccFileName>qrc_%(Filename).cpp</QtRccFileName>
     </QtRcc>
     <PostBuildEvent>
-      <Command>set VCINSTALLDIR=$(VCInstallDir) &amp;&amp; cd $(OutputPath) &amp;&amp; $(QTDIR)\$(QtPathBinaries)\windeployqt --debug $(TargetFileName)
-del $(SolutionDir)\installer\packages\win.xbofs\data\xbofs.win.7z
-cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\archivegen $(SolutionDir)\installer\packages\win.xbofs\data\xbofs.win.7z  .
-cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\binarycreator -c $(SolutionDir)\installer\config\config.xml -p $(SolutionDir)\installer\packages $(SolutionDir)\installer\$(SolutionName).$(XBOFS_WIN_VERSION).debug.installer.exe </Command>
+      <Command>set VCINSTALLDIR=$(VCInstallDir)&amp;&amp; cd $(OutputPath) &amp;&amp; $(QTDIR)\$(QtPathBinaries)\windeployqt --debug $(TargetFileName)
+xcopy  /I /Y /E $(SolutionDir)zadig_presets $(OutputPath)zadig_presets
+xcopy  /I /Y /E $(SolutionDir)zadig_driver $(OutputPath)zadig_driver
+del $(SolutionDir)installer\packages\win.xbofs\data\xbofs.win.7z
+cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\archivegen $(SolutionDir)installer\packages\win.xbofs\data\xbofs.win.7z  .
+cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\binarycreator -c $(SolutionDir)installer\config\config.xml -p $(SolutionDir)installer\packages $(SolutionDir)installer\$(SolutionName).$(XBOFS_WIN_VERSION).installer.exe</Command>
     </PostBuildEvent>
     <CopyFileToFolders>
       <DestinationFolders>$(OutDir)Resources</DestinationFolders>
@@ -155,10 +157,12 @@ cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\bi
       <QtRccFileName>qrc_%(Filename).cpp</QtRccFileName>
     </QtRcc>
     <PostBuildEvent>
-      <Command>set VCINSTALLDIR=$(VCInstallDir) &amp;&amp; cd $(OutputPath) &amp;&amp; $(QTDIR)\$(QtPathBinaries)\windeployqt --release $(TargetFileName)
-del $(SolutionDir)\installer\packages\win.xbofs\data\xbofs.win.7z
-cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\archivegen $(SolutionDir)\installer\packages\win.xbofs\data\xbofs.win.7z  .
-cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\binarycreator -c $(SolutionDir)\installer\config\config.xml -p $(SolutionDir)\installer\packages $(SolutionDir)\installer\$(SolutionName).$(XBOFS_WIN_VERSION).installer.exe</Command>
+      <Command>set VCINSTALLDIR=$(VCInstallDir)&amp;&amp; cd $(OutputPath) &amp;&amp; $(QTDIR)\$(QtPathBinaries)\windeployqt --release $(TargetFileName)
+xcopy  /I /Y /E $(SolutionDir)zadig_presets $(OutputPath)zadig_presets
+xcopy  /I /Y /E $(SolutionDir)zadig_driver $(OutputPath)zadig_driver
+del $(SolutionDir)installer\packages\win.xbofs\data\xbofs.win.7z
+cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\archivegen $(SolutionDir)installer\packages\win.xbofs\data\xbofs.win.7z  .
+cd $(OutputPath) &amp;&amp; $(QTDIR)\..\..\Tools\QtInstallerFramework\4.1\bin\binarycreator -c $(SolutionDir)installer\config\config.xml -p $(SolutionDir)installer\packages $(SolutionDir)installer\$(SolutionName).$(XBOFS_WIN_VERSION).installer.exe</Command>
     </PostBuildEvent>
     <CopyFileToFolders>
       <DestinationFolders>$(OutDir)Resources</DestinationFolders>

diff --git a/XBOFS.win.sln b/XBOFS.win.sln
@@ -35,12 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B758C57A-D
 		docs\zadig.md = docs\zadig.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "presets", "presets", "{98CB9F55-4522-4F47-8C9F-79070A0C1464}"
-	ProjectSection(SolutionItems) = preProject
-		presets\madcatz_te2_zadig_preset.cfg = presets\madcatz_te2_zadig_preset.cfg
-		presets\razer_atrox_zadig_preset.cfg = presets\razer_atrox_zadig_preset.cfg
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBOFS.win", "XBOFS.win\XBOFS.win.vcxproj", "{E92A7135-2110-45FC-BEBD-D8207CF56D48}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7DB06674-1F4F-464B-8E1C-172E9587F9DC} = {7DB06674-1F4F-464B-8E1C-172E9587F9DC}
@@ -250,6 +244,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "first_run_guide", "first_ru
 		docs\images\first_run_guide\xbofs.win_first_run_10.png = docs\images\first_run_guide\xbofs.win_first_run_10.png
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "za_presets", "za_presets", "{52561621-A7AB-40F4-9294-4933CC26868A}"
+	ProjectSection(SolutionItems) = preProject
+		zadig_presets\madcatz_te2_zadig_preset.cfg = zadig_presets\madcatz_te2_zadig_preset.cfg
+		zadig_presets\razer_atrox_zadig_preset.cfg = zadig_presets\razer_atrox_zadig_preset.cfg
+		zadig_presets\victrix_pro_fs_preset.cfg = zadig_presets\victrix_pro_fs_preset.cfg
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_DLL|Win32 = Debug_DLL|Win32
@@ -596,7 +597,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B758C57A-D285-4991-96CF-8B166A4FE290} = {1E0515A5-B0AA-4821-90DE-C764A2C35AF2}
-		{98CB9F55-4522-4F47-8C9F-79070A0C1464} = {1E0515A5-B0AA-4821-90DE-C764A2C35AF2}
 		{CE152D17-B7D5-4ECA-9C6B-BFA86ACBFF75} = {F79DDA85-D1DA-43BB-ABB7-C9F7E415D0EB}
 		{B1F3B94A-4EC4-406E-9CBF-056E1EA03DE0} = {CE152D17-B7D5-4ECA-9C6B-BFA86ACBFF75}
 		{9AA0E745-1A0A-4700-8ECB-6A6DE9DBF8B9} = {F79DDA85-D1DA-43BB-ABB7-C9F7E415D0EB}
@@ -627,6 +627,7 @@ Global
 		{7640D5E7-A64B-4111-BD77-67D06CB2F1E9} = {ADD10A5F-41E1-4F1C-869D-FBBDECA4574A}
 		{4105BE91-8ADE-431F-BB64-A71048CF301C} = {ADD10A5F-41E1-4F1C-869D-FBBDECA4574A}
 		{22E13D1D-2BBC-4588-98FF-8A4B62DB5922} = {ADD10A5F-41E1-4F1C-869D-FBBDECA4574A}
+		{52561621-A7AB-40F4-9294-4933CC26868A} = {1E0515A5-B0AA-4821-90DE-C764A2C35AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B5964061-63A6-4D2B-9142-462BCF9B6748}

diff --git a/zadig_driver/madcatz_te2_xbo/README.txt b/zadig_driver/madcatz_te2_xbo/README.txt
@@ -0,0 +1 @@
+The driver created and installed by the Driver Manager will be placed here. Do not delete this directory!
diff --git a/zadig_driver/razer_atrox_xbo/README.txt b/zadig_driver/razer_atrox_xbo/README.txt
@@ -0,0 +1 @@
+The driver created and installed by the Driver Manager will be placed here. Do not delete this directory!
diff --git a/presets/madcatz_te2_zadig_preset.cfg → zadig_presets/madcatz_te2_zadig_preset.cfg b/presets/madcatz_te2_zadig_preset.cfg → zadig_presets/madcatz_te2_zadig_preset.cfg
diff --git a/presets/razer_atrox_zadig_preset.cfg → zadig_presets/razer_atrox_zadig_preset.cfg b/presets/razer_atrox_zadig_preset.cfg → zadig_presets/razer_atrox_zadig_preset.cfg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The driver created and installed by the Driver Manager will be placed here. Do not delete this directory!