Rename module to init

17 files changed, 86 insertions, 65 deletions

diff --git a/build2/b.cxx b/build2/b.cxx
index 5167cf6..d16d828 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -38,15 +38,15 @@
 using namespace butl;
 using namespace std;
 
-#include <build2/config/module>
-#include <build2/dist/module>
-#include <build2/bin/module>
+#include <build2/config/init>
+#include <build2/dist/init>
+#include <build2/bin/init>
 #include <build2/c/init>
 #include <build2/cc/init>
-#include <build2/cxx/module>
-#include <build2/cli/module>
-#include <build2/test/module>
-#include <build2/install/module>
+#include <build2/cxx/init>
+#include <build2/cli/init>
+#include <build2/test/init>
+#include <build2/install/init>
 
 using namespace build2;
 
diff --git a/build2/bin/module b/build2/bin/init
index 8cf0255..139362d 100644
--- a/build2/bin/module
+++ b/build2/bin/init
@@ -1,9 +1,9 @@
-// file      : build2/bin/module -*- C++ -*-
+// file      : build2/bin/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_BIN_MODULE
-#define BUILD2_BIN_MODULE
+#ifndef BUILD2_BIN_INIT
+#define BUILD2_BIN_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -88,4 +88,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_BIN_MODULE
+#endif // BUILD2_BIN_INIT
diff --git a/build2/bin/module.cxx b/build2/bin/init.cxx
index 89f20af..102c060 100644
--- a/build2/bin/module.cxx
+++ b/build2/bin/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/bin/module.cxx -*- C++ -*-
+// file      : build2/bin/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/bin/module>
+#include <build2/bin/init>
 
 #include <butl/triplet>
 
diff --git a/build2/buildfile b/build2/buildfile
index b0e9cf0..7e0a925 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -35,7 +35,7 @@ exe{b}:                                       \
         {hxx ixx txx cxx}{ variable         } \
         {hxx            }{ version          } \
     bin/{hxx         cxx}{ guess            } \
-    bin/{hxx         cxx}{ module           } \
+    bin/{hxx         cxx}{ init             } \
     bin/{hxx         cxx}{ rule             } \
     bin/{hxx         cxx}{ target           } \
       c/{hxx         cxx}{ init             } \
@@ -52,22 +52,23 @@ exe{b}:                                       \
      cc/{hxx ixx     cxx}{ utility          } \
      cc/{            cxx}{ windows-manifest } \
      cc/{            cxx}{ windows-rpath    } \
-    cli/{hxx         cxx}{ module           } \
+    cli/{hxx         cxx}{ init             } \
     cli/{hxx         cxx}{ rule             } \
     cli/{hxx         cxx}{ target           } \
- config/{hxx         cxx}{ module           } \
+ config/{hxx         cxx}{ init             } \
+ config/{hxx            }{ module           } \
  config/{hxx         cxx}{ operation        } \
  config/{hxx     txx cxx}{ utility          } \
-    cxx/{hxx         cxx}{ module           } \
+    cxx/{hxx         cxx}{ init             } \
     cxx/{hxx         cxx}{ target           } \
-   dist/{hxx         cxx}{ module           } \
+   dist/{hxx         cxx}{ init             } \
    dist/{hxx         cxx}{ operation        } \
    dist/{hxx         cxx}{ rule             } \
-install/{hxx         cxx}{ module           } \
+install/{hxx         cxx}{ init             } \
 install/{hxx         cxx}{ operation        } \
 install/{hxx         cxx}{ rule             } \
 install/{hxx            }{ utility          } \
-   test/{hxx         cxx}{ module           } \
+   test/{hxx         cxx}{ init             } \
    test/{hxx         cxx}{ operation        } \
    test/{hxx         cxx}{ rule             } \
 $libs
diff --git a/build2/cli/module b/build2/cli/init
index 50d07ef..917ab35 100644
--- a/build2/cli/module
+++ b/build2/cli/init
@@ -1,9 +1,9 @@
-// file      : build2/cli/module -*- C++ -*-
+// file      : build2/cli/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CLI_MODULE
-#define BUILD2_CLI_MODULE
+#ifndef BUILD2_CLI_INIT
+#define BUILD2_CLI_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -25,4 +25,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CLI_MODULE
+#endif // BUILD2_CLI_INIT
diff --git a/build2/cli/module.cxx b/build2/cli/init.cxx
index ef9c2f8..467cf82 100644
--- a/build2/cli/module.cxx
+++ b/build2/cli/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/cli/module.cxx -*- C++ -*-
+// file      : build2/cli/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cli/module>
+#include <build2/cli/init>
 
 #include <build2/scope>
 #include <build2/target>
