From 3c15f44bc0bfaa18ddd62063de5d645035adfef1 Mon Sep 17 00:00:00 2001 From: Tim Hughes Date: Sat, 1 Mar 2014 17:48:33 +0000 Subject: [PATCH] Generate BuildInfo.h on VS2013 (using a short lua script to avoid cmake for now). --- windows/Alethzero.vcxproj | 33 +++++++++++++++++++++++++++---- windows/Alethzero.vcxproj.filters | 3 +++ windows/BuildInfo.lua | 25 +++++++++++++++++++++++ windows/Ethereum.vcxproj | 25 +++++++++++++++++++++++ windows/Ethereum.vcxproj.filters | 16 +++++++++++++++ windows/LibEthereum.props | 6 +++++- windows/UseQt.props | 6 +----- 7 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 windows/BuildInfo.lua create mode 100644 windows/Ethereum.vcxproj.filters diff --git a/windows/Alethzero.vcxproj b/windows/Alethzero.vcxproj index 334a5147e..69f65fab1 100644 --- a/windows/Alethzero.vcxproj +++ b/windows/Alethzero.vcxproj @@ -170,17 +170,17 @@ - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" $(IntDir)moc_%(FileName).cpp - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" - "$(Lua)" moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" $(IntDir)moc_%(FileName).cpp @@ -206,6 +206,31 @@ $(IntDir)ui_%(FileName).h + + + Document + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + $(IntDir)%(FileName).h + ../.git/index + ../.git/index + ../.git/index + ../.git/index + + diff --git a/windows/Alethzero.vcxproj.filters b/windows/Alethzero.vcxproj.filters index ecf9afee0..6a1228b36 100644 --- a/windows/Alethzero.vcxproj.filters +++ b/windows/Alethzero.vcxproj.filters @@ -24,5 +24,8 @@ + + Windows + \ No newline at end of file diff --git a/windows/BuildInfo.lua b/windows/BuildInfo.lua new file mode 100644 index 000000000..47b23a795 --- /dev/null +++ b/windows/BuildInfo.lua @@ -0,0 +1,25 @@ + +function os.capture(cmd) + local f = io.popen(cmd, 'r') + if (f) then + local s = f:read('*a') + if (f:close()) then + return s + end + end + return nil +end + +hash = (os.capture("git rev-parse HEAD") or "UnknownRevision"):gsub("\n$", "") +clean = ((os.capture("git diff --name-only") or "0"):gsub("\n$", "") == "") and "1" or "0" + +local output = io.open(arg[1], "w") +if (output) then + output:write("// This file was automatically generated by buildinfo.lua\n#pragma once\n\n") + output:write("#define ETH_COMMIT_HASH "..hash.."\n") + output:write("#define ETH_CLEAN_REPO "..clean.."\n") + output:close() +end + + + diff --git a/windows/Ethereum.vcxproj b/windows/Ethereum.vcxproj index 023424879..7b36e9d53 100644 --- a/windows/Ethereum.vcxproj +++ b/windows/Ethereum.vcxproj @@ -160,6 +160,31 @@ + + + Document + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + $(Lua) "%(FullPath)" "$(IntDir)%(FileName).h" + + + $(IntDir)%(FileName).h + ../.git/index + ../.git/index + ../.git/index + ../.git/index + + diff --git a/windows/Ethereum.vcxproj.filters b/windows/Ethereum.vcxproj.filters new file mode 100644 index 000000000..0bee64924 --- /dev/null +++ b/windows/Ethereum.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + + + + {ed0eafbf-bbfb-4700-b7c0-9b58049cc681} + + + + + Windows + + + \ No newline at end of file diff --git a/windows/LibEthereum.props b/windows/LibEthereum.props index 3de930166..38c353828 100644 --- a/windows/LibEthereum.props +++ b/windows/LibEthereum.props @@ -3,6 +3,7 @@ ../../boost + "../../lua/lua" ..\..\_build\$(ProjectName)\$(Platform)_$(Configuration)\ @@ -14,7 +15,7 @@ Level4 true false - include/$(ProjectName);../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp + include/$(ProjectName);$(IntDir);../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp ETH_BUILD_PLATFORM=Windows/VS2013;ETH_BUILD_TYPE=$(Configuration)-$(Platform);STATICLIB;LEVELDB_PLATFORM_WINDOWS;USE_NUM_BOOST;USE_FIELD_10X26;USE_FIELD_INV_BUILTIN;_WIN32_WINNT=0x0501;WIN32;%(PreprocessorDefinitions) true true @@ -27,5 +28,8 @@ $(BoostDir) + + $(Lua) + \ No newline at end of file diff --git a/windows/UseQt.props b/windows/UseQt.props index 9ced7563f..b3a177623 100644 --- a/windows/UseQt.props +++ b/windows/UseQt.props @@ -6,13 +6,12 @@ $(QtDir)/qtbase/bin $(QtDir)/qtbase/include;../../Qt/Src/qtbase/include $(QtDir)/qtbase/lib;$(QtDir)/qtbase/plugins/platforms - ../../lua/lua - ..;$(IntDir);$(QtInclude);%(AdditionalIncludeDirectories) + ..;$(QtInclude);%(AdditionalIncludeDirectories) $(QtLib);%(AdditionalLibraryDirectories) @@ -31,8 +30,5 @@ $(QtLib) - - $(Lua) - \ No newline at end of file