Buildexe libs (#182)

Author: coder137

.github/workflows/linux_gcc_cmake_build.yml

@@ -63,9 +63,24 @@ jobs:
         run: |
           cmake --build . --target run_buildcc_lib_bootstrap_linux_gcc --config Release
 
+      - name: BuildExe Layout setup
+        working-directory: ${{github.workspace}}/..
+        run: |
+          mkdir buildcc_home
+          export BUILDCC_HOME="${{github.workspace}}/../buildcc_home"
+          echo $BUILDCC_HOME
+          cd buildcc_home
+          mkdir buildcc
+          mkdir libs
+          mkdir extensions
+          cd ..
+          ls
+
       - name: BuildExe IM example tiny-process-library
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_ALL}}
         run: |
+          export BUILDCC_HOME="${{github.workspace}}/../buildcc_home"
+          echo $BUILDCC_HOME
           cmake --build . --target run_buildexe_im_tpl_linux_gcc --config Release
 
       - name: CPack Release
@@ -200,9 +215,24 @@ jobs:
         run: |
           cmake --build . --target run_buildcc_lib_bootstrap_linux_gcc --config Release
 
+      - name: BuildExe Layout setup
+        working-directory: ${{github.workspace}}/..
+        run: |
+          mkdir buildcc_home
+          export BUILDCC_HOME="${{github.workspace}}/../buildcc_home"
+          echo $BUILDCC_HOME
+          cd buildcc_home
+          mkdir buildcc
+          mkdir libs
+          mkdir extensions
+          cd ..
+          ls
+
       - name: BuildExe IM example tiny-process-library
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_DEV_SINGLE}}
         run: |
+          export BUILDCC_HOME="${{github.workspace}}/../buildcc_home"
+          echo $BUILDCC_HOME
           cmake --build . --target run_buildexe_im_tpl_linux_gcc --config Release
 
       # - name: TODO, BuildExe SM simple hyrid example

.github/workflows/win_cmake_build.yml

@@ -55,9 +55,23 @@ jobs:
         run: |
           cmake --build . --config Release --target run_buildcc_lib_bootstrap_win_msvc --parallel 2
 
+      - name: BuildExe Layout setup
+        working-directory: ${{github.workspace}}/..
+        run: |
+          mkdir buildcc_home
+          $env:BUILDCC_HOME = "${{github.workspace}}/../buildcc_home"
+          $env:BUILDCC_HOME
+          cd buildcc_home
+          mkdir buildcc
+          mkdir libs
+          mkdir extensions
+          cd ..
+          dir
+
       - name: BuildExe IM example tiny-process-library
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER_MSVC_DEV_ALL}}
         run: |
+          $env:BUILDCC_HOME = "${{github.workspace}}/../buildcc_home"
           cmake --build . --config Release --target run_buildexe_im_tpl_win_msvc
 
       # - name: TODO, BuildExe SM simple hyrid example

buildexe/CMakeLists.txt

