openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-19 19:33:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

!144 相同路径的resfile和rawfile资源增加告警提示

Browse Source 
Merge pull request !144 from 张婷/master
This commit is contained in:
openharmony_ci
2024-04-10 09:03:38 +00:00
committed by Gitee
parent 93a3e7163a 65c1874b3e
commit 0b2e566167
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/resource_data.h
+1 -1
View File
@@ -39,7 +39,7 @@ const static std::string NEW_LINE_PATH = "\nat ";
const static std::string LONG_PATH_HEAD = "\\\\?\\";
const static int32_t VERSION_MAX_LEN = 128;
const static int32_t INT_TO_BYTES = sizeof(uint32_t);
static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.007" };
static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.008" };
const static int32_t TAG_LEN = 4;
enum class KeyType {
src/resource_pack.cpp
+1
View File
@@ -295,6 +295,7 @@ uint32_t ResourcePack::CopyRawFileOrResFileImpl(const string &src, const string
}
} else {
if (ResourceUtil::FileExist(subPath)) {
cerr << "Warning: '" << entry->GetFilePath().GetPath() << "' is defined repeatedly." << endl;
continue;
}
if (!ResourceUtil::CopyFleInner(entry->GetFilePath().GetPath(), subPath)) {