From 3d4ef1b93e8cfd8467efd132cb80ad4bd368f33a Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 28 Dec 2022 15:43:18 +0200
Subject: [PATCH] Rename builtintools to basetools

It doesn't make much sense to call it "builtin" if it's actually a
plugin.
---
 .gitignore                  |  2 +-
 Build                       |  4 ++--
 plugins/base/baseplugin.cpp | 12 ++++++------
 plugins/base/baseplugin.h   |  8 ++++----
 plugins/base/basetools.cpp  |  4 ++--
 plugins/base/basetools.h    |  8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc00fb7..6d3eead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /builder
 /builder.pc
 /builder-stage1
-/builtintools.dlm
+/basetools.dlm
 /clangtools.dlm
 /gnutools.dlm
 /libbuilder.a
diff --git a/Build b/Build
index 2cf1583..61fd21a 100644
--- a/Build
+++ b/Build
@@ -56,9 +56,9 @@ package "builder"
 		install true;
 	};
 
-	module "builtintools"
+	module "basetools"
 	{
-		source "plugins/builtin";
+		source "plugins/base";
 		install true;
 	};
 
diff --git a/plugins/base/baseplugin.cpp b/plugins/base/baseplugin.cpp
index 3646d10..b43c851 100644
--- a/plugins/base/baseplugin.cpp
+++ b/plugins/base/baseplugin.cpp
@@ -1,18 +1,18 @@
 #include <msp/builder/builder.h>
 #include <msp/builder/tool.h>
-#include "builtinplugin.h"
-#include "builtintools.h"
+#include "baseplugin.h"
+#include "basetools.h"
 #include "compilecommandsjson.h"
 #include "pkgconfigfile.h"
 #include "vcxprojectfile.h"
 #include "vssolutionfile.h"
 
-void BuiltinPlugin::add_tools(Toolchain &toolchain, const Architecture &) const
+void BasePlugin::add_tools(Toolchain &toolchain, const Architecture &) const
 {
-	toolchain.add_toolchain(new BuiltinTools(builder));
+	toolchain.add_toolchain(new BaseTools(builder));
 }
 
-void BuiltinPlugin::create_targets(SourcePackage &spkg) const
+void BasePlugin::create_targets(SourcePackage &spkg) const
 {
 	const Architecture &native_arch = builder.get_native_arch();
 
@@ -35,5 +35,5 @@ void BuiltinPlugin::create_targets(SourcePackage &spkg) const
 extern "C"
 Plugin *create_plugin(Builder &builder)
 {
-	return new BuiltinPlugin(builder);
+	return new BasePlugin(builder);
 }
diff --git a/plugins/base/baseplugin.h b/plugins/base/baseplugin.h
index afe48af..d2a23c1 100644
--- a/plugins/base/baseplugin.h
+++ b/plugins/base/baseplugin.h
@@ -1,12 +1,12 @@
-#ifndef BUILTINPLUGIN_H_
-#define BUILTINPLUGIN_H_
+#ifndef BASEPLUGIN_H_
+#define BASEPLUGIN_H_
 
 #include <msp/builder/plugin.h>
 
-class BuiltinPlugin: public Plugin
+class BasePlugin: public Plugin
 {
 public:
-	BuiltinPlugin(Builder &b): Plugin(b) { }
+	BasePlugin(Builder &b): Plugin(b) { }
 
 	void add_tools(Toolchain &, const Architecture &) const override;
 	void create_targets(SourcePackage &) const override;
diff --git a/plugins/base/basetools.cpp b/plugins/base/basetools.cpp
index c2c11e6..d7502a8 100644
--- a/plugins/base/basetools.cpp
+++ b/plugins/base/basetools.cpp
@@ -1,4 +1,4 @@
-#include "builtintools.h"
+#include "basetools.h"
 #include "copy.h"
 #include "compilecommandsgenerator.h"
 #include "pkgconfiggenerator.h"
@@ -6,7 +6,7 @@
 #include "vcxprojectgenerator.h"
 #include "vssolutiongenerator.h"
 
-BuiltinTools::BuiltinTools(Builder &builder)
+BaseTools::BaseTools(Builder &builder)
 {
 	add_tool(new Copy(builder));
 	add_tool(new Tar(builder));
diff --git a/plugins/base/basetools.h b/plugins/base/basetools.h
index 4771e83..e164ff5 100644
--- a/plugins/base/basetools.h
+++ b/plugins/base/basetools.h
@@ -1,14 +1,14 @@
-#ifndef BUILTINTOOLS_H_
-#define BUILTINTOOLS_H_
+#ifndef BASETOOLS_H_
+#define BASETOOLS_H_
 
 #include <msp/builder/toolchain.h>
 
 class Builder;
 
-class BuiltinTools: public Toolchain
+class BaseTools: public Toolchain
 {
 public:
-	BuiltinTools(Builder &);
+	BaseTools(Builder &);
 };
 
 #endif
-- 
2.45.2