diff --git a/build2/config/init b/build2/config/init
new file mode 100644
index 0000000..7efae99
--- /dev/null
+++ b/build2/config/init
@@ -0,0 +1,31 @@
+// file      : build2/config/init -*- C++ -*-
+// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_CONFIG_INIT
+#define BUILD2_CONFIG_INIT
+
+#include <build2/types>
+#include <build2/utility>
+
+#include <build2/module>
+
+namespace build2
+{
+  namespace config
+  {
+    void
+    boot (scope&, const location&, unique_ptr<module_base>&);
+
+    bool
+    init (scope&,
+          scope&,
+          const location&,
+          unique_ptr<module_base>&,
+          bool,
+          bool,
+          const variable_map&);
+  }
+}
+
+#endif // BUILD2_CONFIG_INIT
diff --git a/build2/config/module.cxx b/build2/config/init.cxx
index de106b7..6c713df 100644
--- a/build2/config/module.cxx
+++ b/build2/config/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/config/module.cxx -*- C++ -*-
+// file      : build2/config/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/config/module>
+#include <build2/config/init>
 
 #include <build2/file>
 #include <build2/rule>
@@ -11,6 +11,7 @@
 #include <build2/filesystem> // file_exists()
 #include <build2/diagnostics>
 
+#include <build2/config/module>
 #include <build2/config/utility>
 #include <build2/config/operation>
 
diff --git a/build2/config/module b/build2/config/module
index 21a7e28..e6fb197 100644
--- a/build2/config/module
+++ b/build2/config/module
@@ -78,20 +78,8 @@ namespace build2
     struct module: module_base
     {
       config::saved_modules saved_modules;
-      static const string name;
+      static const string name; // init.cxx
     };
-
-    void
-    boot (scope&, const location&, unique_ptr<module_base>&);
-
-    bool
-    init (scope&,
-          scope&,
-          const location&,
-          unique_ptr<module_base>&,
-          bool,
-          bool,
-          const variable_map&);
   }
 }
 
diff --git a/build2/cxx/module b/build2/cxx/init
index 8c1a01f..a06f193 100644
--- a/build2/cxx/module
+++ b/build2/cxx/init
@@ -1,9 +1,9 @@
-// file      : build2/cxx/module -*- C++ -*-
+// file      : build2/cxx/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CXX_MODULE
-#define BUILD2_CXX_MODULE
+#ifndef BUILD2_CXX_INIT
+#define BUILD2_CXX_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -34,4 +34,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CXX_MODULE
+#endif // BUILD2_CXX_INIT
diff --git a/build2/cxx/module.cxx b/build2/cxx/init.cxx
index fd98114..7170282 100644
--- a/build2/cxx/module.cxx
+++ b/build2/cxx/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/cxx/module.cxx -*- C++ -*-
+// file      : build2/cxx/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cxx/module>
+#include <build2/cxx/init>
 
 #include <build2/scope>
 #include <build2/context>
diff --git a/build2/dist/module b/build2/dist/init
index 3c43c1f..9a439ea 100644
--- a/build2/dist/module
+++ b/build2/dist/init
@@ -1,9 +1,9 @@
-// file      : build2/dist/module -*- C++ -*-
+// file      : build2/dist/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DIST_MODULE
-#define BUILD2_DIST_MODULE
+#ifndef BUILD2_DIST_INIT
+#define BUILD2_DIST_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_DIST_MODULE
+#endif // BUILD2_DIST_INIT
diff --git a/build2/dist/module.cxx b/build2/dist/init.cxx
index 2da75c4..637a232 100644
--- a/build2/dist/module.cxx
+++ b/build2/dist/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/dist/module.cxx -*- C++ -*-
+// file      : build2/dist/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dist/module>
+#include <build2/dist/init>
 
 #include <build2/scope>
 #include <build2/file>
diff --git a/build2/install/module b/build2/install/init
index 3f59fee..926d1c3 100644
--- a/build2/install/module
+++ b/build2/install/init
@@ -1,9 +1,9 @@
-// file      : build2/install/module -*- C++ -*-
+// file      : build2/install/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_INSTALL_MODULE
-#define BUILD2_INSTALL_MODULE
+#ifndef BUILD2_INSTALL_INIT
+#define BUILD2_INSTALL_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_INSTALL_MODULE
+#endif // BUILD2_INSTALL_INIT
diff --git a/build2/install/module.cxx b/build2/install/init.cxx
index 18ce2ad..1e092e8 100644
--- a/build2/install/module.cxx
+++ b/build2/install/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/install/module.cxx -*- C++ -*-
+// file      : build2/install/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/install/module>
+#include <build2/install/init>
 
 #include <build2/scope>
 #include <build2/target>
diff --git a/build2/test/module b/build2/test/init
index dacb364..ec0c4b4 100644
--- a/build2/test/module
+++ b/build2/test/init
@@ -1,9 +1,9 @@
-// file      : build2/test/module -*- C++ -*-
+// file      : build2/test/init -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_MODULE
-#define BUILD2_TEST_MODULE
+#ifndef BUILD2_TEST_INIT
+#define BUILD2_TEST_INIT
 
 #include <build2/types>
 #include <build2/utility>
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_MODULE
+#endif // BUILD2_TEST_INIT
diff --git a/build2/test/module.cxx b/build2/test/init.cxx
index 83ccf3c..bd03f00 100644
--- a/build2/test/module.cxx
+++ b/build2/test/init.cxx
@@ -1,8 +1,8 @@
-// file      : build2/test/module.cxx -*- C++ -*-
+// file      : build2/test/init.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/module>
+#include <build2/test/init>
 
 #include <build2/scope>
 #include <build2/target>