diff --git a/buildtool.cpp b/buildtool.cpp
index 17b81898725135147b68eddcc9debfd891d21989..94a430da38fcfb06f2f44c389d0e07a985ae5e3b 100644 (file)
--- a/buildtool.cpp
+++ b/buildtool.cpp
*
*/
-#define BUILDTOOL_VERSION "BuildTool v0.7.0, 2007 Bob Jamison"
+#define BUILDTOOL_VERSION "BuildTool v0.7.1, 2007 Bob Jamison"
#include <stdio.h>
#include <fcntl.h>
subName.push_back((char)ch);
pos++;
}
- trace("subName:%s %s", subName.c_str(), prefix.c_str());
+ //trace("subName:%s %s", subName.c_str(), prefix.c_str());
if (subName == "prefix" && prefix.size()>0)
{
attrVal.append(prefix);
- trace("prefix override:%s", prefix.c_str());
+ //trace("prefix override:%s", prefix.c_str());
}
else
{
String subVal = attrs[subName];
- trace("subVal:%s", subVal.c_str());
+ //trace("subVal:%s", subVal.c_str());
attrVal.append(subVal);
}
}
//trace("skipped <makefile>");
return true;
}
+ String fullNative = getNativePath(fullName);
//trace("fullName:%s", fullName.c_str());
- FILE *f = fopen(fullName.c_str(), "w");
+ FILE *f = fopen(fullNative.c_str(), "w");
if (!f)
{
error("<makefile> could not open %s for writing : %s",
TaskPkgConfig(MakeBase &par) : Task(par)
{
- type = TASK_PKG_CONFIG; name = "pkg-config";
+ type = TASK_PKG_CONFIG;
+ name = "pkg-config";
}
virtual ~TaskPkgConfig()
PkgConfig pkgconfig;
pkgconfig.setPath(path);
pkgconfig.setPrefix(prefix);
- if (!pkgconfig.query(name))
+ if (!pkgconfig.query(pkgName))
{
error("<pkg-config> query failed for '%s", name.c_str());
return false;
}
}
- //trace("ret: %s", ret.c_str());
+ status(" : %s", ret.c_str());
parent.setProperty(propName, ret);
return true;
}
if (!parent.getAttribute(elem, "name", s))
return false;
if (s.size()>0)
- name = s;
+ pkgName = s;
else
{
error("<pkg-config> requires 'name=\"package\"' attribute");
private:
- String name;
+ String pkgName;
String prefix;
String propName;
String pkg_config_path;
}
}
- status("## Target : %s", name.c_str());
+ status("## Target : %s : %s", name.c_str(),
+ target.getDescription().c_str());
//Now let's do the tasks
std::vector<Task *> &tasks = target.getTasks();