Replace per-file copyright notices with a single file

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 634ccd81ff433cc31d6d7febe4a11cc3da36b98f..4960d42003dd563440ee126a6d517a2b6e495411 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
@@ -12,6 +5,7 @@ Distributed under the LGPL
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
+#include "sourcefile.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -20,24 +14,23 @@ using namespace Msp;
 Compile::Compile(Builder &b, const ObjectFile &obj):
        ExternalAction(b)
 {
-       const Component &comp=obj.get_component();
+       const Component &comp = obj.get_component();
 
-       work_dir=comp.get_package().get_source();
+       work_dir = comp.get_package().get_source();
 
-       const TargetList &deps=obj.get_depends();
-       FS::Path spath=deps.front()->get_name();
+       FS::Path spath = obj.get_source().get_path();
 
-       string ext=FS::extpart(spath.str());
-       const char *tool=0;
+       string ext = FS::extpart(spath.str());
+       const char *tool = 0;
        if(ext==".cpp" || ext==".cc")
-               tool="CXX";
+               tool = "CXX";
        else
-               tool="CC";
+               tool = "CC";
 
        argv.push_back(builder.get_current_arch().get_tool(tool));
        argv.push_back("-c");
 
-       const BuildInfo &binfo=comp.get_build_info();
+       const BuildInfo &binfo = comp.get_build_info();
        for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
                argv.push_back("-W"+*i);
        for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
@@ -47,7 +40,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
 
-       FS::Path opath=obj.get_name();
+       FS::Path opath = obj.get_path();
        argv.push_back("-o");
        argv.push_back(relative(opath, work_dir).str());
        argv.push_back(relative(spath, work_dir).str());
@@ -55,7 +48,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        if(!builder.get_dry_run())
                FS::mkpath(FS::dirname(opath), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());
+       announce(comp.get_package().get_name(), tool, basename(opath));
 
        launch();
 }