@@ -1,6 +1,9 @@
 add_executable(buildexe
     buildexe.cpp
 
+    src/build_env_home.cpp
+    include/buildexe/build_env_home.h
+
     src/args_setup.cpp
     include/buildexe/args_setup.h
 
@@ -84,3 +87,27 @@ add_custom_target(run_buildexe_sm_simple_linux_gcc
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../example/hybrid/simple
     VERBATIM USES_TERMINAL
 )
+
+# [Script Mode] BuildExe libs example WIN GCC
+add_custom_target(run_buildexe_libs_hybrid_win_gcc
+    COMMAND buildexe --help-all
+    COMMAND buildexe --config compile.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/../bootstrap/config/toolchain_win_gcc.toml
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../example/buildexe/libs
+    VERBATIM USES_TERMINAL
+)
+
+# [Script Mode] BuildExe libs example WIN MSVC
+add_custom_target(run_buildexe_libs_hybrid_win_msvc
+    COMMAND buildexe --help-all
+    COMMAND buildexe --config compile.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/../bootstrap/config/toolchain_win_msvc.toml
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../example/buildexe/libs
+    VERBATIM USES_TERMINAL
+)
+
+# [Script Mode] BuildExe libs example LINUX GCC
+add_custom_target(run_buildexe_libs_hybrid_linux_gcc
+    COMMAND buildexe --help-all
+    COMMAND buildexe --config compile.toml --config ${CMAKE_CURRENT_SOURCE_DIR}/../bootstrap/config/toolchain_linux_gcc.toml
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../example/buildexe/libs
+    VERBATIM USES_TERMINAL
+)

buildexe/buildexe.cpp

@@ -17,6 +17,7 @@
 #include "buildcc.h"
 
 #include "buildexe/args_setup.h"
+#include "buildexe/build_env_home.h"
 #include "buildexe/build_env_setup.h"
 #include "buildexe/toolchain_setup.h"
 
@@ -34,25 +35,15 @@ constexpr const char *const kTag = "BuildExe";
 
 static void clean_cb();
 
+// TODO, Update BuildExeArgs with internal functions
 int main(int argc, char **argv) {
-  Args args;
+  //
+  BuildccHome::Init();
 
-  ArgToolchain host_toolchain_arg;
-  args.AddToolchain("host", "Host Toolchain", host_toolchain_arg);
-
-  BuildExeMode out_mode;
-  setup_arg_buildexe_mode(args, out_mode);
-
-  ArgTargetInfo out_targetinfo;
-  setup_arg_target_info(args, out_targetinfo);
-
-  ArgTargetInputs out_targetinputs;
-  setup_arg_target_inputs(args, out_targetinputs);
-
-  ArgScriptInfo out_scriptinfo;
-  setup_arg_script_mode(args, out_scriptinfo);
-
-  args.Parse(argc, argv);
+  //
+  BuildExeArgs buildexe_args;
+  buildexe_args.Setup();
+  buildexe_args.Parse(argc, argv);
 
   // TODO, Add Verification subcommand here for OS, Compiler etc!
   // os win, linux considerations
@@ -63,33 +54,24 @@ int main(int argc, char **argv) {
   // TODO, Add libraries (git cloned)
   // TODO, Add extension (git cloned)
 
-  Register reg(args);
+  Register reg(buildexe_args.GetArgs());
   reg.Clean(clean_cb);
 
-  // Build
-  BaseToolchain toolchain = host_toolchain_arg.ConstructToolchain();
+  // Host Toolchain
+  BaseToolchain toolchain =
+      buildexe_args.GetHostToolchainArg().ConstructToolchain();
   find_toolchain_verify(toolchain);
-  if (out_mode == BuildExeMode::Script) {
+  if (buildexe_args.GetBuildMode() == BuildExeMode::Script) {
     host_toolchain_verify(toolchain);
   }
 
-  // Build environment
-  BuildEnvSetup build_setup(reg, toolchain, out_targetinfo, out_targetinputs);
-  if (out_mode == BuildExeMode::Script) {
-    // buildcc and user target
-    build_setup.ConstructUserTargetWithBuildcc();
-  } else {
-    // user target
-    build_setup.ConstructUserTarget();
-  }
-  reg.RunBuild();
-
-  // Run
-  if (out_mode == BuildExeMode::Script) {
-    env::log_info(kTag,
-                  fmt::format("************** Running '{}' **************",
-                              out_targetinfo.name));
-    build_setup.RunUserTarget(out_scriptinfo);
+  // Build Target
+  BuildEnvSetup build_setup(reg, toolchain, buildexe_args);
+  build_setup.ConstructTarget();
+
+  // Run Target if script mode
+  if (buildexe_args.GetBuildMode() == BuildExeMode::Script) {
+    build_setup.RunUserTarget(buildexe_args.GetScriptInfo());
   }
 
   // - Clang Compile Commands

buildexe/include/buildexe/args_setup.h

@@ -54,10 +54,50 @@ struct ArgScriptInfo {
   std::vector<std::string> configs;
 };
 
-void setup_arg_buildexe_mode(Args &args, BuildExeMode &out);
-void setup_arg_target_info(Args &args, ArgTargetInfo &out);
-void setup_arg_target_inputs(Args &args, ArgTargetInputs &out);
-void setup_arg_script_mode(Args &args, ArgScriptInfo &out);
+struct LibInfo {
+  std::string lib_name;
+  std::string absolute_lib_path;
+};
+
+class BuildExeArgs {
+public:
+  void Setup();
+  void Parse(int argc, char **argv) { args_.Parse(argc, argv); }
+
+  // Getters
+  const Args &GetArgs() const { return args_; }
+  const ArgToolchain &GetHostToolchainArg() const {
+    return host_toolchain_arg_;
+  }
+  const ArgTargetInfo &GetTargetInfo() const { return out_targetinfo_; }
+  const ArgTargetInputs &GetTargetInputs() const { return out_targetinputs_; }
+  const ArgScriptInfo &GetScriptInfo() const { return out_scriptinfo_; }
+  BuildExeMode GetBuildMode() const { return out_mode_; }
+
+  const std::vector<LibInfo> &GetLibsInfo() const { return libs_info_; }
+  const std::vector<fs::path> &GetLibBuildFiles() const {
+    return lib_build_files_;
+  }
+
+private:
+  void SetupBuildMode();
+  void SetupTargetInfo();
+  void SetupTargetInputs();
+  void SetupScriptMode();
+  void SetupLibs();
+
+private:
+  Args args_;
+  ArgToolchain host_toolchain_arg_;
+  ArgTargetInfo out_targetinfo_;
+  ArgTargetInputs out_targetinputs_;
+  ArgScriptInfo out_scriptinfo_;
+
+  BuildExeMode out_mode_;
+
+  std::vector<LibInfo> libs_info_;
+  std::vector<fs::path> lib_build_files_;
+};
 
 } // namespace buildcc
 

buildexe/include/buildexe/build_env_home.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021-2022 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 BUILDEXE_BUILD_ENV_HOME_H_
+#define BUILDEXE_BUILD_ENV_HOME_H_
+
+#include "buildcc.h"
+
+namespace buildcc {
+
+class BuildccHome {
+public:
+  static void Init();
+
+  static const fs::path &GetBuildccHomeDir() {
+    ExpectInitialized();
+    return buildcc_home_;
+  }
+  static const fs::path &GetBuildccBaseDir() {
+    ExpectInitialized();
+    return buildcc_base_;
+  }
+  static const fs::path &GetBuildccLibsDir() {
+    ExpectInitialized();
+    return buildcc_libs_;
+  }
+  static const fs::path &GetBuildccExtensionsDir() {
+    ExpectInitialized();
+    return buildcc_extensions_;
+  }
+
+  static bool IsInitialized() { return initialized_; }
+  static void ExpectInitialized() {
+    env::assert_fatal(IsInitialized(), "BuildccHome is not initialized");
+  }
+
+private:
+  static fs::path buildcc_home_;
+  static fs::path buildcc_base_;
+  static fs::path buildcc_libs_;
+  static fs::path buildcc_extensions_;
+  static bool initialized_;
+};
+
+} // namespace buildcc
+
+#endif

buildexe/include/buildexe/build_env_setup.h

@@ -20,6 +20,7 @@
 #include "buildcc.h"
 
 #include "bootstrap/build_buildcc.h"
+
 #include "buildexe/args_setup.h"
 
 namespace buildcc {
@@ -31,15 +32,12 @@ class BuildEnvSetup {
 
 public:
   BuildEnvSetup(Register &reg, const BaseToolchain &toolchain,
-                const ArgTargetInfo &arg_target_info,
-                const ArgTargetInputs &arg_target_inputs)
-      : reg_(reg), toolchain_(toolchain), arg_target_info_(arg_target_info),
-        arg_target_inputs_(arg_target_inputs) {
+                const BuildExeArgs &buildexe_args)
+      : reg_(reg), toolchain_(toolchain), buildexe_args_(buildexe_args) {
     state_.build = true;
   }
 
-  void ConstructUserTarget();
-  void ConstructUserTargetWithBuildcc();
+  void ConstructTarget();
 
   void RunUserTarget(const ArgScriptInfo &arg_script_info);
 
@@ -52,19 +50,21 @@ class BuildEnvSetup {
   }
 
 private:
+  void ConstructUserTarget();
+  void ConstructUserTargetWithBuildcc();
+
   void BuildccTargetSetup();
   void UserTargetSetup();
   void UserTargetCb();
-  void UserTargetBuild();
-
   void UserTargetWithBuildccSetup();
+  void UserTargetWithLibsSetup();
+  void UserTargetBuild();
   void DepUserTargetOnBuildcc();
 
 private:
   Register &reg_;
   const BaseToolchain &toolchain_;
-  const ArgTargetInfo &arg_target_info_;
-  const ArgTargetInputs &arg_target_inputs_;
+  const BuildExeArgs &buildexe_args_;
 
   ArgToolchainState state_;
   PersistentStorage storage_;