diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-01-17 20:09:13 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-01-17 20:54:58 +0800 |
| commit | 350c7e7e2c1bafbe8d543fc052aedad3e69ba5e1 (patch) | |
| tree | 1b7c1e8439b60a2210dfa8695f173a23d02a1100 | |
| parent | a466f26c459c8df27b0b25e53b897461fdc8fd63 (diff) | |
| download | dexon-solidity-350c7e7e2c1bafbe8d543fc052aedad3e69ba5e1.tar.gz dexon-solidity-350c7e7e2c1bafbe8d543fc052aedad3e69ba5e1.tar.zst dexon-solidity-350c7e7e2c1bafbe8d543fc052aedad3e69ba5e1.zip | |
Store strict version number in metadata (exclude the platform)
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/interface/Version.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/Version.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index 1a80bac0..a4063640 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,7 @@ Features: * AST: Use deterministic node identifiers. + * Metadata: Do not include platform in the version number. ### 0.4.8 (2017-01-13) diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index a31df584..08b21715 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -695,7 +695,7 @@ string CompilerStack::createOnChainMetadata(Contract const& _contract) const Json::Value meta; meta["version"] = 1; meta["language"] = "Solidity"; - meta["compiler"]["version"] = VersionString; + meta["compiler"]["version"] = VersionStringStrict; meta["sources"] = Json::objectValue; for (auto const& s: m_sources) diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp index ff66f039..30923fc2 100644 --- a/libsolidity/interface/Version.cpp +++ b/libsolidity/interface/Version.cpp @@ -38,6 +38,9 @@ string const dev::solidity::VersionString = (string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) + (string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO)); +string const dev::solidity::VersionStringStrict = + string(dev::solidity::VersionNumber) + + (string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)); bytes dev::solidity::binaryVersion() { diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h index 5b07b3f4..24c3555d 100644 --- a/libsolidity/interface/Version.h +++ b/libsolidity/interface/Version.h @@ -32,6 +32,7 @@ namespace solidity extern char const* VersionNumber; extern std::string const VersionString; +extern std::string const VersionStringStrict; /// @returns a binary form of the version string, where A.B.C-HASH is encoded such that /// the first byte is zero, the following three bytes encode A B and C (interpreted as decimals) |