fix: Adjust GenerateUnoSplash targets to have proper inputs for bette…

…r incrementality
unoplatform · Jun 10, 2024 · 3e3e54f · 3e3e54f
1 parent c498458
commit 3e3e54f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/src/.nuspec/Uno.Resizetizer.android.targets b/src/.nuspec/Uno.Resizetizer.android.targets
@@ -3,6 +3,7 @@
 			Name="GenerateUnoSplashAndroid"
 			BeforeTargets="ProcessUnoSplashScreens"
 			Condition=" '@(UnoSplashScreen)' != '' "
+			Inputs="@(UnoSplashScreen)"
 			Outputs="$(_UnoSplashStampFile)">
 
 		<CallTarget Targets="GenerateUnoSplashScreens" />
@@ -12,6 +13,8 @@
 				IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
 				UnoSplashScreen="@(UnoSplashScreen)"
 		/>
+
+		<CallTarget Targets="PostGenerateUnoSplashScreens" />
 	</Target>
 
 	<!-- ProcessUnoSplashScreens must run at design time to avoid interactions with the `.R` generation on Android -->
@@ -46,4 +49,4 @@
             </LibraryResourceDirectories>
 		</ItemGroup>
 	</Target>
-</Project>
+</Project>
diff --git a/src/.nuspec/Uno.Resizetizer.apple.targets b/src/.nuspec/Uno.Resizetizer.apple.targets
@@ -3,7 +3,7 @@
 			Name="GenerateUnoSplashApple"
 			BeforeTargets="ProcessUnoSplashScreens"
 			Condition="'$(DesignTimeBuild)' != 'True' And '@(UnoSplashScreen)' != ''"
-			Outputs="$(_UnoSplashStampFile)">
+			Outputs="$(_UnoSplashStampFile)"> <!-- TODO: Specify Inputs on this target -->
 
 		<CallTarget Targets="GenerateUnoSplashScreens" />
 
@@ -27,6 +27,8 @@
 				IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
 				PlistName="UnoInfo.plist"
 				Storyboard="$(_UnoIntermediateSplashScreenFile)"/>
+
+		<CallTarget Targets="PostGenerateUnoSplashScreens" />
 	</Target>
 
 	<Target Name="ProcessUnoSplashScreens"
@@ -84,4 +86,4 @@
 				SessionId="$(BuildSessionId)"
 				Files="@(_UnoImagesToCopyToBuildServer)"/>
 	</Target>
-</Project>
+</Project>
diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
@@ -449,7 +449,7 @@
 		</GetUnoAssetPath_v0>
 	</Target>
 
-	<!-- This target is meant to be called by platform specific splash screen targets -->
+	<!-- This target is meant to be called by platform specific splash screen targets at its beginning -->
 	<Target Name="GenerateUnoSplashScreens"
 			Condition="'@(UnoSplashScreen)' != ''">
 
@@ -459,6 +459,12 @@
 		</ItemGroup>
 
 		<MakeDir Directories="$(IntermediateOutputPath)"/>
+	</Target>
+
+	<!-- This target is meant to be called by platform specific splash screen targets at its end -->
+	<Target Name="PostGenerateUnoSplashScreens"
+			Condition="'@(UnoSplashScreen)' != ''">
+
 		<!-- Stamp file for Outputs -->
 		<Touch Files="$(_UnoSplashStampFile)" AlwaysCreate="True"/>
 		<ItemGroup>

diff --git a/src/.nuspec/Uno.Resizetizer.wasm.targets b/src/.nuspec/Uno.Resizetizer.wasm.targets
@@ -3,10 +3,13 @@
 			Name="GenerateUnoSplashWasm"
 			BeforeTargets="ProcessUnoSplashScreens"
 			Condition="'$(DesignTimeBuild)' != 'true' AND $(OutputType) == 'Exe'"
+			Inputs="@(EmbeddedResource);@(UnoSplashScreen)"
 			Outputs="$(_UnoSplashStampFile)">
 
 		<CallTarget Targets="GenerateUnoSplashScreens" />
 
+		<MakeDir Directories="$(IntermediateOutputPath)"/>
+
 		<!--Wasm-->
 		<GenerateWasmSplashAssets_v0
 				IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
@@ -37,6 +40,12 @@
 			<EmbeddedResource Include="$(_UnoIntermediateAppManifestWasm)"
 							  Link="$(UserAppManifest)"/>
 		</ItemGroup>
+
+		<!-- Stamp file for Outputs -->
+		<Touch Files="$(_UnoSplashStampFile)" AlwaysCreate="True"/>
+		<ItemGroup>
+			<FileWrites Include="$(_UnoSplashStampFile)"/>
+		</ItemGroup>
 	</Target>
 
 	<Target Name="ProcessUnoSplashScreens"/>
@@ -74,4 +83,4 @@
 					 Link="$(WasmPWAManifestFile)"/>
 		</ItemGroup>
 	</Target>
-</Project>
+</Project>
diff --git a/src/.nuspec/Uno.Resizetizer.windows.skia.targets b/src/.nuspec/Uno.Resizetizer.windows.skia.targets
@@ -24,10 +24,11 @@
 			Name="GenerateUnoSplashWindowsSkia"			
 			BeforeTargets="ProcessUnoSplashScreens"
 			Condition="'$(DesignTimeBuild)' != 'True' And '@(UnoSplashScreen)' != ''"
+			Inputs="@(UnoSplashScreen)"
 			Outputs="$(_UnoSplashStampFile)">
 
 		<CallTarget Targets="GenerateUnoSplashScreens" />
-		
+
 		<!-- UWP / WinUI -->
 		<ItemGroup
 				Condition="'$(_UnoResizetizerIsWindowsAppSdk)' == 'True'">
@@ -38,6 +39,8 @@
 				IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
 				UnoSplashScreen="@(UnoWindowsSplash)"
 		/>
+
+		<CallTarget Targets="PostGenerateUnoSplashScreens" />
 	</Target>
 
 	<Target Name="ProcessUnoSplashScreens"
@@ -121,4 +124,4 @@
 			<FileWrites Include="$(_UnoManifestStampFile)"/>
 		</ItemGroup>
 	</Target>
-</Project>
+</Project>