coder137 · coder137 · Dec 3, 2021 · Dec 1, 2021 · Dec 1, 2021 · Dec 1, 2021
diff --git a/.github/workflows/linux_gcc_cmake_build.yml b/.github/workflows/linux_gcc_cmake_build.yml
@@ -63,6 +63,11 @@ jobs:
         run: |
           ctest --preset=${{env.BUILD_DEV_ALL_PRESET}} --parallel 2
 
+      - name: Bootstrap through CMake
+        working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}}
+        run: |
+          cmake --build . --target run_buildcc_lib_bootstrap_linux_gcc
+
       - name: Install
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}}
         run: |
@@ -110,7 +115,7 @@ jobs:
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}}
         run: |
           cmake --build . --target run_hybrid_depchaining_example_linux
-      
+
       - name: Hybrid Target Info Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}}
         run: |
@@ -174,6 +179,11 @@ jobs:
           cat ../codecov.yml | curl --data-binary @- https://codecov.io/validate
           bash <(curl -s https://codecov.io/bash) -f coverage_truncated.info || echo "Codecov did not collect coverage reports"
 
+      - name: Bootstrap through CMake
+        working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}}
+        run: |
+          cmake --build . --target run_buildcc_lib_bootstrap_linux_gcc
+
       - name: Install
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}}
         run: |

diff --git a/.github/workflows/win_cmake_build.yml b/.github/workflows/win_cmake_build.yml
@@ -50,6 +50,11 @@ jobs:
           cmake --build --list-presets
           cmake --build --preset=${{env.BUILD_MSVC_PRESET}} --config Release --parallel 2
 
+      - name: Bootstrap through CMake
+        working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
+        run: |
+          cmake --build . --config Release --target run_buildcc_lib_bootstrap_win_msvc --parallel 2
+
       - name: Install
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
@@ -68,42 +73,42 @@ jobs:
       - name: Hybrid Simple Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_simple_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_simple_example_win
 
       - name: Hybrid Foolib Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_foolib_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_foolib_example_win
 
       - name: Hybrid External Lib Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_externallib_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_externallib_example_win
 
       - name: Hybrid Custom Target Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_customtarget_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_customtarget_example_win
 
       - name: Hybrid Generic Target Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_generic_example
+          cmake --build . --config Release --parallel 2 --target run_hybrid_generic_example
 
       - name: Hybrid PCH Target Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_pch_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_pch_example_win
 
       - name: Hybrid Dep Chaining Target Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_depchaining_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_depchaining_example_win
 
       - name: Hybrid Target Info Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
-          cmake --build . --target run_hybrid_targetinfo_example_win
+          cmake --build . --config Release --parallel 2 --target run_hybrid_targetinfo_example_win
 
   build_clang:
     name: Clang single and interface Lib

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,8 @@ option(BUILDCC_FLATBUFFERS_FLATC "Build Flatbuffer::Flatc Compiler" ON)
 option(BUILDCC_BUILD_AS_SINGLE_LIB "Build all internal libs and modules as part of the buildcc library" ON)
 option(BUILDCC_BUILD_AS_INTERFACE "Build all internal libs and modules seperately and link" OFF)
 
+option(BUILDCC_BOOTSTRAP_THROUGH_CMAKE "Bootstrap buildcc through CMake" OFF)
+
 # NOTE, Conflict with Clang-Tidy on certain compilers
 option(BUILDCC_PRECOMPILE_HEADERS "Enable Buildcc precompile headers" OFF)
 option(BUILDCC_EXAMPLES "Enable Buildcc Examples" OFF)
@@ -70,15 +72,10 @@ include(cmake/tool/doxygen.cmake)
 
 # Libraries
 include(cmake/target/flatbuffers.cmake)
-
 include(cmake/target/fmt.cmake)
-
 include(cmake/target/spdlog.cmake)
-
 include(cmake/target/cli11.cmake)
-
 include(cmake/target/taskflow.cmake)
-
 include(cmake/target/tpl.cmake)
 
 if (${TESTING})
@@ -117,3 +114,7 @@ if (${BUILDCC_EXAMPLES})
     add_subdirectory(example/hybrid/dep_chaining)
     add_subdirectory(example/hybrid/target_info)
 endif()
