Merge remote-tracking branch 'bfgroup.b2/release' into develop

boostorg · Mar 16, 2023 · 7ee3b0d · 7ee3b0d
2 parents 9847463 + bea7399
commit 7ee3b0d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/installer_windows.yml b/.github/workflows/installer_windows.yml
@@ -1,4 +1,4 @@
-# Copyright 2022 René Ferdinand Rivera Morell
+# Copyright 2022-2023 René Ferdinand Rivera Morell
 # Use, modification, and distribution are subject to the
 # Boost Software License, Version 1.0. (See accompanying file LICENSE.txt)
 
@@ -55,9 +55,9 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: installer
-          path: "${{github.workspace}}\\b2-pkg\\stage\\*.msi"
+          path: "${{github.workspace}}\\b2-pkg\\stage\\*.msi*"
       - name: "Publish"
         uses: softprops/action-gh-release@v1
         if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
         with:
-          files: "${{github.workspace}}\\b2-pkg\\stage\\*.msi"
+          files: "${{github.workspace}}\\b2-pkg\\stage\\*.msi*"
diff --git a/doc/src/history.adoc b/doc/src/history.adoc
@@ -1,6 +1,11 @@
 [[b2.history]]
 = History
 
+== Version 4.9.6
+
+* Fix version check for winsdk on `clang-win` toolset.
+  -- _Nikita Kniazev_
+
 == Version 4.9.5
 
 * Improve alternative match error message to include more context.

diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h
@@ -13,4 +13,4 @@ Distributed under the Boost Software License, Version 1.0.
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 9
-#define VERSION_PATCH 5
+#define VERSION_PATCH 6
diff --git a/src/tools/clang-win.jam b/src/tools/clang-win.jam
@@ -118,7 +118,7 @@ rule init ( version ? : command * : options * )
 
                 if $(match)
                 {
-                    items += $(match[1]) ;
+                    items += [ regex.replace $(match[1]) "\\\\+" "\\" ] ;
                     config = $(match[2]) ;
                 }
             }
@@ -127,10 +127,10 @@ rule init ( version ? : command * : options * )
 
             if $(items)
             {
-                asm = [ regex.replace $(items[1]) "x64\\\\+link\\.exe" "x64\\ml64.exe" ] ;
-                asm = [ regex.replace $(asm) "x86\\\\+link\\.exe" "x86\\ml.exe" ] ;
-                asm = [ regex.replace $(asm) "arm64\\\\+link\\.exe" "arm64\\armasm64.exe" ] ;
-                asm = [ regex.replace $(asm) "arm\\\\+link\\.exe" "arm\\armasm.exe" ] ;
+                asm = [ regex.replace $(items[1]) "x64\\\\link\\.exe" "x64\\ml64.exe" ] ;
+                asm = [ regex.replace $(asm) "x86\\\\link\\.exe" "x86\\ml.exe" ] ;
+                asm = [ regex.replace $(asm) "arm64\\\\link\\.exe" "arm64\\armasm64.exe" ] ;
+                asm = [ regex.replace $(asm) "arm\\\\link\\.exe" "arm\\armasm.exe" ] ;
 
                 if ! [ MATCH "(ml\\.exe)" "(ml64\\.exe)" "(armasm64\\.exe)" "(armasm\\.exe)" : $(asm) ]
                 {
@@ -153,7 +153,7 @@ rule init ( version ? : command * : options * )
 
             if $(items)
             {
-                linker = [ regex.replace $(items[1]) "\\\\+HostX64\\\\+x86\\\\+" "\\HostX86\\x86\\" ] ;
+                linker = [ regex.replace $(items[1]) "\\\\HostX64\\\\x86\\\\" "\\HostX86\\x86\\" ] ;
             }
 
             .notice "$(arch)-$(addr):" "using linker '$(linker)'" ;
@@ -176,12 +176,12 @@ rule init ( version ? : command * : options * )
 
             for local item in $(items)
             {
-                match = [ MATCH "\"-libpath:(.*)\\\\+Lib\\\\(.*)\\\\um\\\\+x(.*)\"" : $(item) ] ;
+                match = [ MATCH "\"-libpath:(.*)\\\\Lib\\\\(.*)\\\\um\\\\x(.*)\"" : $(item) ] ;
 
                 if $(match)
                 {
                     local sdk-path = "$(match[1])\\bin\\$(match[2])\\x$(match[3])" ;
-                    if [ version.version-less [ SPLIT_BY_CHARACTERS "$(match[2])" : . ] : 10 0 14393 ]
+                    if ! [ path.exists $(sdk-path) ]
                     {
                         sdk-path = "$(match[1])\\bin\\x$(match[3])" ;
                     }