ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Build] Have UpdateVersion be able to handle linux line endings

This commit is contained in:
zilmar 2018-05-23 02:38:15 +10:00
parent 5d7dc12f12
commit f20dca31fd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Common/StdString.cpp
View File

@ -30,11 +30,10 @@ strvector stdstr::Tokenize(const char * delimiter) const
stdstr::size_type lastPos = find_first_not_of(delimiter, 0); stdstr::size_type lastPos = find_first_not_of(delimiter, 0);
stdstr::size_type pos = find_first_of(delimiter, lastPos); stdstr::size_type pos = find_first_of(delimiter, lastPos);
size_t delimiter_len = strlen(delimiter);
while (stdstr::npos != pos) while (stdstr::npos != pos)
{ {
tokens.push_back(substr(lastPos, pos - lastPos)); tokens.push_back(substr(lastPos, pos - lastPos));
lastPos = pos + delimiter_len; lastPos = pos + 1;
pos = find_first_of(delimiter, lastPos); pos = find_first_of(delimiter, lastPos);
} }
if (stdstr::npos != lastPos) if (stdstr::npos != lastPos)

10
Source/UpdateVersion/UpdateVersion.cpp
View File

@ -34,7 +34,7 @@ int main()
uint32_t FileLen = InFile.GetLength(); uint32_t FileLen = InFile.GetLength();
std::auto_ptr<uint8_t> InputData(new uint8_t[FileLen]); std::auto_ptr<uint8_t> InputData(new uint8_t[FileLen]);
InFile.Read(InputData.get(), FileLen); InFile.Read(InputData.get(), FileLen);
strvector VersionData = stdstr(std::string((char *)InputData.get(), FileLen)).Tokenize("\r\n"); strvector VersionData = stdstr(std::string((char *)InputData.get(), FileLen)).Tokenize("\n");
strvector verinfo = stdstr(__argv[3]).Tokenize('-'); strvector verinfo = stdstr(__argv[3]).Tokenize('-');
if (verinfo.size() < 3 || verinfo.size() > 4) if (verinfo.size() < 3 || verinfo.size() > 4)
@ -55,16 +55,16 @@ int main()
for (size_t i = 0, n = VersionData.size() - 1; i < n; i++) for (size_t i = 0, n = VersionData.size() - 1; i < n; i++)
{ {
stdstr &line = VersionData[i]; stdstr &line = VersionData[i];
line += "\r\n"; line += "\n";
if (_strnicmp(line.c_str(), "#define VERSION_BUILD", 21) == 0) if (_strnicmp(line.c_str(), "#define VERSION_BUILD", 21) == 0)
{ {
line = "#define VERSION_BUILD " + verinfo[1] + "\r\n"; line = "#define VERSION_BUILD " + verinfo[1] + "\n";
} }
if (_strnicmp(line.c_str(), "#define GIT_VERSION", 18) == 0) if (_strnicmp(line.c_str(), "#define GIT_VERSION", 18) == 0)
{ {
line = "#define GIT_VERSION \"" + verinfo[2] + "\"\r\n"; line = "#define GIT_VERSION \"" + verinfo[2] + "\"\n";
} }
if (!OutFile.Write(line.c_str(), line.length())) if (!OutFile.Write(line.c_str(), (uint32_t)line.length()))
{ {
return 0; return 0;
} }