From 501b95b25d61960ff5dc67820c8a3c531374f108 Mon Sep 17 00:00:00 2001 From: pleroy Date: Sat, 6 Apr 2024 19:49:50 +0200 Subject: [PATCH 1/2] Multiprecision and zfp in LLNL --- Principia.sln | 1 + base/base.vcxproj | 6 ++-- rebuild_all_solutions.ps1 | 70 ++++++++++++++------------------------ third_party_optional.props | 12 ------- third_party_zfp.props | 16 --------- 5 files changed, 30 insertions(+), 75 deletions(-) delete mode 100644 third_party_optional.props delete mode 100644 third_party_zfp.props diff --git a/Principia.sln b/Principia.sln index a26bb1e720..ee98f12e3f 100644 --- a/Principia.sln +++ b/Principia.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Property Sheets", " google_protobuf.props = google_protobuf.props include_solution.props = include_solution.props principia.props = principia.props + llnl_zfp.props = llnl_zfp.props profiling.props = profiling.props suppress_useless_warnings.props = suppress_useless_warnings.props EndProjectSection diff --git a/base/base.vcxproj b/base/base.vcxproj index 6581f69ff0..6cf019c435 100644 --- a/base/base.vcxproj +++ b/base/base.vcxproj @@ -6,13 +6,13 @@ - + - + - + diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1 index d397148888..2c74521b0f 100644 --- a/rebuild_all_solutions.ps1 +++ b/rebuild_all_solutions.ps1 @@ -9,55 +9,37 @@ $dependencies = @(".\Google\glog\msvc\glog.sln", ".\Google\benchmark\msvc\google-benchmark.sln", ".\Google\gipfeli\msvc\gipfeli.sln", ".\Google\abseil-cpp\msvc\abseil-cpp.sln", - ".\Third Party\zfp\msvc\zfp.sln") + ".\LLNL\zfp\msvc\zfp.sln") -New-Item -ItemType Directory -Force -Path "Google" -New-Item -ItemType Directory -Force -Path "Third Party" - -push-location -path "Google" -foreach ($repository in @("glog", "googletest", "protobuf", "benchmark", - "gipfeli", "abseil-cpp", "chromium")) { - if (!(test-path -path $repository)) { - git clone ("https://github.com/mockingbirdnest/" + $repository + ".git") - } - push-location $repository - git checkout master - git pull - if (!$?) { - if ($args[0] -eq "--force") { - git reset --hard origin/master - git clean -fdx - } else { - pop-location - pop-location - exit 1 +foreach ($directory_and_repositories in @( + @("Boost", @("multiprecision")), + @("Google", @("glog", "googletest", "protobuf", "benchmark", + "gipfeli", "abseil-cpp", "chromium")), + @("LLNL", @("zfp")))) { + $directory, $repositories = $directory_and_repositories + New-Item -ItemType Directory -Force -Path $directory + Push-Location -Path $directory + foreach ($repository in $repositories) { + if (!(Test-Path -Path $repository)) { + git clone ("https://github.com/mockingbirdnest/" + $repository + ".git") } - } - pop-location -} -pop-location - -push-location -path "Third Party" -foreach ($repository in @("zfp")) { - if (!(test-path -path $repository)) { - git clone ("https://github.com/mockingbirdnest/" + $repository + ".git") - } - push-location $repository - git checkout master - git pull - if (!$?) { - if ($args[0] -eq "--force") { - git reset --hard origin/master - git clean -fdx - } else { - pop-location - pop-location - exit 1 + Push-Location $repository + git fetch + git checkout origin/HEAD + if (!$?) { + if ($args[0] -eq "--force") { + git reset --hard origin/HEAD + git clean -fdx + } else { + Pop-Location + Pop-Location + exit 1 + } } + Pop-Location } - pop-location + Pop-Location } -pop-location function build_solutions($solutions) { foreach ($configuration in "Debug", "Release") { diff --git a/third_party_optional.props b/third_party_optional.props deleted file mode 100644 index b9134efca5..0000000000 --- a/third_party_optional.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - $(SolutionDir)..\Third Party\Optional;%(AdditionalIncludeDirectories) - - - - \ No newline at end of file diff --git a/third_party_zfp.props b/third_party_zfp.props deleted file mode 100644 index 6fb7bc2fa0..0000000000 --- a/third_party_zfp.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - $(SolutionDir)..\Third Party\zfp\include;%(AdditionalIncludeDirectories) - - - $(SolutionDir)..\Third Party\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) - zfp.lib;%(AdditionalDependencies) - - - - \ No newline at end of file From 12b6d0504e91ef2fff566b8c2fcbf7ba490b1390 Mon Sep 17 00:00:00 2001 From: pleroy Date: Sat, 6 Apr 2024 20:24:57 +0200 Subject: [PATCH 2/2] Rename zfp. --- llnl_zfp.props | 16 ++++++++++++++++ shared/base.vcxitems | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 llnl_zfp.props diff --git a/llnl_zfp.props b/llnl_zfp.props new file mode 100644 index 0000000000..60c865ec75 --- /dev/null +++ b/llnl_zfp.props @@ -0,0 +1,16 @@ + + + + + + + + $(SolutionDir)..\LLNL\zfp\include;%(AdditionalIncludeDirectories) + + + $(SolutionDir)..\LLNL\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) + zfp.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/shared/base.vcxitems b/shared/base.vcxitems index 96d32c6daa..bcd47c6248 100644 --- a/shared/base.vcxitems +++ b/shared/base.vcxitems @@ -6,7 +6,7 @@ {a82cb04c-42e1-4ebe-9816-6fc033a9c2b5} - +