diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-21 22:46:11 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-22 13:11:45 -0500 |
| commit | 6a80b9989af820fa3e2af5b8a3efb8a547f20e34 (patch) | |
| tree | 7cf5df790a58469c531c393c39875a867a8ca785 /Source/Core/Common | |
| parent | a910f97c391c50a07c0411c13f2937bc9c0dafc3 (diff) | |
remove hash from rev description
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/SVNRevGen.vcxproj | 3 | ||||
| -rw-r--r-- | Source/Core/Common/make_scmrev.h.js | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj index b5c69660e9..61e3aedb7b 100644 --- a/Source/Core/Common/SVNRevGen.vcxproj +++ b/Source/Core/Common/SVNRevGen.vcxproj @@ -13,6 +13,9 @@ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dummy</Outputs> </CustomBuild> </ItemGroup> + <ItemGroup> + <ClInclude Include="Src\scmrev.h" /> + </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> <RootNamespace>SVNRevGen</RootNamespace> diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 53705fe993..914c5df95a 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -58,6 +58,9 @@ var describe = GetFirstStdOutLine(gitexe + cmd_describe); var branch = GetFirstStdOutLine(gitexe + cmd_branch); var isMaster = 0 +// remove hash from description +describe = describe.replace(/-g\w+/, ''); + if (branch == "master") isMaster = 1 @@ -70,11 +73,11 @@ var out_contents = // check if file needs updating if (out_contents == GetFileContents(outfile)) { - WScript.Echo(outfile + " current at " + revision); + WScript.Echo(outfile + " current at " + describe); } else { // needs updating - writeout current info oFS.CreateTextFile(outfile, true).Write(out_contents); - WScript.Echo(outfile + " updated to " + revision); + WScript.Echo(outfile + " updated to " + describe); } |