NotificationsYou must be signed in to change notification settings
Fork3
Star49

Commitcc5ad25

authored

Toolchain cleanup (#198)

1 parentf8f6427 commitcc5ad25Copy full SHA for cc5ad25

File tree

34 files changed

+216

-200

lines changed

buildcc
- lib
  - args
    - include/args
      - args.h
    - src
      - args.cpp
    - test
      - test_args.cpp
      - test_register.cpp
  - target
    - include/target
    - src
      - api
        target_getter.cpp
        target_info_getter.cpp
      - target_info
        target_info.cpp
      - target
        build.cpp
        target.cpp
    - test/target
  - toolchain
    - include/toolchain
      - common
        function_lock.h
      - toolchain.h
    - src/api
      - toolchain_verify.cpp
    - test
      - test_toolchain_verify.cpp
- toolchains/include/toolchains
  - toolchain_gcc.h
  - toolchain_msvc.h
docs/source/user_api
- toolchain.rst
- toolchain_utils.rst

34 files changed

+216

-200

lines changed

`‎buildcc/lib/args/include/args/args.h‎`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,33 +48,32 @@ struct ArgToolchainState {`
`48`	`48`	`structArgToolchain {`
`49`	`49`	`ArgToolchain(){};`
`50`	`50`	`ArgToolchain(ToolchainId initial_id,const std::string &initial_name,`
`51`		`-const std::string &initial_asm_compiler,`
	`51`	`+const ToolchainBinaries &initial_binaries)`
	`52`	`+ : id(initial_id), name(initial_name), binaries(initial_binaries) {}`
	`53`	`+ArgToolchain(ToolchainId initial_id,const std::string &initial_name,`
	`54`	`+const std::string &initial_assembler,`
`52`	`55`	`const std::string &initial_c_compiler,`
`53`	`56`	`const std::string &initial_cpp_compiler,`
`54`	`57`	`const std::string &initial_archiver,`
`55`	`58`	`const std::string &initial_linker)`
`56`		`- : id(initial_id), name(initial_name), asm_compiler(initial_asm_compiler),`
`57`		`-c_compiler(initial_c_compiler), cpp_compiler(initial_cpp_compiler),`
`58`		`- archiver(initial_archiver), linker(initial_linker) {}`
	`59`	`+ : ArgToolchain(initial_id, initial_name,`
	`60`	`+ToolchainBinaries(initial_assembler, initial_c_compiler,`
	`61`	`+ initial_cpp_compiler, initial_archiver,`
	`62`	`+ initial_linker)) {}`
`59`	`63`
`60`	`64`	`/**`
`61`	`65`	`* @brief Construct a BaseToolchain from the arguments supplied through the`
`62`	`66`	`* command line information`
`63`	`67`	`*/`
	`68`	`+// TODO, Update this for lock and ToolchainConfig`
`64`	`69`	`BaseToolchainConstructToolchain()const {`
`65`		`- BaseToolchaintoolchain(id, name, asm_compiler, c_compiler, cpp_compiler,`
`66`		`- archiver, linker);`
`67`		`-return toolchain;`
	`70`	`+returnBaseToolchain(id, name, binaries);`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`ArgToolchainState state;`
`71`	`74`	`ToolchainId id{ToolchainId::Undefined};`
`72`	`75`	`std::string name{""};`
`73`		`- std::string asm_compiler{""};`
`74`		`- std::string c_compiler{""};`
`75`		`- std::string cpp_compiler{""};`
`76`		`- std::string archiver{""};`
`77`		`- std::string linker{""};`
	`76`	`+ ToolchainBinaries binaries;`
`78`	`77`	`};`
`79`	`78`
`80`	`79`	`// NOTE, Incomplete without pch_compile_command`

`‎buildcc/lib/args/src/args.cpp‎`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ const std::unordered_map<const char *, buildcc::env::LogLevel> kLogLevelMap{`
`75`	`75`	`{"critical", buildcc::env::LogLevel::Critical},`
`76`	`76`	`};`
`77`	`77`
`78`		`-const std::unordered_map<constchar *, buildcc::Toolchain::Id>kToolchainIdMap{`
	`78`	`+const std::unordered_map<constchar *, buildcc::ToolchainId>kToolchainIdMap{`
`79`	`79`	`{"gcc", buildcc::ToolchainId::Gcc},`
`80`	`80`	`{"msvc", buildcc::ToolchainId::Msvc},`
`81`	`81`	`{"mingw", buildcc::ToolchainId::MinGW},`
`@@ -99,16 +99,16 @@ void Args::AddToolchain(const std::string &name, const std::string &description,`
`99`	`99`	`->transform(CLI::CheckedTransformer(kToolchainIdMap, CLI::ignore_case))`
`100`	`100`	`->default_val(initial.id);`
`101`	`101`	`t_user->add_option(kToolchainNameParam, out.name)->default_val(initial.name);`
`102`		`- t_user->add_option(kToolchainAsmCompilerParam, out.asm_compiler)`
`103`		`- ->default_val(initial.asm_compiler);`
`104`		`- t_user->add_option(kToolchainCCompilerParam, out.c_compiler)`
`105`		`- ->default_val(initial.c_compiler);`
`106`		`- t_user->add_option(kToolchainCppCompilerParam, out.cpp_compiler)`
`107`		`- ->default_val(initial.cpp_compiler);`
`108`		`- t_user->add_option(kToolchainArchiverParam, out.archiver)`
`109`		`- ->default_val(initial.archiver);`
`110`		`- t_user->add_option(kToolchainLinkerParam, out.linker)`
`111`		`- ->default_val(initial.linker);`
	`102`	`+ t_user->add_option(kToolchainAsmCompilerParam, out.binaries.assembler)`
	`103`	`+ ->default_val(initial.binaries.assembler);`
	`104`	`+ t_user->add_option(kToolchainCCompilerParam, out.binaries.c_compiler)`
	`105`	`+ ->default_val(initial.binaries.c_compiler);`
	`106`	`+ t_user->add_option(kToolchainCppCompilerParam, out.binaries.cpp_compiler)`
	`107`	`+ ->default_val(initial.binaries.cpp_compiler);`
	`108`	`+ t_user->add_option(kToolchainArchiverParam, out.binaries.archiver)`
	`109`	`+ ->default_val(initial.binaries.archiver);`
	`110`	`+ t_user->add_option(kToolchainLinkerParam, out.binaries.linker)`
	`111`	`+ ->default_val(initial.binaries.linker);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`voidArgs::AddTarget(const std::string &name,const std::string &description,`

`‎buildcc/lib/args/test/test_args.cpp‎`

Lines changed: 36 additions & 36 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,13 @@ TEST(ArgsTestGroup, Args_CustomToolchain) {`
`66`	`66`	`// Toolchain`
`67`	`67`	`CHECK_TRUE(gcc_toolchain.state.build);`
`68`	`68`	`CHECK_FALSE(gcc_toolchain.state.test);`
`69`		`-CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);`
	`69`	`+CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);`
`70`	`70`	`STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");`
`71`		`-STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(),"as");`
`72`		`-STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(),"gcc");`
`73`		`-STRCMP_EQUAL(gcc_toolchain.cpp_compiler.c_str(),"g++");`
`74`		`-STRCMP_EQUAL(gcc_toolchain.archiver.c_str(),"ar");`
`75`		`-STRCMP_EQUAL(gcc_toolchain.linker.c_str(),"ld");`
	`71`	`+STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");`
	`72`	`+STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");`
	`73`	`+STRCMP_EQUAL(gcc_toolchain.binaries.cpp_compiler.c_str(),"g++");`
	`74`	`+STRCMP_EQUAL(gcc_toolchain.binaries.archiver.c_str(),"ar");`
	`75`	`+STRCMP_EQUAL(gcc_toolchain.binaries.linker.c_str(),"ld");`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {`
`@@ -104,24 +104,24 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {`
`104`	`104`	`// GCC`
`105`	`105`	`CHECK_TRUE(gcc_toolchain.state.build);`
`106`	`106`	`CHECK_FALSE(gcc_toolchain.state.test);`
`107`		`-CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);`
	`107`	`+CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);`
`108`	`108`	`STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");`
`109`		`-STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(),"as");`
`110`		`-STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(),"gcc");`
`111`		`-STRCMP_EQUAL(gcc_toolchain.cpp_compiler.c_str(),"g++");`
`112`		`-STRCMP_EQUAL(gcc_toolchain.archiver.c_str(),"ar");`
`113`		`-STRCMP_EQUAL(gcc_toolchain.linker.c_str(),"ld");`
	`109`	`+STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");`
	`110`	`+STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");`
	`111`	`+STRCMP_EQUAL(gcc_toolchain.binaries.cpp_compiler.c_str(),"g++");`
	`112`	`+STRCMP_EQUAL(gcc_toolchain.binaries.archiver.c_str(),"ar");`
	`113`	`+STRCMP_EQUAL(gcc_toolchain.binaries.linker.c_str(),"ld");`
`114`	`114`
`115`	`115`	`// MSVC`
`116`	`116`	`CHECK_TRUE(msvc_toolchain.state.build);`
`117`	`117`	`CHECK_TRUE(msvc_toolchain.state.test);`
`118`		`-CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);`
	`118`	`+CHECK(msvc_toolchain.id == buildcc::ToolchainId::Msvc);`
`119`	`119`	`STRCMP_EQUAL(msvc_toolchain.name.c_str(),"msvc");`
`120`		`-STRCMP_EQUAL(msvc_toolchain.asm_compiler.c_str(),"cl");`
`121`		`-STRCMP_EQUAL(msvc_toolchain.c_compiler.c_str(),"cl");`
`122`		`-STRCMP_EQUAL(msvc_toolchain.cpp_compiler.c_str(),"cl");`
`123`		`-STRCMP_EQUAL(msvc_toolchain.archiver.c_str(),"lib");`
`124`		`-STRCMP_EQUAL(msvc_toolchain.linker.c_str(),"link");`
	`120`	`+STRCMP_EQUAL(msvc_toolchain.binaries.assembler.c_str(),"cl");`
	`121`	`+STRCMP_EQUAL(msvc_toolchain.binaries.c_compiler.c_str(),"cl");`
	`122`	`+STRCMP_EQUAL(msvc_toolchain.binaries.cpp_compiler.c_str(),"cl");`
	`123`	`+STRCMP_EQUAL(msvc_toolchain.binaries.archiver.c_str(),"lib");`
	`124`	`+STRCMP_EQUAL(msvc_toolchain.binaries.linker.c_str(),"link");`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`TEST(ArgsTestGroup, Args_DuplicateCustomToolchain) {`
`@@ -165,13 +165,13 @@ TEST(ArgsTestGroup, Args_CustomTarget) {`
`165`	`165`	`// Toolchain`
`166`	`166`	`CHECK_TRUE(gcc_toolchain.state.build);`
`167`	`167`	`CHECK_FALSE(gcc_toolchain.state.test);`
`168`		`-CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);`
	`168`	`+CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);`
`169`	`169`	`STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");`
`170`		`-STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(),"as");`
`171`		`-STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(),"gcc");`
`172`		`-STRCMP_EQUAL(gcc_toolchain.cpp_compiler.c_str(),"g++");`
`173`		`-STRCMP_EQUAL(gcc_toolchain.archiver.c_str(),"ar");`
`174`		`-STRCMP_EQUAL(gcc_toolchain.linker.c_str(),"ld");`
	`170`	`+STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");`
	`171`	`+STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");`
	`172`	`+STRCMP_EQUAL(gcc_toolchain.binaries.cpp_compiler.c_str(),"g++");`
	`173`	`+STRCMP_EQUAL(gcc_toolchain.binaries.archiver.c_str(),"ar");`
	`174`	`+STRCMP_EQUAL(gcc_toolchain.binaries.linker.c_str(),"ld");`
`175`	`175`
`176`	`176`	`// Target`
`177`	`177`	`STRCMP_EQUAL(gcc_target.compile_command.c_str(),`
`@@ -219,13 +219,13 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {`
`219`	`219`	`// Toolchain`
`220`	`220`	`CHECK_TRUE(gcc_toolchain.state.build);`
`221`	`221`	`CHECK_FALSE(gcc_toolchain.state.test);`
`222`		`-CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);`
	`222`	`+CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);`
`223`	`223`	`STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");`
`224`		`-STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(),"as");`
`225`		`-STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(),"gcc");`
`226`		`-STRCMP_EQUAL(gcc_toolchain.cpp_compiler.c_str(),"g++");`
`227`		`-STRCMP_EQUAL(gcc_toolchain.archiver.c_str(),"ar");`
`228`		`-STRCMP_EQUAL(gcc_toolchain.linker.c_str(),"ld");`
	`224`	`+STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");`
	`225`	`+STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");`
	`226`	`+STRCMP_EQUAL(gcc_toolchain.binaries.cpp_compiler.c_str(),"g++");`
	`227`	`+STRCMP_EQUAL(gcc_toolchain.binaries.archiver.c_str(),"ar");`
	`228`	`+STRCMP_EQUAL(gcc_toolchain.binaries.linker.c_str(),"ld");`
`229`	`229`
`230`	`230`	`// Target`
`231`	`231`	`STRCMP_EQUAL(gcc_target.compile_command.c_str(),`
`@@ -240,13 +240,13 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {`
`240`	`240`	`// Toolchain`
`241`	`241`	`CHECK_TRUE(msvc_toolchain.state.build);`
`242`	`242`	`CHECK_TRUE(msvc_toolchain.state.test);`
`243`		`-CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);`
	`243`	`+CHECK(msvc_toolchain.id == buildcc::ToolchainId::Msvc);`
`244`	`244`	`STRCMP_EQUAL(msvc_toolchain.name.c_str(),"msvc");`
`245`		`-STRCMP_EQUAL(msvc_toolchain.asm_compiler.c_str(),"cl");`
`246`		`-STRCMP_EQUAL(msvc_toolchain.c_compiler.c_str(),"cl");`
`247`		`-STRCMP_EQUAL(msvc_toolchain.cpp_compiler.c_str(),"cl");`
`248`		`-STRCMP_EQUAL(msvc_toolchain.archiver.c_str(),"lib");`
`249`		`-STRCMP_EQUAL(msvc_toolchain.linker.c_str(),"link");`
	`245`	`+STRCMP_EQUAL(msvc_toolchain.binaries.assembler.c_str(),"cl");`
	`246`	`+STRCMP_EQUAL(msvc_toolchain.binaries.c_compiler.c_str(),"cl");`
	`247`	`+STRCMP_EQUAL(msvc_toolchain.binaries.cpp_compiler.c_str(),"cl");`
	`248`	`+STRCMP_EQUAL(msvc_toolchain.binaries.archiver.c_str(),"lib");`
	`249`	`+STRCMP_EQUAL(msvc_toolchain.binaries.linker.c_str(),"link");`
`250`	`250`
`251`	`251`	`// Target`
`252`	`252`	`STRCMP_EQUAL(msvc_target.compile_command.c_str(),`

`‎buildcc/lib/args/test/test_register.cpp‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ TEST(RegisterTestGroup, Register_Build) {`
`100`	`100`
`101`	`101`	`// Make dummy toolchain and target`
`102`	`102`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`103`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`103`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`104`	`104`	`"");`
`105`	`105`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`106`	`106`	`toolchain,"");`
`@@ -148,7 +148,7 @@ TEST(RegisterTestGroup, Register_NoBuildAndDep) {`
`148`	`148`
`149`	`149`	`// Make dummy toolchain and target`
`150`	`150`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`151`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`151`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`152`	`152`	`"");`
`153`	`153`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`154`	`154`	`toolchain,"");`
`@@ -232,7 +232,7 @@ TEST(RegisterTestGroup, Register_BuildAndDep) {`
`232`	`232`
`233`	`233`	`// Make dummy toolchain and target`
`234`	`234`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`235`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`235`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`236`	`236`	`"");`
`237`	`237`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`238`	`238`	`toolchain,"");`
`@@ -327,7 +327,7 @@ TEST(RegisterTestGroup, Register_DepDuplicate) {`
`327`	`327`
`328`	`328`	`// Make dummy toolchain and target`
`329`	`329`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`330`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`330`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`331`	`331`	`"");`
`332`	`332`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`333`	`333`	`toolchain,"");`
`@@ -403,7 +403,7 @@ TEST(RegisterTestGroup, Register_DepCyclic) {`
`403`	`403`
`404`	`404`	`// Make dummy toolchain and target`
`405`	`405`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`406`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`406`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`407`	`407`	`"");`
`408`	`408`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`409`	`409`	`toolchain,"");`
`@@ -479,7 +479,7 @@ TEST(RegisterTestGroup, Register_Test) {`
`479`	`479`
`480`	`480`	`// Make dummy toolchain and target`
`481`	`481`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`482`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`482`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`483`	`483`	`"");`
`484`	`484`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`485`	`485`	`toolchain,"");`
`@@ -564,7 +564,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {`
`564`	`564`
`565`	`565`	`// Make dummy toolchain and target`
`566`	`566`	`buildcc::env::init(fs::current_path(),fs::current_path());`
`567`		`- buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",`
	`567`	`+ buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",`
`568`	`568`	`"");`
`569`	`569`	`buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,`
`570`	`570`	`toolchain,"");`

`‎buildcc/lib/target/include/target/api/target_getter.h‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`#include"toolchain/toolchain.h"`
`26`	`26`
	`27`	`+#include"target/common/target_config.h"`
`27`	`28`	`#include"target/common/target_state.h"`
`28`	`29`
`29`	`30`	`#include"taskflow/taskflow.hpp"`
`@@ -39,6 +40,9 @@ template <typename T> class TargetGetter {`
`39`	`40`	`boolIsBuilt()const;`
`40`	`41`	`boolIsLocked()const;`
`41`	`42`
	`43`	`+// Target Config`
	`44`	`+const TargetConfig &GetConfig()const;`
	`45`	`+`
`42`	`46`	`const std::string &GetName()const;`
`43`	`47`	`const Toolchain &GetToolchain()const;`
`44`	`48`	`TargetTypeGetType()const;`

`‎buildcc/lib/target/include/target/api/target_info_getter.h‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`
`20`	`20`	`#include"schema/path.h"`
`21`	`21`
`22`		`-#include"target/common/target_config.h"`
`23`	`22`	`#include"target/common/target_state.h"`
`24`	`23`
`25`	`24`	`namespacebuildcc::internal {`
`@@ -34,9 +33,6 @@ template <typename T> class TargetInfoGetter {`
`34`	`33`	`const fs::path &GetTargetRootDir()const;`
`35`	`34`	`const fs::path &GetTargetBuildDir()const;`
`36`	`35`
`37`		`-// Target Config`
`38`		`-const TargetConfig &GetConfig()const;`
`39`		`-`
`40`	`36`	`// Target Storer`
`41`	`37`	`const fs_unordered_set &GetSourceFiles()const;`
`42`	`38`	`const fs_unordered_set &GetHeaderFiles()const;`

`‎buildcc/lib/target/include/target/target.h‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,10 @@ class Target : public internal::BuilderInterface,`
`69`	`69`	`explicitTarget(const std::string &name, TargetType type,`
`70`	`70`	`const Toolchain &toolchain,const TargetEnv &env,`
`71`	`71`	`const TargetConfig &config = TargetConfig())`
`72`		`- : TargetInfo(`
`73`		`- toolchain,`
`74`		`-TargetEnv(env.GetTargetRootDir(),`
`75`		`- env.GetTargetBuildDir() / toolchain.GetName() / name),`
`76`		`- config),`
`77`		`- name_(name), type_(type),`
	`72`	`+ : TargetInfo(toolchain, TargetEnv(env.GetTargetRootDir(),`
	`73`	`+ env.GetTargetBuildDir() /`
	`74`	`+ toolchain.GetName() / name)),`
	`75`	`+ name_(name), type_(type), config_(config),`
`78`	`76`	`serialization_(env_.GetTargetBuildDir() / fmt::format("{}.bin", name)),`
`79`	`77`	`compile_pch_(this), compile_object_(this), link_target_(*this) {`
`80`	`78`	`Initialize();`
`@@ -139,6 +137,7 @@ class Target : public internal::BuilderInterface,`
`139`	`137`	`private:`
`140`	`138`	`std::string name_;`
`141`	`139`	`TargetType type_;`
	`140`	`+ TargetConfig config_;`
`142`	`141`	`internal::TargetSerialization serialization_;`
`143`	`142`	`internal::CompilePch compile_pch_;`
`144`	`143`	`internal::CompileObject compile_object_;`

`‎buildcc/lib/target/include/target/target_info.h‎`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,8 @@ class TargetInfo : public internal::SourceApi<TargetInfo>,`
`61`	`61`	`public internal::SyncApi<TargetInfo>,`
`62`	`62`	`public internal::TargetInfoGetter<TargetInfo> {`
`63`	`63`	`public:`
`64`		`-TargetInfo(const BaseToolchain &toolchain,const TargetEnv &env,`
`65`		`-const TargetConfig &config = TargetConfig())`
`66`		`- : toolchain_(toolchain), env_(env), config_(config) {`
	`64`	`+TargetInfo(const BaseToolchain &toolchain,const TargetEnv &env)`
	`65`	`+ : toolchain_(toolchain), env_(env) {`
`67`	`66`	`Initialize();`
`68`	`67`	`}`
`69`	`68`
`@@ -85,11 +84,10 @@ class TargetInfo : public internal::SourceApi<TargetInfo>,`
`85`	`84`	`protected:`
`86`	`85`	`const BaseToolchain &toolchain_;`
`87`	`86`	`TargetEnv env_;`
`88`		`- TargetConfig config_;`
`89`	`87`
`90`	`88`	`//`
`91`		`- UserTargetSchema user_;`
`92`	`89`	`FunctionLock lock_;`
	`90`	`+ UserTargetSchema user_;`
`93`	`91`
`94`	`92`	`private:`
`95`	`93`	`voidInitialize();`

`‎buildcc/lib/target/src/api/target_getter.cpp‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,13 @@ template <typename T> bool TargetGetter<T>::IsBuilt() const {`
`33`	`33`	`return t.state_.IsBuilt();`
`34`	`34`	`}`
`35`	`35`
	`36`	`+// Target Config`
	`37`	`+template<typename T>const TargetConfig &TargetGetter<T>::GetConfig()const {`
	`38`	`+const T &t =static_cast<const T &>(*this);`
	`39`	`+`
	`40`	`+return t.config_;`
	`41`	`+}`
	`42`	`+`
`36`	`43`	`template<typename T>bool TargetGetter<T>::IsLocked()const {`
`37`	`44`	`const T &t =static_cast<const T &>(*this);`
`38`	`45`

`‎buildcc/lib/target/src/api/target_info_getter.cpp‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,6 @@ const fs::path &TargetInfoGetter<T>::GetTargetBuildDir() const {`
`35`	`35`	`return t.env_.GetTargetBuildDir();`
`36`	`36`	`}`
`37`	`37`
`38`		`-// Target Config`
`39`		`-template<typename T>`
`40`		`-const TargetConfig &TargetInfoGetter<T>::GetConfig()const {`
`41`		`-const T &t =static_cast<const T &>(*this);`
`42`		`-`
`43`		`-return t.config_;`
`44`		`-}`
`45`		`-`
`46`	`38`	`// Target Storer`
`47`	`39`	`template<typename T>`
`48`	`40`	`const fs_unordered_set &TargetInfoGetter<T>::GetSourceFiles()const {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcc5ad25

File tree

34 files changed

34 files changed

`‎buildcc/lib/args/include/args/args.h‎`

`‎buildcc/lib/args/src/args.cpp‎`

`‎buildcc/lib/args/test/test_args.cpp‎`

`‎buildcc/lib/args/test/test_register.cpp‎`

`‎buildcc/lib/target/include/target/api/target_getter.h‎`

`‎buildcc/lib/target/include/target/api/target_info_getter.h‎`

`‎buildcc/lib/target/include/target/target.h‎`

`‎buildcc/lib/target/include/target/target_info.h‎`

`‎buildcc/lib/target/src/api/target_getter.cpp‎`

`‎buildcc/lib/target/src/api/target_info_getter.cpp‎`

0 commit comments