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

make_scmrev.h.js needs to compare the full file instead of just the HEAD hash. 

remove refs to deleted files from Common project
This commit is contained in:
Shawn Hoffman 2011-08-21 19:53:09 -07:00
parent fc12633055
commit 82dfee1642
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Common.vcxproj
View File

@ -259,8 +259,6 @@
<ClInclude Include="Src\StdMutex.h" /> <ClInclude Include="Src\StdMutex.h" />
<ClInclude Include="Src\StdThread.h" /> <ClInclude Include="Src\StdThread.h" />
<ClInclude Include="Src\StringUtil.h" /> <ClInclude Include="Src\StringUtil.h" />
<ClInclude Include="Src\svnrev.h" />
<ClInclude Include="Src\svnrev_template.h" />
<ClInclude Include="Src\SymbolDB.h" /> <ClInclude Include="Src\SymbolDB.h" />
<ClInclude Include="Src\SysConf.h" /> <ClInclude Include="Src\SysConf.h" />
<ClInclude Include="Src\Thread.h" /> <ClInclude Include="Src\Thread.h" />

2
Source/Core/Common/Common.vcxproj.filters
View File

@ -87,8 +87,6 @@
<ClInclude Include="Src\stdafx.h" /> <ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\StdThread.h" /> <ClInclude Include="Src\StdThread.h" />
<ClInclude Include="Src\StringUtil.h" /> <ClInclude Include="Src\StringUtil.h" />
<ClInclude Include="Src\svnrev.h" />
<ClInclude Include="Src\svnrev_template.h" />
<ClInclude Include="Src\SymbolDB.h" /> <ClInclude Include="Src\SymbolDB.h" />
<ClInclude Include="Src\SysConf.h" /> <ClInclude Include="Src\SysConf.h" />
<ClInclude Include="Src\Thread.h" /> <ClInclude Include="Src\Thread.h" />

7
Source/Core/Common/make_scmrev.h.js
View File

@ -44,12 +44,11 @@ function GetFirstStdOutLine(cmd)
} }
} }
function GetRevFromFile(f) function GetFileContents(f)
{ {
try try
{ {
// read the current hash return oFS.OpenTextFile(f).ReadAll();
return oFS.OpenTextFile(f).ReadAll().match(/SCM_REV_STR\s+"([0-9a-f]+)/)[1];
} }
catch (e) catch (e)
{ {
@ -76,7 +75,7 @@ var out_contents =
"#define SCM_IS_MASTER " + isMaster + "\n"; "#define SCM_IS_MASTER " + isMaster + "\n";
// check if file needs updating // check if file needs updating
if (revision == GetRevFromFile(outfile)) if (out_contents == GetFileContents(outfile))
{ {
WScript.Echo(outfile + " doesn't need updating (already at " + revision + ")"); WScript.Echo(outfile + " doesn't need updating (already at " + revision + ")");
} }