diff options
| author | chriseth <chris@ethereum.org> | 2017-01-17 22:35:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 22:35:08 +0800 |
| commit | 4f4963131bd969fa063a3aad980139dad2034087 (patch) | |
| tree | 6eec3d6869ded827ab280e1fd6c15cda10ba9a4d /libsolidity | |
| parent | ed12b977615822f1fd6c7674b1b90efc9c6479d3 (diff) | |
| parent | 467559917008525d6b606de264e4a86a1c5e0620 (diff) | |
| download | dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar.gz dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar.bz2 dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar.lz dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar.xz dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.tar.zst dexon-solidity-4f4963131bd969fa063a3aad980139dad2034087.zip | |
Merge pull request #1573 from ethereum/metadata-version
Store strict version number in metadata (exclude the platform)
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/interface/Version.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/interface/Version.h | 1 |
3 files changed, 6 insertions, 1 deletions
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..0d23f9c3 100644 --- a/libsolidity/interface/Version.cpp +++ b/libsolidity/interface/Version.cpp @@ -38,6 +38,10 @@ 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)) + + (string(SOL_VERSION_COMMIT).empty() ? "" : "+" + string(SOL_VERSION_COMMIT)); 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) |