Merge pull request #2515 from berryzplus/feature/fix_header_make

HeaderMakeをpythonスクリプトに移行する

Author: berryzplus

.github/workflows/build-sakura.yml

@@ -217,6 +217,7 @@ jobs:
           bw-output/
           tests*-coverage.xml
           tests*-googletest.xml
+          pytest-coverage.xml
           sonar-metadata.json
           github-event.json
 

sonar-project.properties

@@ -7,6 +7,6 @@ sonar.sourceEncoding=UTF-8
 
 sonar.sources=.
 
-sonar.exclusions=build/**,externals/**,tools/HeaderMake/**,tools/ppa_stub/**,tools/dll_plugin1/**,src/main/resources/**,src/test/**,tests*-*.xml,checkEncoding.py
+sonar.exclusions=build/**,externals/**,tools/ppa_stub/**,tools/dll_plugin1/**,src/main/resources/**,src/test/**,tests*-*.xml,checkEncoding.py
 
 sonar.python.version=3

src/main/cmake/HeaderMake.cmake

@@ -207,18 +207,19 @@ add_custom_target(generate_version_header
     "${CMAKE_BINARY_DIR}/version.h"
 )
 
-# Include HeaderMake.cmake for HeaderMake command
-include(${CMAKE_SOURCE_DIR}/src/main/cmake/HeaderMake.cmake)
-
 # Create a custom command for funccode_define generation
 add_custom_command(
   OUTPUT "${CMAKE_BINARY_DIR}/Funccode_define.h"
-  COMMAND ${HEADER_MAKE_EXECUTABLE}
+  COMMAND ${Python3_EXECUTABLE}
+    "${CMAKE_SOURCE_DIR}/src/main/py/header_make.py"
     -in=${CMAKE_SOURCE_DIR}/sakura_core/Funccode_x.hsrc
     -out=${CMAKE_BINARY_DIR}/Funccode_define.h
     -mode=define
-  DEPENDS generate_header_make
+  DEPENDS
+    ${CMAKE_SOURCE_DIR}/src/main/py/header_make.py
+    ${CMAKE_SOURCE_DIR}/sakura_core/Funccode_x.hsrc
   COMMENT "Generating Funccode_define.h"
+  VERBATIM
 )
 
 # Create a custom target that depends on the generated file
@@ -230,13 +231,17 @@ add_custom_target(generate_funccode_define
 # Create a custom command for funccode_enum generation
 add_custom_command(
   OUTPUT "${CMAKE_BINARY_DIR}/Funccode_enum.h"
-  COMMAND ${HEADER_MAKE_EXECUTABLE}
+  COMMAND ${Python3_EXECUTABLE}
+    "${CMAKE_SOURCE_DIR}/src/main/py/header_make.py"
     -in=${CMAKE_SOURCE_DIR}/sakura_core/Funccode_x.hsrc
     -out=${CMAKE_BINARY_DIR}/Funccode_enum.h
     -mode=enum
     -enum=EFunctionCode
-  DEPENDS generate_header_make
+  DEPENDS
+    ${CMAKE_SOURCE_DIR}/src/main/py/header_make.py
+    ${CMAKE_SOURCE_DIR}/sakura_core/Funccode_x.hsrc
   COMMENT "Generating Funccode_enum.h"
+  VERBATIM
 )
 
 # Create a custom target that depends on the generated file

src/main/cmake/sakura.cmake

@@ -4,9 +4,6 @@
     <CMakeToolsSourceDir>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..\..\..\'))</CMakeToolsSourceDir>
     <CMakeToolsBuildDir>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..\..\..\build\$(Platform)\CMakeTools\'))</CMakeToolsBuildDir>
     <CMakeToolsPath>$([MSBuild]::NormalizePath('$(CMakeToolsBuildDir)', '.'))</CMakeToolsPath>
-    <HeaderMakeBuildDir>$([MSBuild]::NormalizePath('$(CMakeToolsBuildDir)', '.\HeaderMake\'))</HeaderMakeBuildDir>
-    <HeaderMakeBuildPath>$([MSBuild]::NormalizePath('$(HeaderMakeBuildDir)', '.'))</HeaderMakeBuildPath>
-    <HeaderMakeExe>$([MSBuild]::NormalizePath('$(CMakeToolsPath)', '.\bin\HeaderMake.exe'))</HeaderMakeExe>
     <VersionHeader>$(CMakeToolsBuildDir)version.h</VersionHeader>
     <FuncCodeDefine>$(CMakeToolsBuildDir)Funccode_define.h</FuncCodeDefine>
     <FuncCodeEnum>$(CMakeToolsBuildDir)Funccode_enum.h</FuncCodeEnum>

src/main/msbuild/cmake.props

@@ -9,17 +9,10 @@
   <Target Name="GenerateVersionHeader" Inputs="..\src\main\cmake\version.h.in" Outputs="$(VersionHeader)" DependsOnTargets="ConfigureCMakeTools" BeforeTargets="ResourceCompile;ClCompile">
     <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); &amp; '$(CMakeExe)' --build '$(CMakeToolsPath)' --config $(Configuration) --target generate_version_header -- /nologo&quot;" StdOutEncoding="UTF-8" ConsoleToMSBuild="true" />
   </Target>
-  <Target Name="ConfigureHeaderMake" Condition="!Exists('$(HeaderMakeBuildDir)CMakeCache.txt')" DependsOnTargets="GenerateVersionHeader">
-    <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); &amp; '$(CMakeExe)' --build '$(CMakeToolsPath)' --config $(Configuration) --target configure_header_make -- /nologo&quot;" StdOutEncoding="UTF-8" ConsoleToMSBuild="true" />
-  </Target>
-  <Target Name="GenerateHeaderMake" Condition="!Exists('$(HeaderMakeExe)')" DependsOnTargets="ConfigureHeaderMake">
-    <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); &amp; '$(CMakeExe)' --build '$(HeaderMakeBuildPath)' --config $(Configuration) -- /nologo &amp;&amp; &amp; '$(CMakeExe)' --install '$(HeaderMakeBuildPath)' --config $(Configuration)&quot;" StdOutEncoding="UTF-8" ConsoleToMSBuild="true" />
-    <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;&amp; '$(CMakeExe)' --build '$(CMakeToolsPath)' --config $(Configuration) --target generate_header_make -- /nologo &gt; $null&quot;" />
-  </Target>
-  <Target Name="GenerateFuncCodeDefine" Inputs="@(FuncCodeRes)" Outputs="$(FuncCodeDefine)" DependsOnTargets="GenerateHeaderMake" BeforeTargets="ResourceCompile">
+  <Target Name="GenerateFuncCodeDefine" Inputs="@(FuncCodeRes)" Outputs="$(FuncCodeDefine)" DependsOnTargets="ConfigureCMakeTools" AfterTargets="GenerateVersionHeader" BeforeTargets="ResourceCompile">
     <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); &amp; '$(CMakeExe)' --build '$(CMakeToolsPath)' --config $(Configuration) --target generate_funccode_define -- /nologo&quot;" StdOutEncoding="UTF-8" ConsoleToMSBuild="true" />
   </Target>
-  <Target Name="GenerateFuncCodeEnum" Inputs="@(FuncCodeRes)" Outputs="$(FuncCodeEnum)" DependsOnTargets="GenerateHeaderMake" BeforeTargets="ClCompile">
+  <Target Name="GenerateFuncCodeEnum" Inputs="@(FuncCodeRes)" Outputs="$(FuncCodeEnum)" DependsOnTargets="ConfigureCMakeTools" AfterTargets="GenerateVersionHeader" BeforeTargets="ClCompile">
     <Exec Command="pwsh -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command &quot;[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new($false); &amp; '$(CMakeExe)' --build '$(CMakeToolsPath)' --config $(Configuration) --target generate_funccode_enum -- /nologo&quot;" StdOutEncoding="UTF-8" ConsoleToMSBuild="true" />
   </Target>
   <Target Name="GenerateDarkModeLib" BeforeTargets="ClCompile">