From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 19 Feb 2009 08:22:21 +0000 (+0000)
Subject: Fix some usages of get_current_arch() inside Builder
X-Git-Tag: 1.0~21
X-Git-Url: http://git.tdb.fi/?p=builder.git;a=commitdiff_plain;h=77461a8c0e2b5686b04cf15f3a9333b215813992

Fix some usages of get_current_arch() inside Builder
Fix a mistake in Readme.txt
Remove the binary package for ODE since it provides a .pc file now
---

diff --git a/Readme.txt b/Readme.txt
index 7b3f4a0..7af03bc 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -65,7 +65,7 @@ For a simple example, look at Builder's own Build file.
 
 The latest releases can be found at http://www.tdb.fi/builder.shtml
 
-Bug reports, feature reports etc. may be sent to tdb@tdb.fi
+Bug reports, feature requests etc. may be sent to tdb@tdb.fi
 
 Read-only SVN access is available at http://svn.tdb.fi/builder
 
diff --git a/builderrc b/builderrc
index b128266..c6dc66d 100644
--- a/builderrc
+++ b/builderrc
@@ -35,14 +35,6 @@ binary_package "fmod4"
 	need_path true;
 };
 
-binary_package "ode"
-{
-	build_info
-	{
-		library "ode";
-	};
-};
-
 binary_package "xlib"
 {
 	build_info
diff --git a/source/builder.cpp b/source/builder.cpp
index 9be7f6c..dda6c61 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -181,7 +181,7 @@ Gets a package by name, possibly creating it.
 */
 Package *Builder::get_package(const string &name)
 {
-	PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
+	PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
 	if(i==packages.end())
 		i=packages.find(name);
 	if(i!=packages.end())
@@ -240,7 +240,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 	if(cxx_ver.empty())
 	{
 		StringList argv;
-		argv.push_back(get_current_arch().get_tool("CXX"));
+		argv.push_back(current_arch->get_tool("CXX"));
 		argv.push_back("--version");
 		cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
 		while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
@@ -307,7 +307,7 @@ Target *Builder::get_library(const string &lib, const list<string> &path, LibMod
 		syspath.push_back("/usr/lib");
 	}
 	else
-		syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+		syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
 
 	if(verbose>=5)
 		cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';