diff --git a/doc/src/history.adoc b/doc/src/history.adoc index 0463139f1..51780d83f 100644 --- a/doc/src/history.adoc +++ b/doc/src/history.adoc @@ -1,6 +1,15 @@ [[b2.history]] = History +== Version 4.9.1 + +* Fix bad calculation of initial dev-only path to bootstrap file within the + b2 dev tree. + -- _René Ferdinand Rivera Morell_ +* Fix bad path calculation in final fallback for loading bootstrap file from + path specified in boost-build rule. + -- _René Ferdinand Rivera Morell_ + == Version 4.9.0 This release has mostly internal cleanups and restructuring. The most diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h index 240174947..27292bd70 100644 --- 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 0 +#define VERSION_PATCH 1 diff --git a/src/engine/startup.cpp b/src/engine/startup.cpp index 59e45d2eb..a3f20af6e 100644 --- a/src/engine/startup.cpp +++ b/src/engine/startup.cpp @@ -1,5 +1,5 @@ /* -Copyright 2020 René Ferdinand Rivera Morell +Copyright 2020-2022 René Ferdinand Rivera Morell Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) */ @@ -208,7 +208,7 @@ bool b2::startup::bootstrap(FRAME *frame) // development. if (bootstrap_file.empty()) { - std::string work_dir(b2::paths::normalize(b2_exe_path + "/../")); + std::string work_dir(b2::paths::normalize(b2_exe_path + "/..") + "/"); while (bootstrap_file.empty() && !work_dir.empty()) { bootstrap_files_searched += " " + work_dir + "src/kernel/" + bootstrap_jam + "\n"; @@ -235,7 +235,7 @@ bool b2::startup::bootstrap(FRAME *frame) if (!dot_boost_build_dir.empty()) { std::string dir = b2::jam::object(*dot_boost_build_dir.begin()); - if (!b2_file_path.empty() && b2::paths::is_relative(dir)) + if (!b2_file_path.empty() && !b2::paths::is_rooted(dir)) dir = b2_file_path + "/../" + dir; const std::string path = b2::paths::normalize(dir + "/" + bootstrap_jam);