Merge branch 'master'

This commit is contained in:
momo5502 2016-01-03 15:14:56 +01:00
commit 9b0abfb043

View File

@ -25,6 +25,10 @@ newaction {
if oldVersionHeader ~=nil then if oldVersionHeader ~=nil then
local oldVersionHeaderContent = assert(oldVersionHeader:read('*a')) local oldVersionHeaderContent = assert(oldVersionHeader:read('*a'))
oldRevNumber = string.match(oldVersionHeaderContent, "#define REVISION (%d+)") oldRevNumber = string.match(oldVersionHeaderContent, "#define REVISION (%d+)")
if oldRevNumber == nil then
-- old version.hpp format?
oldRevNumber = "(none)"
end
end end
-- generate version.hpp with a revision number if not equal -- generate version.hpp with a revision number if not equal