Refactor logger to do message formatting internally

[builder.git] / source / androidtools.cpp

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 1633b8b6465dd575acd0676536969a7b9d027af1..c5aab653c51fe3eec613412e1328daead5a2c3a8 100644 (file)
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -44,7 +44,7 @@ AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &def
                        root = default_path;
                else
                {
-                       builder.get_logger().log("problems", format("Android %s not found", type));
+                       builder.get_logger().log("problems", "Android %s not found", type);
                        return;
                }
        }
@@ -53,13 +53,13 @@ AndroidDevKit::AndroidDevKit(Builder &b, const string &type, const FS::Path &def
        if(!FS::exists(platforms_dir))
                return;
 
-       builder.get_logger().log("files", format("Traversing %s", platforms_dir.str()));
+       builder.get_logger().log("files", "Traversing %s", platforms_dir.str());
        supported_api_levels = 0;
        for(const string &p: list_filtered(platforms_dir, "^android-[1-9][0-9]*$"))
        {
                unsigned api = lexical_cast<unsigned>(p.substr(8));
                if(api>63)
-                       builder.get_logger().log("problems", format("API level %d is too high", api));
+                       builder.get_logger().log("problems", "API level %d is too high", api);
                else
                        supported_api_levels |= 1<<api;
        }
@@ -89,7 +89,7 @@ void AndroidSdk::find_build_tools_dir()
                return;
        }
 
-       builder.get_logger().log("files", format("Traversing %s", bt_dir.str()));
+       builder.get_logger().log("files", "Traversing %s", bt_dir.str());
        string use_tools;
        unsigned latest_version = 0;
        for(const string &v: list_files(bt_dir))
@@ -109,7 +109,7 @@ void AndroidSdk::find_build_tools_dir()
        }
 
        build_tools_dir = bt_dir/use_tools;
-       builder.get_logger().log("tools", format("Android build-tools found in %s", build_tools_dir.str()));
+       builder.get_logger().log("tools", "Android build-tools found in %s", build_tools_dir.str());
 }
 
 void AndroidSdk::init_api_level(unsigned api)
@@ -128,7 +128,7 @@ AndroidNdk::AndroidNdk(Builder &b, const Architecture &a, const AndroidSdk &sdk)
                if(FS::exists(csr))
                {
                        common_sysroot = csr;
-                       builder.get_logger().log("tools", format("Android NDK common sysroot is %s", common_sysroot));
+                       builder.get_logger().log("tools", "Android NDK common sysroot is %s", common_sysroot);
                }
        }
 
@@ -154,7 +154,7 @@ void AndroidNdk::find_toolchain_dir()
                return;
        }
 
-       builder.get_logger().log("files", format("Traversing %s", toolchains_dir.str()));
+       builder.get_logger().log("files", "Traversing %s", toolchains_dir.str());
        string prefix = architecture.get_cross_prefix()+"-";
        string use_toolchain;
        unsigned latest_version = 0;
@@ -190,7 +190,7 @@ void AndroidNdk::find_toolchain_dir()
        const Architecture &native_arch = builder.get_native_arch();
 
        FS::Path tc_archs_dir = toolchains_dir/use_toolchain/"prebuilt";
-       builder.get_logger().log("files", format("Traversing %s", tc_archs_dir.str()));
+       builder.get_logger().log("files", "Traversing %s", tc_archs_dir.str());
        string use_arch = native_arch.best_match(list_files(tc_archs_dir));
 
        if(use_arch.empty())
@@ -200,13 +200,13 @@ void AndroidNdk::find_toolchain_dir()
        }
 
        bin_dir = toolchains_dir/use_toolchain/"prebuilt"/use_arch/"bin";
-       builder.get_logger().log("tools", format("Android NDK toolchain binaries found in %s", bin_dir.str()));
+       builder.get_logger().log("tools", "Android NDK toolchain binaries found in %s", bin_dir.str());
 }
 
 void AndroidNdk::init_api_level(unsigned api)
 {
        FS::Path platform_archs_dir = root/"platforms"/format("android-%d", api);
-       builder.get_logger().log("files", format("Traversing %s", platform_archs_dir.str()));
+       builder.get_logger().log("files", "Traversing %s", platform_archs_dir.str());
        vector<string> platform_archs = list_filtered(platform_archs_dir, "^arch-");
        for(string &a: platform_archs)
                a.erase(0, 5);
@@ -219,7 +219,7 @@ void AndroidNdk::init_api_level(unsigned api)
        }
 
        platform_sysroot = platform_archs_dir/("arch-"+use_arch);
-       builder.get_logger().log("tools", format("Android NDK platform sysroot is %s", platform_sysroot));
+       builder.get_logger().log("tools", "Android NDK platform sysroot is %s", platform_sysroot);
 }
 
 
@@ -232,7 +232,7 @@ AndroidTools::AndroidTools(Builder &builder, const Architecture &arch):
                unsigned api = 0;
                for(unsigned i=32; i>0; i>>=1)
                        api += i*!!(common_api_levels>>(api+i));
-               builder.get_logger().log("tools", format("Using Android API level %d", api));
+               builder.get_logger().log("tools", "Using Android API level %d", api);
                sdk.select_api_level(api);
                ndk.select_api_level(api);
        }