+
+if (${BUILDCC_BOOTSTRAP_THROUGH_CMAKE})
+    add_subdirectory(bootstrap)
+endif()
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -20,6 +20,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": true,
                 "BUILDCC_BUILD_AS_INTERFACE": true,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": true,
                 "BUILDCC_PRECOMPILE_HEADERS": true,
                 "BUILDCC_EXAMPLES": true,
                 "BUILDCC_TESTING": true,
@@ -43,6 +44,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": true,
                 "BUILDCC_BUILD_AS_INTERFACE": false,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": true,
                 "BUILDCC_PRECOMPILE_HEADERS": true,
                 "BUILDCC_EXAMPLES": true,
                 "BUILDCC_TESTING": true,
@@ -66,6 +68,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": false,
                 "BUILDCC_BUILD_AS_INTERFACE": true,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": false,
                 "BUILDCC_PRECOMPILE_HEADERS": true,
                 "BUILDCC_EXAMPLES": false,
                 "BUILDCC_TESTING": true,
@@ -89,6 +92,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": true,
                 "BUILDCC_BUILD_AS_INTERFACE": true,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": true,
                 "BUILDCC_PRECOMPILE_HEADERS": true,
                 "BUILDCC_EXAMPLES": true,
                 "BUILDCC_TESTING": false,
@@ -109,6 +113,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": true,
                 "BUILDCC_BUILD_AS_INTERFACE": true,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": true,
                 "BUILDCC_PRECOMPILE_HEADERS": true,
                 "BUILDCC_EXAMPLES": true,
                 "BUILDCC_TESTING": false,
@@ -129,6 +134,7 @@
                 "BUILDCC_FLATBUFFERS_FLATC": true,
                 "BUILDCC_BUILD_AS_SINGLE_LIB": true,
                 "BUILDCC_BUILD_AS_INTERFACE": false,
+                "BUILDCC_BOOTSTRAP_THROUGH_CMAKE": false,
                 "BUILDCC_PRECOMPILE_HEADERS": false,
                 "BUILDCC_EXAMPLES": false,
                 "BUILDCC_TESTING": false,

diff --git a/bootstrap/.gitignore b/bootstrap/.gitignore
@@ -0,0 +1 @@
+*.dot
diff --git a/bootstrap/CMakeLists.txt b/bootstrap/CMakeLists.txt
@@ -0,0 +1,49 @@
+add_executable(buildcc_lib_bootstrap
+    main.buildcc.cpp
+)
+target_sources(buildcc_lib_bootstrap PRIVATE
+    src/build_flatbuffers.cpp
+    src/build_cli11.cpp
+    src/build_fmtlib.cpp
+    src/build_spdlog.cpp
+    src/build_taskflow.cpp
+    src/build_tpl.cpp
+
+    src/build_buildcc.cpp
+)
+target_include_directories(buildcc_lib_bootstrap PRIVATE
+    include
+)
+target_link_libraries(buildcc_lib_bootstrap PRIVATE buildcc)
+
+# TODO, Add this only if MINGW is used
+# https://github.com/msys2/MINGW-packages/issues/2303
+# Similar issue when adding the Taskflow library
+if (${MINGW})
+    message(WARNING "-Wl,--allow-multiple-definition for MINGW")
+    target_link_options(buildcc_lib_bootstrap PRIVATE -Wl,--allow-multiple-definition)
+endif()
+
+# Linux GCC
+add_custom_target(run_buildcc_lib_bootstrap_linux_gcc
+    COMMAND buildcc_lib_bootstrap --help-all
+    COMMAND buildcc_lib_bootstrap --config ${CMAKE_CURRENT_SOURCE_DIR}/config_default.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/config/toolchain_gcc_linux.toml 
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    VERBATIM USES_TERMINAL
+)
+
+# Win GCC/MINGW
+add_custom_target(run_buildcc_lib_bootstrap_win_gcc
+    COMMAND buildcc_lib_bootstrap --help-all
+    COMMAND buildcc_lib_bootstrap --config ${CMAKE_CURRENT_SOURCE_DIR}/config_default.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/config/toolchain_gcc_win.toml 
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    VERBATIM USES_TERMINAL
+)
+
+# Win MSVC
+add_custom_target(run_buildcc_lib_bootstrap_win_msvc
+    COMMAND buildcc_lib_bootstrap --help-all
+    COMMAND buildcc_lib_bootstrap --config ${CMAKE_CURRENT_SOURCE_DIR}/config_default.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/config/toolchain_msvc_win.toml 
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    VERBATIM USES_TERMINAL
+)
diff --git a/bootstrap/config/toolchain_gcc_linux.toml b/bootstrap/config/toolchain_gcc_linux.toml
@@ -0,0 +1,11 @@
+[toolchain.custom]
+build = true
+test = true
+
+id = "gcc"
+name = "x86_64-linux-gnu"
+asm_compiler = "as"
+c_compiler = "gcc"
+cpp_compiler = "g++"
+archiver = "ar"
+linker = "ld"
diff --git a/bootstrap/config/toolchain_gcc_win.toml b/bootstrap/config/toolchain_gcc_win.toml
@@ -0,0 +1,11 @@
+[toolchain.custom]
+build = true
+test = true
+
+id = "gcc"
+name = "x86_64-w64-mingw32"
+asm_compiler = "as"
+c_compiler = "gcc"
+cpp_compiler = "g++"
+archiver = "ar"
+linker = "ld"
diff --git a/bootstrap/config/toolchain_msvc_win.toml b/bootstrap/config/toolchain_msvc_win.toml
@@ -0,0 +1,11 @@
+[toolchain.custom]
+build = true
+test = true
+
+id = "msvc"
+name = "msvc_x64"
+asm_compiler = "cl"
+c_compiler = "cl"
+cpp_compiler = "cl"
+archiver = "lib"
+linker = "link"
diff --git a/bootstrap/config_default.toml b/bootstrap/config_default.toml
@@ -0,0 +1,5 @@
+root_dir=".."
+build_dir="../_build_bootstrap"
+
+loglevel="trace"
+clean=false
diff --git a/bootstrap/include/bootstrap/build_buildcc.h b/bootstrap/include/bootstrap/build_buildcc.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 Niket Naidu. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BOOTSTRAP_BUILD_BUILDCC_H_
+#define BOOTSTRAP_BUILD_BUILDCC_H_
+
+#include "buildcc.h"
+
+namespace buildcc {
+
+void schema_gen_cb(BaseGenerator &generator, const BaseTarget &flatc_exe);
+
+void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
+                const TargetInfo &flatbuffers_ho, const TargetInfo &fmt_ho,
+                const TargetInfo &spdlog_ho, const TargetInfo &cli11_ho,
+                const TargetInfo &taskflow_ho, const BaseTarget &tpl);
+
+} // namespace buildcc
+
+#endif
diff --git a/bootstrap/include/bootstrap/build_cli11.h b/bootstrap/include/bootstrap/build_cli11.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 Niket Naidu. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BOOTSTRAP_BUILD_CLI11_H_
+#define BOOTSTRAP_BUILD_CLI11_H_
+
+#include "buildcc.h"
+
+namespace buildcc {
+
+void cli11_ho_cb(TargetInfo &info);
+
+} // namespace buildcc
+
+#endif
diff --git a/bootstrap/include/bootstrap/build_flatbuffers.h b/bootstrap/include/bootstrap/build_flatbuffers.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Niket Naidu. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BOOTSTRAP_BUILD_FLATBUFFERS_H_
+#define BOOTSTRAP_BUILD_FLATBUFFERS_H_
+
+#include "buildcc.h"
+
+namespace buildcc {
+
+void build_flatc_exe_cb(BaseTarget &target);
+void flatbuffers_ho_cb(TargetInfo &info);
+
+} // namespace buildcc
+
+#endif
diff --git a/bootstrap/include/bootstrap/build_fmtlib.h b/bootstrap/include/bootstrap/build_fmtlib.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 Niket Naidu. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BOOTSTRAP_BUILD_FMTLIB_H_
+#define BOOTSTRAP_BUILD_FMTLIB_H_
+
+#include "buildcc.h"
+
+namespace buildcc {
+
+void fmt_ho_cb(TargetInfo &info);
+
+} // namespace buildcc
+
+#endif