Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit66d7eb7

Browse files
committed
Updated args setup
1 parente1145f3 commit66d7eb7

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

‎buildexe/include/buildexe/args_setup.h‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,18 @@ struct ArgScriptInfo : public ArgCustom {
6060
std::vector<std::string> configs;
6161
};
6262

63-
// TODO, Update this later
6463
structLibInfo {
6564
std::string lib_name;
6665
std::string absolute_lib_path;
6766
};
6867

68+
structArgLibsInfo :publicArgCustom {
69+
voidAdd(CLI::App &app)override;
70+
71+
std::vector<LibInfo> libs_info;
72+
std::vector<fs::path> lib_build_files;
73+
};
74+
6975
classBuildExeArgs {
7076
public:
7177
voidSetup(int argc,char **argv);
@@ -79,25 +85,23 @@ class BuildExeArgs {
7985
const ArgScriptInfo &GetScriptInfo()const {return out_scriptinfo_; }
8086
BuildExeModeGetBuildMode()const {return out_mode_; }
8187

82-
const std::vector<LibInfo> &GetLibsInfo()const {return libs_info_; }
88+
const std::vector<LibInfo> &GetLibsInfo()const {
89+
return out_libsinfo_.libs_info;
90+
}
8391
const std::vector<fs::path> &GetLibBuildFiles()const {
84-
returnlib_build_files_;
92+
returnout_libsinfo_.lib_build_files;
8593
}
8694

8795
private:
8896
voidSetupBuildMode(CLI::App &app);
89-
voidSetupLibs(CLI::App & app);
9097

9198
private:
9299
ArgToolchain host_toolchain_arg_;
93100
ArgTargetInfo out_targetinfo_;
94101
ArgTargetInputs out_targetinputs_;
95102
ArgScriptInfo out_scriptinfo_;
96-
103+
ArgLibsInfo out_libsinfo_;
97104
BuildExeMode out_mode_;
98-
99-
std::vector<LibInfo> libs_info_;
100-
std::vector<fs::path> lib_build_files_;
101105
};
102106

103107
}// namespace buildcc

‎buildexe/src/args_setup.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ void BuildExeArgs::Setup(int argc, char **argv) {
3838
.AddCustomData(out_targetinfo_)
3939
.AddCustomData(out_targetinputs_)
4040
.AddCustomData(out_scriptinfo_)
41-
.AddCustomCallback([&](CLI::App &app) {
42-
SetupBuildMode(app);
43-
SetupLibs(app);
44-
})
41+
.AddCustomData(out_libsinfo_)
42+
.AddCustomCallback([&](CLI::App &app) {SetupBuildMode(app); })
4543
.Parse(argc, argv);
4644
}
4745

@@ -99,7 +97,7 @@ void ArgScriptInfo::Add(CLI::App &app) {
9997
script_args->add_option("--configs", configs,"Config files for script mode");
10098
}
10199

102-
voidBuildExeArgs::SetupLibs(CLI::App &app) {
100+
voidArgLibsInfo::Add(CLI::App &app) {
103101
auto *libs_app = app.add_subcommand("libs","Libraries");
104102
std::error_code ec;
105103
fs::directory_iterator dir_iter =
@@ -117,13 +115,13 @@ void BuildExeArgs::SetupLibs(CLI::App &app) {
117115
LibInfo lib_info;
118116
lib_info.lib_name = lib_name;
119117
lib_info.absolute_lib_path =fmt::format("{}", lib_path);
120-
libs_info_.push_back(lib_info);
118+
libs_info.push_back(lib_info);
121119

122120
auto add_lib_files_cb_func = [lib_path,
123121
this](const std::vector<std::string> &paths) {
124122
for (constauto &p : paths) {
125-
fs::path absolute_file_path = lib_path / p;
126-
lib_build_files_.push_back(absolute_file_path);
123+
fs::path absolute_file_path =(lib_path / p).make_preferred();
124+
lib_build_files.push_back(absolute_file_path);
127125
}
128126
};
129127

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp