#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
#include <msp/io/print.h>
-#include <msp/strings/regex.h>
+#include <msp/strings/utils.h>
#include "builder.h"
#include "csourcefile.h"
#include "externaltask.h"
using namespace std;
using namespace Msp;
-GnuCxxCompiler::GnuCxxCompiler(Builder &b):
- GnuCompiler(b, "CXX", "g++")
+GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
+ GnuCompiler(b, a, "CXX", "g++")
{
input_suffixes.push_back(".cpp");
input_suffixes.push_back(".cc");
aux_suffixes.push_back(".hpp");
ExternalTask::Arguments argv;
- argv.push_back(name);
- argv.push_back("--version");
- ExternalTask task(argv);
- task.set_stdout(ExternalTask::CAPTURE);
- task.set_stderr(ExternalTask::IGNORE);
- task.start();
- Task::Status status;
- while((status=task.check())==Task::RUNNING) ;
- if(status==Task::SUCCESS)
- if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(task.get_output()))
+ argv.push_back(executable->get_path().str());
+ argv.push_back("-dumpversion");
+ builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+ try
+ {
+ string cxx_ver = strip(ExternalTask::run_and_capture_output(argv));
+ FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
+ if(FS::is_dir(cxx_path))
{
- string cxx_ver = m[0].str;
- while(!cxx_ver.empty())
- {
- FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
- if(FS::is_dir(cxx_path))
- {
- if(builder.get_verbose()>=5)
- IO::print("%s version is %s\n", name, cxx_ver);
- system_path.push_back(cxx_path);
- break;
- }
-
- string::size_type dot = cxx_ver.rfind('.');
- if(dot==string::npos)
- break;
- cxx_ver.erase(dot);
- }
+ builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), cxx_ver));
+ system_path.push_back(cxx_path);
}
+ }
+ catch(const runtime_error &)
+ { }
}
Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const
{
return new CSourceFile(builder, comp, path);
}
+
+Target *GnuCxxCompiler::create_source(const FS::Path &path) const
+{
+ return new CSourceFile(builder, path);
+}