summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2021-07-10 17:59:44 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2021-07-10 17:59:44 +0200
commitbfbb506ff1a5e87401d4aa633f0707d1238082d0 (patch)
tree97c16cc25807094a655eccb9672c4a80a90b1535
parentd7d939e1c813c3ec038fcc2a15d890db63d616ee (diff)
Print target names instead of target files when listing targets.
-rw-r--r--libcppbuild.cc2
-rw-r--r--task.cc5
-rw-r--r--task.h1
-rw-r--r--task_cc.cc5
-rw-r--r--task_cc.h1
5 files changed, 13 insertions, 1 deletions
diff --git a/libcppbuild.cc b/libcppbuild.cc
index 707cead..0bcbad5 100644
--- a/libcppbuild.cc
+++ b/libcppbuild.cc
@@ -194,7 +194,7 @@ int main(int argc, char* argv[])
{
if(task->targetType() != TargetType::Object)
{
- std::cout << task->target() << "\n";
+ std::cout << task->name() << "\n";
}
}
return 0;
diff --git a/task.cc b/task.cc
index 5a08a47..8c48543 100644
--- a/task.cc
+++ b/task.cc
@@ -35,6 +35,11 @@ int Task::registerDepTasks(const std::list<std::shared_ptr<Task>>& tasks)
return 0;
}
+std::string Task::name() const
+{
+ return config.target;
+}
+
bool Task::dirty()
{
for(const auto& task : dependsTasks)
diff --git a/task.h b/task.h
index 8ad11c3..6e71db6 100644
--- a/task.h
+++ b/task.h
@@ -26,6 +26,7 @@ public:
int registerDepTasks(const std::list<std::shared_ptr<Task>>& tasks);
+ virtual std::string name() const;
bool dirty();
bool ready();
int run();
diff --git a/task_cc.cc b/task_cc.cc
index 845ad0e..a5fd9f0 100644
--- a/task_cc.cc
+++ b/task_cc.cc
@@ -113,6 +113,11 @@ TaskCC::TaskCC(const BuildConfiguration& config, const Settings& settings,
}
}
+std::string TaskCC::name() const
+{
+ return target();
+}
+
bool TaskCC::dirtyInner()
{
if(!std::filesystem::exists(sourceFile))
diff --git a/task_cc.h b/task_cc.h
index ff701f9..0ce4947 100644
--- a/task_cc.h
+++ b/task_cc.h
@@ -19,6 +19,7 @@ public:
const Settings& settings,
const std::string& sourceDir, const std::string& source);
+ std::string name() const override;
bool dirtyInner() override;
int runInner() override;