1.0.13.1 - change the pdb cache system

bdsx · Apr 24, 2022 · 5ba8b1b · 5ba8b1b
1 parent 4348455
commit 5ba8b1b
Show file tree

Hide file tree

Showing 15 changed files with 442 additions and 875 deletions.
diff --git a/INSTALL/INSTALL.vcxproj b/INSTALL/INSTALL.vcxproj
@@ -127,12 +127,12 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(identity) "$(OutDir)" "$(Configuration)" "$(SolutionDir)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(identity) "$(OutDir)" "$(Configuration)" "$(SolutionDir)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">call %(identity) "$(OutDir)" "$(Configuration)" "$(SolutionDir)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;$(SolutionDir)..\bdsx\bedrock_server\pdbcachegen.exe;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;$(SolutionDir)..\bdsx\bedrock_server\pdbcachegen.exe;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">$(SolutionDir)..\bdsx\bedrock_server\ChakraCore.dll;$(SolutionDir)..\bdsx\bedrock_server\Chakra.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.dll;$(SolutionDir)..\bdsx\bedrock_server\VCRUNTIME140_1.pdb;$(SolutionDir)..\bdsx\bedrock_server\pdbcachegen.exe;%(Outputs)</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll;$(OutDir)pdbcachegen.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll;$(OutDir)pdbcachegen.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">$(OutDir)VCRUNTIME140_1.dll;$(OutDir)VCRUNTIME140_1.pdb;$(OutDir)ChakraCore.dll;$(OutDir)pdbcachegen.exe</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -142,6 +142,9 @@
     <ProjectReference Include="..\chakra2chakracore\chakra2chakracore.vcxproj">
       <Project>{77e07fd4-ed4b-4aaf-8b7a-d5751a742203}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\pdbcachegen\pdbcachegen.vcxproj">
+      <Project>{0db97edf-3343-4575-af19-0ef056d395b2}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/INSTALL/install.bat b/INSTALL/install.bat
@@ -3,13 +3,19 @@ set config=%~2
 set solutiondir=%~3
 
 call "..\bdsx\version.bat"
+set /p BDS_VERSION=<"../../bdsx/bdsx/version-bds.json"
+set BDS_VERSION=%BDS_VERSION:"=%
 
 if "%config%" == "Debug" (
 	set _debug=_debug
 	set d=d
 ) 
+
 call :copydll "%solutiondir%..\bdsx\bedrock_server"
-if "%config%" == "Release" call :zip
+if "%config%" == "Release" (
+	call :copydll "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%"
+	call :zip "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%"
+)
 goto :eof
 
 :copydll
@@ -18,11 +24,11 @@ copy "%outdir%Chakra.dll" "%~1\Chakra.dll"
 copy "%outdir%VCRUNTIME140_1.dll" "%~1\VCRUNTIME140_1.dll"
 copy "%outdir%VCRUNTIME140_1.pdb" "%~1\VCRUNTIME140_1.pdb"
 copy "%outdir%ChakraCore.dll" "%~1\ChakraCore.dll"
+copy "%outdir%pdbcachegen.exe" "%~1\pdbcachegen.exe"
 EXIT /B 0
 
 :zip
-call :copydll "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%"
 echo Zipping...
-if exist "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%.zip" del "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%.zip"
-call zip "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%" "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%.zip"
+if exist "%~1.zip" del "%~1.zip"
+call zip "%~1" "%~1.zip"
 EXIT /B 0
diff --git a/bdsx-core.sln b/bdsx-core.sln
@@ -38,6 +38,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", "INSTALL\INSTALL.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chakra2chakracore", "chakra2chakracore\chakra2chakracore.vcxproj", "{77E07FD4-ED4B-4AAF-8B7A-D5751A742203}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdbcachegen", "pdbcachegen\pdbcachegen.vcxproj", "{0DB97EDF-3343-4575-AF19-0EF056D395B2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -123,6 +125,12 @@ Global
 		{77E07FD4-ED4B-4AAF-8B7A-D5751A742203}.Release|x64.Build.0 = Release|x64
 		{77E07FD4-ED4B-4AAF-8B7A-D5751A742203}.ReleaseTest|x64.ActiveCfg = Release|x64
 		{77E07FD4-ED4B-4AAF-8B7A-D5751A742203}.ReleaseTest|x64.Build.0 = Release|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.Debug|x64.ActiveCfg = Debug|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.Debug|x64.Build.0 = Debug|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.Release|x64.ActiveCfg = Release|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.Release|x64.Build.0 = Release|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.ReleaseTest|x64.ActiveCfg = Release|x64
+		{0DB97EDF-3343-4575-AF19-0EF056D395B2}.ReleaseTest|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE