don't delete git directories on --redownload, only --reextract

added an alias clean::reclone
fixed boost config jam using backslashes

src/commands.cpp

@@ -390,9 +390,8 @@ clipp::group build_command::do_group()
 		    "avoid merge errors; global override",
 
 		(clipp::option("--ignore-uncommitted-changes") >> ignore_uncommitted_)
-			% "when --redownload or --reextract is given, directories "
-			  "controlled by git will be deleted even if they contain "
-			  "uncommitted changes",
+			% "when --reextract is given, directories controlled by git will "
+			  "be deleted even if they contain uncommitted changes",
 
 		(clipp::option("--keep-msbuild") >> keep_msbuild_)
 			% "don't terminate msbuild.exe instances after building",

src/tasks/boost.cpp

@@ -217,14 +217,20 @@ void boost::do_b2(
 
 void boost::write_config_jam()
 {
+	auto forward_slashes = [](auto&& p)
+	{
+		std::string s = path_to_utf8(p);
+		return replace_all(s, "\\", "/");
+	};
+
 	std::ostringstream oss;
 
 	oss
 		<< "using python\n"
 		<< "  : " << python_version_for_jam() << "\n"
-		<< "  : " << path_to_utf8(python::python_exe()) << "\n"
-		<< "  : " << path_to_utf8(python::include_path()) << "\n"
-		<< "  : " << path_to_utf8(python::build_path()) << "\n"
+		<< "  : " << forward_slashes(python::python_exe()) << "\n"
+		<< "  : " << forward_slashes(python::include_path()) << "\n"
+		<< "  : " << forward_slashes(python::build_path()) << "\n"
 		<< "  : <address-model>64\n"
 		<< "  : <define>BOOST_ALL_NO_LIB=1\n"
 		<< "  ;";

src/tasks/boost_di.cpp

@@ -28,7 +28,7 @@ void boost_di::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/gtest.cpp

@@ -28,7 +28,7 @@ void gtest::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/libffi.cpp

@@ -28,7 +28,7 @@ void libffi::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/lz4.cpp

@@ -42,7 +42,7 @@ void lz4::do_clean(clean c)
 		}
 		else
 		{
-			if (is_any_set(c, clean::redownload|clean::reextract))
+			if (is_set(c, clean::reclone))
 			{
 				git::delete_directory(cx(), source_path());
 				return;

src/tasks/modorganizer.cpp

@@ -64,7 +64,7 @@ void modorganizer::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), this_source_path());
 			return;

src/tasks/ncc.cpp

@@ -28,7 +28,7 @@ void ncc::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/nmm.cpp

@@ -28,7 +28,7 @@ void nmm::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/python.cpp

@@ -80,7 +80,7 @@ void python::do_clean(clean c)
 		}
 		else
 		{
-			if (is_any_set(c, clean::redownload|clean::reextract))
+			if (is_set(c, clean::reclone))
 			{
 				git::delete_directory(cx(), source_path());
 				return;

src/tasks/spdlog.cpp

@@ -28,7 +28,7 @@ void spdlog::do_clean(clean c)
 {
 	instrument<times::clean>([&]
 	{
-		if (is_any_set(c, clean::redownload|clean::reextract))
+		if (is_set(c, clean::reclone))
 		{
 			git::delete_directory(cx(), source_path());
 			return;

src/tasks/task.h

@@ -79,6 +79,7 @@ public:
 		nothing     = 0x00,
 		redownload  = 0x01,
 		reextract   = 0x02,
+		reclone     = reextract,
 		reconfigure = 0x04,
 		rebuild     = 0x08,
 		everything  = redownload+reextract+reconfigure+rebuild

src/tasks/usvfs.cpp

@@ -48,7 +48,7 @@ void usvfs::do_clean(clean c)
 		}
 		else
 		{
-			if (is_any_set(c, clean::redownload|clean::reextract))
+			if (is_set(c, clean::reclone))
 			{
 				git::delete_directory(cx(), source_path());
 				return;