Merge pull request #24269 from ZehMatt/openrct2-data-build

Add a new target to copy relevant data and build g2.dat if needed

openrct2.proj

@@ -8,9 +8,6 @@
        - OPENRCT2_DESCRIBE
   -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <!-- Import custom build tasks -->
-  <Import Project="openrct2.targets" />
-
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
     <Platform Condition="'$(Platform)'==''">x64</Platform>
@@ -27,7 +24,6 @@
     <TargetDir>$(RootDir)bin\</TargetDir>
 
     <OutputExe>$(TargetDir)openrct2.exe</OutputExe>
-    <g2Output>$(TargetDir)data\g2.dat</g2Output>
 
     <!-- Set openrct2.sln properties -->
     <SlnProperties>$(SlnProperties);Platform=$(Platform)</SlnProperties>
@@ -55,10 +51,6 @@
     <ReplaysSha1>6061B53DE346BD853BB997E635AC7374B1A7D2F0</ReplaysSha1>
   </PropertyGroup>
 
-  <ItemGroup>
-    <g2Inputs Include="$(RootDir)resources\g2\*" />
-  </ItemGroup>
-
   <Target Name="DownloadLibs">
     <!-- libs -->
     <DownloadDependency Name="Libs"
@@ -75,7 +67,7 @@
     <Delete Files="@(CleanItems)" />
     <Delete Files="$(DependenciesCheckFile)" />
     <RemoveDir Directories="$(TargetDir)data" />
-    <MSBuild Projects="openrct2.sln" Targets="Clean" Properties="$(SlnProperties)" />
+    <MSBuild Projects="openrct2.sln" Targets="Clean" Properties="$(SlnProperties);IsSolutionBuild=true" />
   </Target>
 
   <Target Name="BeforeBuild" BeforeTargets="Build;Rebuild" DependsOnTargets="DownloadLibs">
@@ -84,12 +76,7 @@
       <BuildString Condition="'$(OPENRCT2_BRANCH)'!=''">$(BuildString) ($(OPENRCT2_BRANCH))</BuildString>
       <BuildString Condition="'$(OPENRCT2_DESCRIBE)'!=''">$(BuildString) ($(OPENRCT2_DESCRIBE))</BuildString>
     </PropertyGroup>
-    <ItemGroup>
-      <DataItems Include="$(RootDir)data\**\*" />
-    </ItemGroup>
     <Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" />
-    <Copy SourceFiles="@(CopyItems)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(DataItems)" DestinationFolder="$(TargetDir)data\%(RecursiveDir)" SkipUnchangedFiles="true" />
   </Target>
 
   <Target Name="Build">
@@ -97,24 +84,14 @@
       <SlnProperties>$(SlnProperties);Configuration=$(Configuration)</SlnProperties>
     </PropertyGroup>
     <Message Text="SlnProperties: $(SlnProperties)" />
-    <MSBuild Projects="openrct2.sln" Targets="Build" Properties="$(SlnProperties)" />
+    <MSBuild Projects="openrct2.sln" Targets="Build" Properties="$(SlnProperties);IsSolutionBuild=true" />
   </Target>
   <Target Name="Rebuild">
     <PropertyGroup>
       <SlnProperties>$(SlnProperties);Configuration=$(Configuration)</SlnProperties>
     </PropertyGroup>
     <Message Text="SlnProperties: $(SlnProperties)" />
-    <MSBuild Projects="openrct2.sln" Targets="Rebuild" Properties="$(SlnProperties)" />
+    <MSBuild Projects="openrct2.sln" Targets="Rebuild" Properties="$(SlnProperties);IsSolutionBuild=true" />
-  </Target>
-
-  <!-- Target to build g2.dat containing OpenRCT2 sprites -->
-  <!-- Only Arm64 machines will build g2.dat for Arm64 -->
-  <!-- Note: Arm64 machines can build for x86, x64 and Arm64 -->
-  <Target Name="g2" AfterTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)"
-          Condition="'$(TestConfig)'!='true' and ('$(Platform)'!='ARM64' or '$(PROCESSOR_ARCHITECTURE)'=='ARM64')">
-    <Message Text="Building g2.dat..." Importance="high" />
-    <Exec Command="&quot;$(OutputExe)&quot; sprite build &quot;$(g2Output)&quot; &quot;$(RootDir)resources\g2\sprites.json&quot;"
-          StandardOutputImportance="normal" />
   </Target>
 
   <!-- Target to download the title sequences -->
@@ -161,4 +138,8 @@
                         CheckFile="$(DependenciesCheckFile)"
                         OutputDirectory="$(TargetDir)testdata\replays" />
   </Target>
+    
+  <!-- Import custom build tasks -->
+  <Import Project="openrct2.targets" />
+  
 </Project>

openrct2.sln

