svn commit: r1933332 - in subversion/branches/1.15.x: . build/generator/templates build/win32

Author: svn-role
Date: Sun Apr 26 04:00:12 2026
New Revision: 1933332

Log:
Merge r1933257 from trunk:

* r1933257
  Add Windows manifest with compatibility information to executable
  files.
  Justification:
    Subversion is compatible with the latest (at the time of writing)
    Windows versions so let's report this to the OS.
  Votes:
    +1: dsahlberg, ivan, jun66j5

Added:
   subversion/branches/1.15.x/build/win32/compatibility.manifest
      - copied unchanged from r1933257, subversion/trunk/build/win32/compatibility.manifest
Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/STATUS
   subversion/branches/1.15.x/build/generator/templates/targets.cmake.ezt
   subversion/branches/1.15.x/build/generator/templates/vcnet_vcxproj.ezt

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS	Sun Apr 26 03:22:46 2026	(r1933331)
+++ subversion/branches/1.15.x/STATUS	Sun Apr 26 04:00:12 2026	(r1933332)
@@ -39,13 +39,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
-* r1933257
-  Add Windows manifest with compatibility information to executable
-  files.
-  Justification:
-    Subversion is compatible with the latest (at the time of writing)
-    Windows versions so let's report this to the OS.
-  Votes:
-    +1: dsahlberg, ivan, jun66j5
-

Modified: subversion/branches/1.15.x/build/generator/templates/targets.cmake.ezt
==============================================================================
--- subversion/branches/1.15.x/build/generator/templates/targets.cmake.ezt	Sun Apr 26 03:22:46 2026	(r1933331)
+++ subversion/branches/1.15.x/build/generator/templates/targets.cmake.ezt	Sun Apr 26 04:00:12 2026	(r1933332)
@@ -59,6 +59,9 @@ if ([targets.enable_condition])[is targe
   add_executable([targets.name][for targets.sources]
     [targets.sources][end]
   )
+  if (WIN32)
+    target_sources([targets.name] PRIVATE build/win32/compatibility.manifest)
+  endif()
   [end][is targets.type "test"]
   add_executable([targets.name][for targets.sources]
     [targets.sources][end]

Modified: subversion/branches/1.15.x/build/generator/templates/vcnet_vcxproj.ezt
==============================================================================
--- subversion/branches/1.15.x/build/generator/templates/vcnet_vcxproj.ezt	Sun Apr 26 03:22:46 2026	(r1933331)
+++ subversion/branches/1.15.x/build/generator/templates/vcnet_vcxproj.ezt	Sun Apr 26 04:00:12 2026	(r1933332)
@@ -96,7 +96,10 @@
       <TargetMachine>[is platforms "X64"]MachineX64[else][is platforms "ARM64"]MachineARM64[else]MachineX86[end][end]</TargetMachine>
 [is configs.name "Debug"]      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
 [end]    </Lib>
-[end][end][end]  </ItemDefinitionGroup>
+[end][end][end][is config_type "Application"]    <Manifest>
+      <AdditionalManifestFiles>..\compatibility.manifest</AdditionalManifestFiles>
+    </Manifest>
+[end]  </ItemDefinitionGroup>
 [end][end][if-any target.desc]  <ItemGroup>
     <ResourceCompile Include="..\svn.rc" />
   </ItemGroup>

Copied: subversion/branches/1.15.x/build/win32/compatibility.manifest (from r1933257, subversion/trunk/build/win32/compatibility.manifest)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ subversion/branches/1.15.x/build/win32/compatibility.manifest	Sun Apr 26 04:00:12 2026	(r1933332, copy of r1933257, subversion/trunk/build/win32/compatibility.manifest)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>