统一处理输入目录

Signed-off-by: fangyunzhong <fangyunzhong2@huawei.com>
This commit is contained in:
fangyunzhong
2023-05-26 02:06:41 +00:00
parent 668a3e7582
commit 915d49ab63
9 changed files with 64 additions and 24 deletions
+1 -2
View File
@@ -206,8 +206,7 @@ uint32_t IdWorker::InitIdDefined()
if (combine) {
idDefinedPath = FileEntry::FilePath(inputPath).Append(ID_DEFINED_FILE).GetPath();
} else {
idDefinedPath = FileEntry::FilePath(inputPath).Append(RESOURCES_DIR)
.Append("base").Append("element").Append(ID_DEFINED_FILE).GetPath();
idDefinedPath = ResourceUtil::GetBaseElementPath(inputPath).Append(ID_DEFINED_FILE).GetPath();
}
if (ResourceUtil::FileExist(idDefinedPath) && startId > 0) {
cerr << "Error: the set start_id and id_defined.json cannot be used together." << endl;