diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2011-08-21 19:53:09 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2011-08-21 19:53:09 -0700 |
| commit | 82dfee16429e61515d7ca41b2361e5e1fc95658a (patch) | |
| tree | 1eeba901bafaaa2727848e812b567c5c6bafb351 /Source/Core/Common | |
| parent | fc1263305591f2714b93c8e1794dfdc0f4ecb1cb (diff) | |
make_scmrev.h.js needs to compare the full file instead of just the HEAD hash.
remove refs to deleted files from Common project
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Common.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Common.vcxproj.filters | 2 | ||||
| -rw-r--r-- | Source/Core/Common/make_scmrev.h.js | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 705daae67d..d29043eb7d 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -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" /> diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index fecf4819f6..0922d00196 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -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" /> diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 7d7290c75b..a4b2369ca6 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -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 + ")"); } |