@@ -7,16 +7,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenrct2", "src\openrct2
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-win", "src\openrct2-win\openrct2-win.vcxproj", "{7A9A57D5-7006-4208-A290-5491BA3C8808}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842}
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
+		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842}
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "test\tests\tests.vcxproj", "{62B020FA-E4FB-4C6E-B32A-DC999470F155}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842}
-		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
 		{7A9A57D5-7006-4208-A290-5491BA3C8808} = {7A9A57D5-7006-4208-A290-5491BA3C8808}
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
+		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842}
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
@@ -31,6 +31,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-cli", "src\openrct
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-data", "src\openrct2-data\openrct2-data.vcxproj", "{70EEED2D-2344-4F28-87B7-3EFC4E78B923}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7A9A57D5-7006-4208-A290-5491BA3C8808} = {7A9A57D5-7006-4208-A290-5491BA3C8808}
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
+		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842}
+		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|arm64 = Debug|arm64
@@ -134,6 +142,24 @@ Global
 		{B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32
 		{B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
 		{B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|arm64.ActiveCfg = Debug|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|arm64.Build.0 = Debug|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|Win32.Build.0 = Debug|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|x64.ActiveCfg = Debug|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|x64.Build.0 = Debug|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|arm64.ActiveCfg = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|arm64.Build.0 = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|Win32.ActiveCfg = Release|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|Win32.Build.0 = Release|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|x64.ActiveCfg = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|x64.Build.0 = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|arm64.ActiveCfg = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|arm64.Build.0 = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|Win32.ActiveCfg = Release|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|Win32.Build.0 = Release|Win32
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|x64.ActiveCfg = Release|x64
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,6 +170,7 @@ Global
 		{62B020FA-E4FB-4C6E-B32A-DC999470F155} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
+		{70EEED2D-2344-4F28-87B7-3EFC4E78B923} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AE225595-70B7-4580-92EF-6F2B461EBFC7}

openrct2.targets

@@ -329,4 +329,124 @@
       </Code>
     </Task>
   </UsingTask>
+  
+  <!-- Property Definitions with Default Values -->
+  <PropertyGroup>
+    <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
+    <OutDir Condition="'$(OutDir)' == ''">$(SolutionDir)bin\</OutDir>
+    
+    <!-- CLI Configuration -->
+    <CLIProjectName Condition="'$(CLIProjectName)' == ''">openrct2-cli</CLIProjectName>
+    <CLIProjectPath Condition="'$(CLIProjectPath)' == ''">$(SolutionDir)src\$(CLIProjectName)\$(CLIProjectName).vcxproj</CLIProjectPath>
+    <G2CLIPath Condition="'$(G2CLIPath)' == ''">$(OutDir)$(CLIProjectName).exe</G2CLIPath>
+
+    <!-- Data Configuration -->
+    <DataOutputPath Condition="'$(DataOutputPath)' == ''">$(OutDir)data\</DataOutputPath>
+    
+    <DataLanguagePath Condition="'$(DataLanguagePath)' == ''">$(SolutionDir)data\language\</DataLanguagePath>
+    <DataShadersPath Condition="'$(DataShadersPath)' == ''">$(SolutionDir)data\shaders\</DataShadersPath>
+    <DataScenarioPath Condition="'$(DataScenarioPath)' == ''">$(SolutionDir)data\scenario_patches\</DataScenarioPath>
+    <ResourcesG2Path Condition="'$(ResourcesG2Path)' == ''">$(SolutionDir)resources\g2\</ResourcesG2Path>
+    <G2InputFile Condition="'$(G2InputFile)' == ''">$(ResourcesG2Path)sprites.json</G2InputFile>
+    <DataOutputPath Condition="'$(DataOutputPath)' == ''">$(OutDir)data\</DataOutputPath>
+  </PropertyGroup>
+
+  <!-- File Group Definitions -->
+  <ItemGroup>
+    <G2Input Include="$(G2InputFile)" />
+    
+    <LanguageFiles Include="$(DataLanguagePath)**\*"
+                   Exclude="$(DataLanguagePath)*.bak;
+                             $(DataLanguagePath)*.tmp" />
+    
+    <ShaderFiles Include="$(DataShadersPath)**\*"
+                 Exclude="$(DataShadersPath)*.bak;
+                           $(DataShadersPath)*.tmp" />
+    
+    <ScenarioPatchFiles Include="$(DataScenarioPath)**\*"
+                        Exclude="$(DataScenarioPath)*.bak;
+                                  $(DataScenarioPath)*.tmp" />
+  </ItemGroup>
+
+  <!-- Target Implementations -->
+  <Target Name="CopyLanguageFiles"
+          AfterTargets="Build"
+          Inputs="@(LanguageFiles)"
+          Outputs="@(LanguageFiles->'$(DataOutputPath)language\%(RecursiveDir)%(Filename)%(Extension)')">
+
+    <MakeDir Directories="@(LanguageFiles->'$(DataOutputPath)language\%(RecursiveDir)')" />
+    
+    <Copy SourceFiles="@(LanguageFiles)"
+          DestinationFiles="@(LanguageFiles->'$(DataOutputPath)language\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="true"
+          Retries="3">
+      <Output TaskParameter="CopiedFiles" ItemName="CopiedLangFiles" />
+    </Copy>
+
+    <Message Text="Copied language file: %(CopiedLangFiles.RecursiveDir)%(CopiedLangFiles.Filename)%(CopiedLangFiles.Extension)"
+             Importance="high"
+             Condition="'@(CopiedLangFiles)' != ''" />
+  </Target>
+
+  <Target Name="CopyShaders"
+          AfterTargets="Build"
+          Inputs="@(ShaderFiles)"
+          Outputs="@(ShaderFiles->'$(DataOutputPath)shaders\%(RecursiveDir)%(Filename)%(Extension)')">
+
+    <MakeDir Directories="@(ShaderFiles->'$(DataOutputPath)shaders\%(RecursiveDir)')" />
+    
+    <Copy SourceFiles="@(ShaderFiles)"
+          DestinationFiles="@(ShaderFiles->'$(DataOutputPath)shaders\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="true"
+          Retries="3">
+      <Output TaskParameter="CopiedFiles" ItemName="CopiedShaderFiles" />
+    </Copy>
+
+    <Message Text="Copied shader: %(CopiedShaderFiles.RecursiveDir)%(CopiedShaderFiles.Filename)%(CopiedShaderFiles.Extension)"
+             Importance="high"
+             Condition="'@(CopiedShaderFiles)' != ''" />
+  </Target>
+
+  <Target Name="CopyScenarioPatches"
+          AfterTargets="Build"
+          Inputs="@(ScenarioPatchFiles)"
+          Outputs="@(ScenarioPatchFiles->'$(DataOutputPath)scenario_patches\%(RecursiveDir)%(Filename)%(Extension)')">
+
+    <MakeDir Directories="@(ScenarioPatchFiles->'$(DataOutputPath)scenario_patches\%(RecursiveDir)')" />
+    
+    <Copy SourceFiles="@(ScenarioPatchFiles)"
+          DestinationFiles="@(ScenarioPatchFiles->'$(DataOutputPath)scenario_patches\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="true"
+          Retries="3">
+      <Output TaskParameter="CopiedFiles" ItemName="CopiedScenarioFiles" />
+    </Copy>
+
+    <Message Text="Copied scenario patch: %(CopiedScenarioFiles.RecursiveDir)%(CopiedScenarioFiles.Filename)%(CopiedScenarioFiles.Extension)"
+             Importance="high"
+             Condition="'@(CopiedScenarioFiles)' != ''" />
+  </Target>
+
+  <Target Name="BuildG2"
+          AfterTargets="Build"
+          Inputs="@(G2Input)"
+          Outputs="$(DataOutputPath)g2.dat"
+          Condition="'$(TestConfig)' != 'true' and ('$(Platform)' != 'ARM64' or '$(PROCESSOR_ARCHITECTURE)' == 'ARM64')">
+
+    <MakeDir Directories="$(DataOutputPath)" />
+    
+    <Exec Command="&quot;$(G2CLIPath)&quot; sprite build &quot;$(DataOutputPath)g2.dat&quot; &quot;%(G2Input.FullPath)&quot;"
+          ConsoleToMSBuild="true"
+          IgnoreExitCode="false">
+      <Output TaskParameter="ConsoleOutput" PropertyName="G2BuildOutput" />
+    </Exec>
+
+    <Touch Files="$(DataOutputPath)g2.dat"
+           ForceTouch="true"
+           AlwaysCreate="true" />
+  </Target>
+  
+  <Target Name="g2" DependsOnTargets="BuildG2" />
 </Project>

src/openrct2-data/openrct2-data.vcxproj

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|arm64">
+      <Configuration>Debug</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLTCG|arm64">
+      <Configuration>ReleaseLTCG</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLTCG|Win32">
+      <Configuration>ReleaseLTCG</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLTCG|x64">
+      <Configuration>ReleaseLTCG</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|arm64">
+      <Configuration>Release</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{70eeed2d-2344-4f28-87b7-3efc4e78b923}</ProjectGuid>
+    <RootNamespace>openrct2-data</RootNamespace>
+    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+  </PropertyGroup>
+
+  <Import Project="..\..\openrct2.common.props" />
+
+  <PropertyGroup>
+    <TargetName>openrct2-data</TargetName>
+    <LibraryPath>$(SolutionDir)bin;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+
+  <Import Project="..\..\openrct2.targets" Condition="'$(IsSolutionBuild)' != 'true'" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>