X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=48ded5da7f2e1d7ca01427f3032064b94013dc8f;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=d8142038d1e65756f5ad7ccae68f693dc86bf525;hpb=7567502e17be7704d58ced2f49703fcf71c7ef38;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index d814203..48ded5d 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -19,7 +19,7 @@ using namespace Msp; /** Creates a buildable package. */ -SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s): +SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s): Package(b, n), source(s), config(*this), @@ -28,12 +28,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s): tar_files.push_back(source/"Build"); } -Msp::Path SourcePackage::get_temp_dir() const +Msp::FS::Path SourcePackage::get_temp_dir() const { return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value; } -Msp::Path SourcePackage::get_out_dir() const +Msp::FS::Path SourcePackage::get_out_dir() const { return source/config.get_option("outdir").value; } @@ -178,13 +178,13 @@ void SourcePackage::create_build_info() unsigned flags=get_install_flags(); - build_info.incpath.push_back((Path(builder.get_prefix())/"include").str()); - build_info.libpath.push_back((Path(builder.get_prefix())/"lib").str()); + build_info.incpath.push_back((builder.get_prefix()/"include").str()); + build_info.libpath.push_back((builder.get_prefix()/"lib").str()); if(flags&INCLUDE) - export_binfo.incpath.push_back((Path(builder.get_prefix())/"include").str()); + export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); if(flags&LIB) - export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str()); + export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); string optimize=config.get_option("optimize").value; if(lexical_cast(optimize))