diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 9 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/atomic.cmake | 8 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/log.cmake | 8 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/nowide.cmake | 10 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
5 files changed, 21 insertions, 16 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index b6cbdc98d..afa7d64da 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()]
param (
$libraries = @(),
- $version = "1.74.0",
+ $version = "1.75.0",
$portsDir = $null
)
@@ -25,7 +25,6 @@ else # Optionally clear this array when moving to a new boost version
$port_versions = @{
#e.g. "asio" = 1;
- "locale" = 3;
}
$per_port_data = @{
@@ -312,7 +311,7 @@ foreach ($library in $libraries) if ($_ -match "aligned_storage") { "type_traits" }
elseif ($_ -match "noncopyable|ref|swap|get_pointer|checked_delete|visit_each") { "core" }
elseif ($_ -eq "type") { "core" }
- elseif ($_ -eq "concept") { "concept_check" }
+ elseif ($_ -match "concept|concept_archetype") { "concept_check" }
elseif ($_ -match "unordered_") { "unordered" }
elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" }
elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" }
@@ -332,7 +331,7 @@ foreach ($library in $libraries) elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" }
elseif ($_ -eq "nondet_random") { "random" }
elseif ($_ -eq "memory_order") { "atomic" }
- elseif ($_ -match "blank|blank_fwd|numeric_traits") { "detail" }
+ elseif ($_ -match "blank|blank_fwd|numeric_traits|fenv") { "detail" }
elseif ($_ -match "is_placeholder|mem_fn") { "bind" }
elseif ($_ -eq "exception_ptr") { "exception" }
elseif ($_ -match "multi_index_container|multi_index_container_fwd") { "multi_index" }
@@ -373,7 +372,7 @@ foreach ($library in $libraries) -and `
(($library -notmatch "throw_exception") -or ($_ -notmatch "^exception"))`
-and `
- (($library -notmatch "iostreams") -or ($_ -notmatch "random"))`
+ (($library -notmatch "iostreams|math") -or ($_ -notmatch "random"))`
-and `
(($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator"))
} | % { $_ -replace "_","-" } | % {
diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake new file mode 100644 index 000000000..0715d20f7 --- /dev/null +++ b/scripts/boost/post-source-stubs/atomic.cmake @@ -0,0 +1,8 @@ +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE
+ "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
+ "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]"
+ _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
+
diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake index 78500ddc3..be17a0419 100644 --- a/scripts/boost/post-source-stubs/log.cmake +++ b/scripts/boost/post-source-stubs/log.cmake @@ -4,10 +4,10 @@ string(REPLACE " <conditional>@select-arch-specific-sources" "#<conditional>@sel file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
-file(READ ${SOURCE_PATH}/build/log-architecture.jam _contents)
+file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents)
string(REPLACE
- "\nproject.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ] ;"
- "\nproject.load [ path.join [ path.make $(here:D) ] config/checks/architecture ] ;"
+ "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
+ "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]"
_contents "${_contents}")
-file(WRITE ${SOURCE_PATH}/build/log-architecture.jam "${_contents}")
+file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}")
diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake index 4005c3a80..a52342259 100644 --- a/scripts/boost/post-source-stubs/nowide.cmake +++ b/scripts/boost/post-source-stubs/nowide.cmake @@ -1,11 +1,7 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
-
string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}")
-
-string(REPLACE "check-target-builds cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}")
-string(REPLACE "check-target-builds lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}")
-
+string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}")
+string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}")
file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
-
-file(COPY "${SOURCE_PATH}/test/check_lfs_support.cpp" "${SOURCE_PATH}/test/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")
+file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d8c655e1b..3d16487a4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1450,6 +1450,8 @@ stormlib:arm-uwp=fail stormlib:x64-uwp=fail stxxl:arm-uwp=fail stxxl:x64-uwp=fail +symengine:arm64-windows=fail +symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail |