99.9% or first release

add release zipper fix and clear cachedpdb makefunc np error fire to runtimeError
bdsx · Jan 13, 2021 · 6d702cb · 6d702cb
1 parent ce262a5
commit 6d702cb
Show file tree

Hide file tree

Showing 19 changed files with 413 additions and 266 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.vs
 bin
-/release/bin
-/release-zip
+/release
 /bdsx.zip
 /downloaded-bds
 /bdsx/buildtime.h

diff --git a/INSTALL/install.bat b/INSTALL/install.bat
@@ -5,16 +5,24 @@ set solutiondir=%~3
 if "%config%" == "Debug" (
 	set _debug=_debug
 	set d=d
-)
-
+) 
 call :copydll "%solutiondir%..\bdsx\bedrock_server"
+if "%config%" == "Release" call :zip
 goto :eof
 
 :copydll
-if not exist "%~1" mkdir "%~1"
+if not exist "%~1\mods" mkdir "%~1\mods"
 copy "%outdir%bdsx.dll" "%~1\mods\bdsx.dll"
 copy "%outdir%bdsx.pdb" "%~1\mods\bdsx.pdb"
 copy "%outdir%Chakra.dll" "%~1\Chakra.dll"
 copy "%outdir%ChakraCore.dll" "%~1\ChakraCore.dll"
 copy "%solutiondir%INSTALL\dbghelp.dll" "%~1\dbghelp.dll"
 EXIT /B 0
