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:
parent
fc12633055
commit
82dfee1642
|
@ -259,8 +259,6 @@
|
|||
<ClInclude Include="Src\StdMutex.h" />
|
||||
<ClInclude Include="Src\StdThread.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\SysConf.h" />
|
||||
<ClInclude Include="Src\Thread.h" />
|
||||
|
|
|
@ -87,8 +87,6 @@
|
|||
<ClInclude Include="Src\stdafx.h" />
|
||||
<ClInclude Include="Src\StdThread.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\SysConf.h" />
|
||||
<ClInclude Include="Src\Thread.h" />
|
||||
|
|
|
@ -44,12 +44,11 @@ function GetFirstStdOutLine(cmd)
|
|||
}
|
||||
}
|
||||
|
||||
function GetRevFromFile(f)
|
||||
function GetFileContents(f)
|
||||
{
|
||||
try
|
||||
{
|
||||
// read the current hash
|
||||
return oFS.OpenTextFile(f).ReadAll().match(/SCM_REV_STR\s+"([0-9a-f]+)/)[1];
|
||||
return oFS.OpenTextFile(f).ReadAll();
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
|
@ -76,7 +75,7 @@ var out_contents =
|
|||
"#define SCM_IS_MASTER " + isMaster + "\n";
|
||||
|
||||
// check if file needs updating
|
||||
if (revision == GetRevFromFile(outfile))
|
||||
if (out_contents == GetFileContents(outfile))
|
||||
{
|
||||
WScript.Echo(outfile + " doesn't need updating (already at " + revision + ")");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue