Simplify buildinfo generation

BuildInfo.h.in

@@ -1,7 +1,5 @@
 #pragma once
 
 #define ETH_PROJECT_VERSION "@PROJECT_VERSION@"
-#define ETH_COMMIT_HASH @ETH_COMMIT_HASH@
-#define ETH_CLEAN_REPO @ETH_CLEAN_REPO@
-#define ETH_BUILD_TYPE @ETH_BUILD_TYPE@
-#define ETH_BUILD_PLATFORM @ETH_BUILD_PLATFORM@
+#define ETH_BUILD_TYPE "@ETH_BUILD_TYPE@"
+#define ETH_BUILD_PLATFORM "@ETH_BUILD_PLATFORM@"

CMakeLists.txt

@@ -92,8 +92,6 @@ function(createBuildInfo)
 		set(_cmake_build_type "${CMAKE_CFG_INTDIR}")
 	endif()
 
-	message("createBuildInfo()")
-
 	# Generate header file containing useful build information
 	add_custom_target(BuildInfo.h ALL
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -103,9 +101,6 @@ function(createBuildInfo)
 			-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
 		)
 	include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-	set(CMAKE_INCLUDE_CURRENT_DIR ON)
-	set(SRC_LIST BuildInfo.h)
 endfunction()
 
 

cmake/scripts/buildinfo.cmake

@@ -1,5 +1,5 @@
 # generates BuildInfo.h
-# 
+#
 # this module expects
 # ETH_SOURCE_DIR - main CMAKE_SOURCE_DIR
 # ETH_DST_DIR - main CMAKE_BINARY_DIR
@@ -17,26 +17,6 @@ if (NOT ETH_BUILD_PLATFORM)
 	set(ETH_BUILD_PLATFORM "unknown")
 endif()
 
-execute_process(
-	COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} rev-parse HEAD
-	OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-) 
-
-if (NOT ETH_COMMIT_HASH)
-	set(ETH_COMMIT_HASH 0)
-endif()
-
-execute_process(
-	COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} diff --shortstat	
-	OUTPUT_VARIABLE ETH_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-)
-
-if (ETH_LOCAL_CHANGES)
-	set(ETH_CLEAN_REPO 0)
-else()
-	set(ETH_CLEAN_REPO 1)
-endif()
-
 set(INFILE "${ETH_SOURCE_DIR}/BuildInfo.h.in")
 set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp")
 set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
@@ -45,4 +25,3 @@ configure_file("${INFILE}" "${TMPFILE}")
 
 include("${ETH_SOURCE_DIR}/cmake/EthUtils.cmake")
 replace_if_different("${TMPFILE}" "${OUTFILE}" CREATE)
-

ethminer/MinerAux.h

@@ -46,7 +46,6 @@
 #include <libethash-cuda/ethash_cuda_miner.h>
 #endif
 #include <jsonrpccpp/client/connectors/httpclient.h>
-#include "BuildInfo.h"
 #include "FarmClient.h"
 #if ETH_STRATUM
 #include <libstratum/EthStratumClient.h>
@@ -238,7 +237,7 @@ public:
 		{
 			m_worktimeout = atoi(argv[++i]);
 		}
-		
+
 #endif
 #if ETH_ETHASHCL
 		else if (arg == "--opencl-platform" && i + 1 < argc)
@@ -472,7 +471,7 @@ public:
 				EthashGPUMiner::setDevices(m_openclDevices, m_openclDeviceCount);
 				m_miningThreads = m_openclDeviceCount;
 			}
-			
+
 			if (!EthashGPUMiner::configureGPU(
 					m_localWorkSize,
 					m_globalWorkSizeMultiplier,
@@ -499,7 +498,7 @@ public:
 				EthashCUDAMiner::setDevices(m_cudaDevices, m_cudaDeviceCount);
 				m_miningThreads = m_cudaDeviceCount;
 			}
-			
+
 			EthashCUDAMiner::setNumInstances(m_miningThreads);
 			if (!EthashCUDAMiner::configureGPU(
 				m_localWorkSize,
@@ -521,7 +520,7 @@ public:
 			doBenchmark(m_minerType, m_benchmarkWarmup, m_benchmarkTrial, m_benchmarkTrials);
 		else if (mode == OperationMode::Farm)
 			doFarm(m_minerType, m_activeFarmURL, m_farmRecheckPeriod);
-		else if (mode == OperationMode::Simulation) 
+		else if (mode == OperationMode::Simulation)
 			doSimulation(m_minerType);
 #if ETH_STRATUM
 		else if (mode == OperationMode::Stratum)
@@ -605,7 +604,7 @@ private:
 		exit(0);
 	}
 
-	
+
 
 	void doBenchmark(MinerType _m, unsigned _warmupDuration = 15, unsigned _trialDuration = 3, unsigned _trials = 5)
 	{
@@ -757,7 +756,7 @@ private:
 		}
 	}
 
-	
+
 	void doFarm(MinerType _m, string & _remote, unsigned _recheckPeriod)
 	{
 		map<string, GenericFarm<EthashProofOfWork>::SealerDescriptor> sealers;
@@ -904,7 +903,7 @@ private:
 						}
 						m_farmRetries = 0;
 					}
-					
+
 				}
 			}
 		exit(0);
@@ -922,7 +921,7 @@ private:
 #endif
 		if (!m_farmRecheckSet)
 			m_farmRecheckPeriod = m_defaultStratumFarmRecheckPeriod;
-		
+
 		GenericFarm<EthashProofOfWork> f;
 
 		// this is very ugly, but if Stratum Client V2 tunrs out to be a success, V1 will be completely removed anyway
@@ -1044,7 +1043,7 @@ private:
 	/// Farm params
 	string m_farmURL = "http://127.0.0.1:8545";
 	string m_farmFailOverURL = "";
-	
+
 
 	string m_activeFarmURL = m_farmURL;
 	unsigned m_farmRetries = 0;

ethminer/main.cpp

@@ -32,6 +32,8 @@
 #include <fstream>
 #include <iostream>
 #include "MinerAux.h"
+#include "BuildInfo.h"
+
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
@@ -57,7 +59,7 @@ void help()
 void version()
 {
 	cout << "ethminer version " << ETH_PROJECT_VERSION << endl;
-	cout << "Build: " << DEV_QUOTED(ETH_BUILD_PLATFORM) << "/" << DEV_QUOTED(ETH_BUILD_TYPE) << endl;
+	cout << "Build: " << ETH_BUILD_PLATFORM << "/" << ETH_BUILD_TYPE << endl;
 	exit(0);
 }
 

libdevcore/CMakeLists.txt

@@ -5,5 +5,4 @@ find_package(Threads)
 
 add_library(devcore ${SOURCES} ${HEADERS})
 target_link_libraries(devcore PUBLIC Boost::boost)
-target_link_libraries(devcore PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-#target_include_directories(devcore PRIVATE ..)
+target_link_libraries(devcore PRIVATE Threads::Threads)

libdevcore/Common.cpp

@@ -1,27 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file Common.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "Common.h"
-#include "Exceptions.h"
-#include "Log.h"
-#include "BuildInfo.h"
-using namespace std;
-using namespace dev;

libdevcore/Common.h

@@ -48,10 +48,6 @@
 // CryptoPP defines byte in the global namespace, so must we.
 using byte = uint8_t;
 
-// Quote a given token stream to turn it into a string.
-#define DEV_QUOTED_HELPER(s) #s
-#define DEV_QUOTED(s) DEV_QUOTED_HELPER(s)
-
 #define DEV_IGNORE_EXCEPTIONS(X) try { X; } catch (...) {}
 
 #define DEV_IF_NO_ELSE(X) if(!(X)){}else