Rename builtintools to basetools

It doesn't make much sense to call it "builtin" if it's actually a
plugin.

diff --git a/.gitignore b/.gitignore
index dc00fb79ddfb0f8c48adf20518cf429bcdd1c61e..6d3eeaded8d5269c39df75f62c57751a706876e2 100644 (file)
--- 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 2cf1583030d2280291e617f70c9c8fb86dc6d1cc..61fd21a857c1f8acb957849ce7904bf6eeedd835 100644 (file)
--- 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 3646d10c780f7d770982fe79a1089ad768f7a92e..b43c851fbdf63cb6bab239a8fa9f633b90cffa5e 100644 (file)
--- 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 afe48afebc41d52c6afb013c7489bc10ac348945..d2a23c13c127b14af86c33a5c54b2d29c9435bb2 100644 (file)
--- 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 c2c11e647c75d102c03508e30650ba7bf3f7afed..d7502a812dc097f4268072c4a7724e7e4bc0f2f6 100644 (file)
--- 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 4771e836389774df573e82051c13e85f9e8bdec2..e164ff514569de2bf074cfb900e71439be34bf10 100644 (file)
--- 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