Merge pull request #721 from EOSIO/git-version-embed-664

Stop having two types of version.

programs/eosd/config.hpp.in

@@ -10,8 +10,16 @@
 #define CONFIG_HPP_IN
 
 namespace eosio { namespace eosd { namespace config {
-  constexpr char version_str[] = "${eosd_BUILD_VERSION}";
-  constexpr uint64_t version_int = 0x${eosd_BUILD_VERSION};
+  constexpr uint64_t version = 0x${eosd_BUILD_VERSION};
+
+  template<typename I>
+  std::string itoh(I n, size_t hlen = sizeof(I)<<1) {
+    static const char* digits = "0123456789abcdef";
+    std::string r(hlen, '0');
+    for(size_t i = 0, j = (hlen - 1) * 4 ; i < hlen; ++i, j -= 4)
+      r[i] = digits[(n>>j) & 0x0f];
+    return r;
+  }
 }}}
 
 #endif // CONFIG_HPP_IN

programs/eosd/main.cpp

@@ -27,9 +27,8 @@ using namespace eosio;
 int main(int argc, char** argv)
 {
    try {
-      app().set_version(eosio::eosd::config::version_str);
-      app().set_version(eosio::eosd::config::version_int);
-      ilog("eosd version ${ver}", ("ver", app().version()));
+      app().set_version(eosio::eosd::config::version);
+      ilog("eosd version ${ver}", ("ver", eosio::eosd::config::itoh(static_cast<uint32_t>(app().version_int()))));
       app().register_plugin<net_plugin>();
       app().register_plugin<chain_api_plugin>();
       app().register_plugin<producer_plugin>();