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

Commit196b17d

Browse files
committed
Fixed error in with bitutil wrong dir generation.
1 parent770bb9b commit196b17d

File tree

2 files changed

+35
-30
lines changed

2 files changed

+35
-30
lines changed

‎src/codegen/fs-creator.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,41 +71,41 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
7171
}
7272
}
7373
}
74+
}
7475

75-
FS.libdir = work_dir_path +kLibDir;
76+
FS.libdir = work_dir_path +kLibDir;
7677

77-
if (std::filesystem::create_directory(FS.libdir))
78-
{
79-
// ret = false;
80-
}
78+
if (std::filesystem::create_directory(FS.libdir))
79+
{
80+
// ret = false;
81+
}
8182

82-
FS.usrdir = work_dir_path +kUsrDir;
83+
FS.usrdir = work_dir_path +kUsrDir;
8384

84-
if (std::filesystem::create_directory(FS.usrdir))
85-
{
86-
// ret = false;
87-
}
85+
if (std::filesystem::create_directory(FS.usrdir))
86+
{
87+
// ret = false;
88+
}
8889

89-
FS.incdir = work_dir_path +kIncDir;
90+
FS.incdir = work_dir_path +kIncDir;
9091

91-
if (std::filesystem::create_directory(FS.incdir))
92-
{
93-
// ret = false;
94-
}
92+
if (std::filesystem::create_directory(FS.incdir))
93+
{
94+
// ret = false;
95+
}
9596

96-
FS.confdir = work_dir_path +kConfDir;
97+
FS.confdir = work_dir_path +kConfDir;
9798

98-
if (std::filesystem::create_directory(FS.confdir))
99-
{
100-
// ret = false;
101-
}
99+
if (std::filesystem::create_directory(FS.confdir))
100+
{
101+
// ret = false;
102+
}
102103

103-
FS.utildir = work_dir_path +kUtilDir;
104+
FS.utildir = work_dir_path +kUtilDir;
104105

105-
if (std::filesystem::create_directory(FS.utildir))
106-
{
107-
// ret = false;
108-
}
106+
if (std::filesystem::create_directory(FS.utildir))
107+
{
108+
// ret = false;
109109
}
110110

111111
if (true)
@@ -125,11 +125,11 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
125125

126126
FS.util_h.dir = work_dir_path;
127127
FS.util_h.fname = FS.drvname +"-binutil" +".h";
128-
FS.util_h.fpath =work_dir_path +"/" + FS.util_h.fname;
128+
FS.util_h.fpath =FS.utildir +"/" + FS.util_h.fname;
129129

130130
FS.util_c.dir = work_dir_path;
131131
FS.util_c.fname = FS.drvname +"-binutil" +".c";
132-
FS.util_c.fpath =work_dir_path +"/" + FS.util_c.fname;
132+
FS.util_c.fpath =FS.utildir +"/" + FS.util_c.fname;
133133

134134
FS.fmon_h.dir = work_dir_path;
135135
FS.fmon_h.fname = FS.drvname +"-fmon.h";

‎src/maincli.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,14 @@ int main(int argc, char* argv[])
128128
{
129129
std::string util_name = nodes[node] +"_" + dbc_driver_name;
130130

131-
ret = fscreator->PrepareDirectory(util_name.c_str(), fscreator->FS.utildir.c_str(),true, info);
131+
fscreator->FS.util_c.dir = fscreator->FS.utildir;
132+
fscreator->FS.util_h.dir = fscreator->FS.utildir;
133+
134+
fscreator->FS.util_h.fname = util_name +".h";
135+
fscreator->FS.util_h.fpath = fscreator->FS.utildir +"/" + fscreator->FS.util_h.fname;
136+
137+
fscreator->FS.util_c.fname = util_name +".c";
138+
fscreator->FS.util_c.fpath = fscreator->FS.utildir +"/" + fscreator->FS.util_c.fname;
132139

133140
MsgsClassification groups;
134141

@@ -161,8 +168,6 @@ int main(int argc, char* argv[])
161168
}
162169
else
163170
{
164-
ret = fscreator->PrepareDirectory(dbc_driver_name.c_str(), (source_files_out_path).c_str(),true, info);
165-
166171
MsgsClassification groups;
167172

168173
for (size_t i =0; i < scanner->dblist.msgs.size(); i++)

0 commit comments

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