From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 14 Apr 2013 12:17:07 +0000 (+0300)
Subject: Un-abbreviate function names
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=50baabc242633d531d3f9542e9a64491b6e12c6c;p=builder.git

Un-abbreviate function names
---

diff --git a/source/binary.cpp b/source/binary.cpp
index 05a475d..9f0bfcd 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -18,7 +18,7 @@ Binary::Binary(Builder &b, const FS::Path &p):
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p),
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
 	objects(objs)
 {
 	component = &c;
diff --git a/source/cache.cpp b/source/cache.cpp
index d4a4ebc..a2d6824 100644
--- a/source/cache.cpp
+++ b/source/cache.cpp
@@ -59,7 +59,7 @@ void write_string(IO::Base &out, const string &str)
 
 Cache::Cache(SourcePackage &p):
 	package(p),
-	filename(package.get_temp_dir()/"../cache"),
+	filename(package.get_temp_directory()/"../cache"),
 	changed(false)
 { }
 
diff --git a/source/datafile.cpp b/source/datafile.cpp
index bb61d7d..17a47b6 100644
--- a/source/datafile.cpp
+++ b/source/datafile.cpp
@@ -15,5 +15,5 @@ DataFile::DataFile(Builder &b, const Component &c, File &s):
 
 Msp::FS::Path DataFile::generate_target_path(const Component &comp)
 {
-	return comp.get_package().get_out_dir()/(comp.get_name()+".dat");
+	return comp.get_package().get_output_directory()/(comp.get_name()+".dat");
 }
diff --git a/source/exportdefinitions.cpp b/source/exportdefinitions.cpp
index 8fbf76e..7e49721 100644
--- a/source/exportdefinitions.cpp
+++ b/source/exportdefinitions.cpp
@@ -16,5 +16,5 @@ ExportDefinitions::ExportDefinitions(Builder &b, const Component &c, const list<
 
 FS::Path ExportDefinitions::generate_target_path(const Component &comp)
 {
-	return comp.get_package().get_temp_dir()/comp.get_name()/(comp.get_name()+".def");
+	return comp.get_package().get_temp_directory()/comp.get_name()/(comp.get_name()+".def");
 }
diff --git a/source/importlibrary.cpp b/source/importlibrary.cpp
index 0fb5f72..1e6650f 100644
--- a/source/importlibrary.cpp
+++ b/source/importlibrary.cpp
@@ -14,7 +14,7 @@ ImportLibrary::ImportLibrary(Builder &b, const FS::Path &p):
 { }
 
 ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl, ExportDefinitions &exp):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/format("lib%s.dll.a", sl.get_libname())),
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/format("lib%s.dll.a", sl.get_libname())),
 	shared_lib(&sl)
 {
 	component = &c;
diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index fff1309..97e5255 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -29,7 +29,7 @@ FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path
 		if(*i!=".")
 			fn += *i;
 	}
-	return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(fn)+".o");
+	return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
 }
 
 void ObjectFile::find_dependencies()
diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index cb4f978..b84b22a 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -42,7 +42,7 @@ void SourcePackage::set_build_type(const BuildType &t)
 	build_type = &t;
 }
 
-FS::Path SourcePackage::get_temp_dir() const
+FS::Path SourcePackage::get_temp_directory() const
 {
 	string subdir = builder.get_current_arch().get_name();
 	if(build_type)
@@ -58,7 +58,7 @@ FS::Path SourcePackage::get_temp_dir() const
 		return source_dir/temp/subdir;
 }
 
-FS::Path SourcePackage::get_out_dir() const
+FS::Path SourcePackage::get_output_directory() const
 {
 	const Architecture &arch = builder.get_current_arch();
 	if(arch.is_native())
diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0866907..94555d6 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -81,8 +81,8 @@ public:
 	const std::string &get_description() const { return description; }
 	FileTarget &get_build_file() const { return *build_file; }
 	const Msp::FS::Path &get_source_directory() const { return source_dir; }
-	Msp::FS::Path get_temp_dir() const;
-	Msp::FS::Path get_out_dir() const;
+	Msp::FS::Path get_temp_directory() const;
+	Msp::FS::Path get_output_directory() const;
 	const ComponentList &get_components() const { return components; }
 	const Config &get_config() const { return config; }
 	bool match_feature(const std::string &) const;
diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 2bb17fc..29abc0d 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -12,7 +12,7 @@ StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
 { }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
 	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)