+
+:zip
+call "..\bdsx\version.bat"
+call :copydll "%solutiondir%release\bdsx-core"
+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" "%solutiondir%release\bdsx-core-%BDSX_CORE_VERSION%.zip"
+EXIT /B 0
diff --git a/README.md b/README.md
@@ -8,21 +8,17 @@ It's the core for [bdsx](https://github.com/karikera/bdsx)
 * Requirement
 [Visual Studio 2019](https://visualstudio.microsoft.com/)  
 [Visual Studio Code](https://code.visualstudio.com/)  
-[NASM](https://www.nasm.us/) & Set PATH - It's needed by node-chakracore  
-[Python2.x](https://www.python.org/downloads/release/python-2718/) & Set PATH - It's needed by node-chakracore  
+[NASM](https://www.nasm.us/) & Set PATH - required by node-chakracore  
+[Python2.x](https://www.python.org/downloads/release/python-2718/) & Set PATH - required by node-chakracore  
 
 1. Clone bdsx-core, bdsx, ken(ken is a personal library project)  
 **[parent directory]**  
 ├ ken (https://github.com/karikera/ken)  
-├ bdsx-core (https://github.com/karikera/bdsx-core)  
-└ bdsx (https://github.com/karikera/bdsx)
+└ bdsx-core (https://github.com/karikera/bdsx-core)  
 
 2. Update git submodules.
 
 3. Build bdsx.sln with Visual Studio 2019.
 
-## Outputs
-* [parent directory]/bdsx/bedrock_server/ChakraCore.dll
-* [parent directory]/bdsx/bedrock_server/Chakra.dll
-* [parent directory]/bdsx/mods/bdsx.dll
-* [parent directory]/bdsx/mods/bdsx.pdb
+## Release Build Outputs
+* [parent directory]/bdsx-core/release/bdsx-core.zip
diff --git a/bdsx-core.sln b/bdsx-core.sln
@@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRGame", "..\ken\KRGame\KRG
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "empolyfill", "..\ken\empolyfill\empolyfill.vcxproj", "{C41350BC-2FC5-4346-8ADE-328E13CFC60D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRApp", "..\ken\KRApp\KRApp.vcxproj", "{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRSound", "..\ken\KRSound\KRSound.vcxproj", "{179C15FF-42C0-4D89-B1C9-3F47CF571D6B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "COPY_DLL", "..\ken\KRTool\COPY_DLL\COPY_DLL.vcxproj", "{F476FE60-4037-4045-8495-D744E325192A}"
@@ -109,14 +107,6 @@ Global
 		{C41350BC-2FC5-4346-8ADE-328E13CFC60D}.Release|x64.Build.0 = ReleaseStatic|x64
 		{C41350BC-2FC5-4346-8ADE-328E13CFC60D}.Release|x86.ActiveCfg = Release|Win32
 		{C41350BC-2FC5-4346-8ADE-328E13CFC60D}.Release|x86.Build.0 = Release|Win32
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Debug|x64.ActiveCfg = DebugStatic|x64
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Debug|x64.Build.0 = DebugStatic|x64
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Debug|x86.ActiveCfg = Debug|Win32
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Debug|x86.Build.0 = Debug|Win32
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Release|x64.ActiveCfg = ReleaseStatic|x64
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Release|x64.Build.0 = ReleaseStatic|x64
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Release|x86.ActiveCfg = Release|Win32
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5}.Release|x86.Build.0 = Release|Win32
 		{179C15FF-42C0-4D89-B1C9-3F47CF571D6B}.Debug|x64.ActiveCfg = DebugStatic|x64
 		{179C15FF-42C0-4D89-B1C9-3F47CF571D6B}.Debug|x64.Build.0 = DebugStatic|x64
 		{179C15FF-42C0-4D89-B1C9-3F47CF571D6B}.Debug|x86.ActiveCfg = Debug|Win32
@@ -168,7 +158,6 @@ Global
 		{812683F9-452D-4EC6-B881-5A4D5F76457C} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{7D217B01-1887-4BF5-AE67-C4CADD37F30E} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{C41350BC-2FC5-4346-8ADE-328E13CFC60D} = {723F917F-0072-4B76-ABB1-3336381F001A}
-		{DE83E736-47AC-475F-9DB8-8DDF22B70BF5} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{179C15FF-42C0-4D89-B1C9-3F47CF571D6B} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{F476FE60-4037-4045-8495-D744E325192A} = {812683F9-452D-4EC6-B881-5A4D5F76457C}
 	EndGlobalSection

diff --git a/bdsx/bdsx.aps b/bdsx/bdsx.aps
diff --git a/bdsx/bdsx.rc b/bdsx/bdsx.rc
@@ -3,6 +3,7 @@
 #pragma code_page(65001)
 
 #include "resource.h"
+#include "gen/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +16,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// 한국어(대한민국) resources
+// Korean (Korea) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
@@ -52,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION BDSX_CORE_VERSION_RES
+ PRODUCTVERSION BDSX_CORE_VERSION_RES
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,13 +70,13 @@ BEGIN
         BLOCK "041204b0"
         BEGIN
             VALUE "CompanyName", "rua.kr"
-            VALUE "FileDescription", "Bedrock Dedicated Server eXtender"
-            VALUE "FileVersion", "1.0.0.1"
+            VALUE "FileDescription", "BDSX Core"
+            VALUE "FileVersion", BDSX_CORE_VERSION
             VALUE "InternalName", "bdsx.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "bdsx.dll"
-            VALUE "ProductName", "BDS-X"
-            VALUE "ProductVersion", "1.0.0.1"
+            VALUE "ProductName", "BDSX Core"
+            VALUE "ProductVersion", BDSX_CORE_VERSION
         END
     END
     BLOCK "VarFileInfo"
@@ -84,7 +85,7 @@ BEGIN
     END
 END
 
-#endif    // 한국어(대한민국) resources
+#endif    // Korean (Korea) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

diff --git a/bdsx/bdsx.vcxproj b/bdsx/bdsx.vcxproj
@@ -195,6 +195,38 @@ echo #define BUILD_TIME "%25date%-%time2:.=%"&gt;"gen/buildtime.h"</Command>
   <ItemGroup>
     <MASM Include="getout.asm" />
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="version.bat">
+      <FileType>Document</FileType>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gen\version.h;$(SolutionDir)..\bdsx\bdsx\version.json</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">gen\version.h;$(SolutionDir)..\bdsx\bdsx\version.json</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gen\version.h;$(SolutionDir)..\bdsx\bdsx\version.json</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">@call "%(Identity)"
+
+@set resver=%25BDSX_CORE_VERSION:.=,% 
+@echo #define BDSX_CORE_VERSION "%25BDSX_CORE_VERSION%"&gt;gen\version.h
+@echo #define BDSX_CORE_VERSION_RES %resver%&gt;&gt;gen\version.h
+@echo {"coreVersion":"%25BDSX_CORE_VERSION%"}&gt;"$(SolutionDir)..\bdsx\bdsx\version.json"
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">@call "%(Identity)"
+
+@set resver=%25BDSX_CORE_VERSION:.=,% 
+@echo #define BDSX_CORE_VERSION "%25BDSX_CORE_VERSION%"&gt;gen\version.h
+@echo #define BDSX_CORE_VERSION_RES %resver%&gt;&gt;gen\version.h
+@echo {"coreVersion":"%25BDSX_CORE_VERSION%"}&gt;"$(SolutionDir)..\bdsx\bdsx\version.json"
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">@call "%(Identity)"
+
+@set resver=%25BDSX_CORE_VERSION:.=,% 
+@echo #define BDSX_CORE_VERSION "%25BDSX_CORE_VERSION%"&gt;gen\version.h
+@echo #define BDSX_CORE_VERSION_RES %resver%&gt;&gt;gen\version.h
+@echo {"coreVersion":"%25BDSX_CORE_VERSION%"}&gt;"$(SolutionDir)..\bdsx\bdsx\version.json"
+</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(identity)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'">%(identity)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(identity)</Message>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />

diff --git a/bdsx/bdsx.vcxproj.filters b/bdsx/bdsx.vcxproj.filters
@@ -52,4 +52,7 @@
   <ItemGroup>
     <MASM Include="getout.asm" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="version.bat" />
+  </ItemGroup>
 </Project>