Movatterモバイル変換

Skip to content

coder137/build_in_cppPublic

NotificationsYou must be signed in to change notification settings
Fork3
Star49

Commitf8f6427

coder137

authored

Toolchain flags api (#197)

1 parent06bed39 commitf8f6427Copy full SHA for f8f6427

File tree

38 files changed

+362

-160

lines changed

bootstrap/src
- build_buildcc.cpp
buildcc/lib
- args/test
  - test_persistent_storage.cpp
- target
- toolchain
  - CMakeLists.txt
  - include/toolchain
    - api
      - flag_api.h
    - common
      - function_lock.h
    - toolchain.h
  - src/toolchain
    - toolchain.cpp
docs/source/user_api
- toolchain_utils.rst

38 files changed

+362

-160

lines changed

`‎bootstrap/src/build_buildcc.cpp‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,`
`63`	`63`	`// TOOLCHAIN`
`64`	`64`	`target.GlobSources("lib/toolchain/src/api");`
`65`	`65`	`target.GlobSources("lib/toolchain/src/common");`
	`66`	`+ target.GlobSources("lib/toolchain/src/toolchain");`
`66`	`67`	`target.AddIncludeDir("lib/toolchain/include");`
`67`	`68`	`target.GlobHeaders("lib/toolchain/include/toolchain");`
`68`	`69`	`target.GlobHeaders("lib/toolchain/include/toolchain/api");`
`@@ -72,6 +73,7 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,`
`72`	`73`	`target.GlobSources("lib/target/src/common");`
`73`	`74`	`target.GlobSources("lib/target/src/generator");`
`74`	`75`	`target.GlobSources("lib/target/src/api");`
	`76`	`+ target.GlobSources("lib/target/src/target_info");`
`75`	`77`	`target.GlobSources("lib/target/src/target");`
`76`	`78`	`target.GlobSources("lib/target/src/target/friend");`
`77`	`79`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ TEST_GROUP(PersistentStorageTestGroup)`
`16`	`16`	`};`
`17`	`17`	`// clang-format on`
`18`	`18`
`19`		`-buildcc::BaseToolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc","g++",`
`20`		`-"ar","ld");`
	`19`	`+staticbuildcc::BaseToolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",`
	`20`	`+"g++","ar","ld");`
`21`	`21`
`22`	`22`	`TEST(PersistentStorageTestGroup, BasicUsage) {`
`23`	`23`	`buildcc::PersistentStorage persistent;`

`‎buildcc/lib/target/cmake/common_target_src.cmake‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ set(COMMON_TARGET_SRCS`
`23`	`23`	`include/target/api/include_api.h`
`24`	`24`	`include/target/api/lib_api.h`
`25`	`25`	`include/target/api/pch_api.h`
`26`		`- include/target/api/flag_api.h`
`27`	`26`	`include/target/api/deps_api.h`
`28`	`27`
`29`	`28`	`src/api/sync_api.cpp`
`@@ -38,6 +37,10 @@ set(COMMON_TARGET_SRCS`
`38`	`37`	`src/generator/generator.cpp`
`39`	`38`	`include/target/generator.h`
`40`	`39`
	`40`	`+# Target Info`
	`41`	`+ src/target_info/target_info.cpp`
	`42`	`+ include/target/target_info.h`
	`43`	`+`
`41`	`44`	`# Target friend`
`42`	`45`	`src/target/friend/compile_pch.cpp`
`43`	`46`	`src/target/friend/compile_object.cpp`
`@@ -49,6 +52,5 @@ set(COMMON_TARGET_SRCS`
`49`	`52`	`# Target`
`50`	`53`	`src/target/target.cpp`
`51`	`54`	`src/target/build.cpp`
`52`		`- include/target/target_info.h`
`53`	`55`	`include/target/target.h`
`54`	`56`	`)`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ namespace buildcc::internal {`
`25`	`25`
`26`	`26`	`// Requires`
`27`	`27`	`// - TargetStorer`
`28`		`-// - TargetState`
`29`	`28`	`// - TargetEnv`
`30`	`29`	`template<typename T>classDepsApi {`
`31`	`30`	`public:`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ namespace buildcc::internal {`
`25`	`25`
`26`	`26`	`// Requires`
`27`	`27`	`// - TargetStorer`
`28`		`-// - TargetState`
`29`	`28`	`// - TargetConfig`
`30`	`29`	`// - TargetEnv`
`31`	`30`	`template<typename T>classIncludeApi {`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ namespace buildcc::internal {`
`32`	`32`
`33`	`33`	`// Requires`
`34`	`34`	`// - TargetStorer`
`35`		`-// - TargetState`
`36`	`35`	`// - TargetEnv`
`37`	`36`	`// T::GetTargetPath`
`38`	`37`	`template<typename T>classLibApi {`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ namespace buildcc::internal {`
`25`	`25`
`26`	`26`	`// Requires`
`27`	`27`	`// - TargetStorer`
`28`		`-// - TargetState`
`29`	`28`	`// - TargetConfig`
`30`	`29`	`// - TargetEnv`
`31`	`30`	`template<typename T>classPchApi {`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ namespace buildcc::internal {`
`25`	`25`
`26`	`26`	`// Requires`
`27`	`27`	`// - TargetStorer`
`28`		`-// - TargetState`
`29`	`28`	`// - TargetConfig`
`30`	`29`	`// - TargetEnv`
`31`	`30`	`template<typename T>classSourceApi {`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ enum class SyncOption {`
`43`	`43`
`44`	`44`	`// Requires`
`45`	`45`	`// - TargetStorer`
`46`		`-// - TargetState`
`47`	`46`	`template<typename T>classSyncApi {`
`48`	`47`	`public:`
`49`	`48`	`/**`

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

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`
`25`	`25`	`#include"toolchain/toolchain.h"`
`26`	`26`
	`27`	`+#include"target/common/target_state.h"`
	`28`	`+`
`27`	`29`	`#include"taskflow/taskflow.hpp"`
`28`	`30`
`29`	`31`	`namespacefs= std::filesystem;`
`@@ -32,6 +34,11 @@ namespace buildcc::internal {`
`32`	`34`
`33`	`35`	`template<typename T>classTargetGetter {`
`34`	`36`	`public:`
	`37`	`+// Target State`
	`38`	`+const TargetState &GetState()const;`
	`39`	`+boolIsBuilt()const;`
	`40`	`+boolIsLocked()const;`
	`41`	`+`
`35`	`42`	`const std::string &GetName()const;`
`36`	`43`	`const Toolchain &GetToolchain()const;`
`37`	`44`	`TargetTypeGetType()const;`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp