boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-02 08:42:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix some bath path cals in search of bootstrap.

Browse Source 
fixes #154
fixes #155
This commit is contained in:
Rene Rivera
2022-05-18 18:13:13 -05:00
parent 329d2f952a
commit 0c499449ae
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/src/history.adoc
View File

@@ -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

2
src/engine/patchlevel.h
View File

@@ -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

6
src/engine/startup.cpp
View File

@@ -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);