diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-06-14 22:57:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 22:57:18 +0800 |
| commit | 5609d2b4a88150c380c0aab6db70557cc7d9e25a (patch) | |
| tree | 83775234db09bc55ef15845c49b03e8031ded9ad | |
| parent | 1ae0e082b316adfc1a048928e5c535559d3780b3 (diff) | |
| parent | e6a36e01210cea7f35b39366b39e3dd59348447e (diff) | |
| download | dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar.gz dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar.bz2 dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar.lz dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar.xz dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.tar.zst dexon-solidity-5609d2b4a88150c380c0aab6db70557cc7d9e25a.zip | |
Merge pull request #2395 from ethereum/json-license
Include license text in emscripten output
| -rw-r--r-- | cmake/templates/license.h.in | 2 | ||||
| -rw-r--r-- | solc/jsonCompiler.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in index ccc61c99..6cdbc38d 100644 --- a/cmake/templates/license.h.in +++ b/cmake/templates/license.h.in @@ -1,5 +1,5 @@ #pragma once static char const licenseText[] = { - @LICENSE_TEXT@ + @LICENSE_TEXT@, 0 }; diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 1505a43d..353258a6 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -41,6 +41,8 @@ #include <libsolidity/ast/ASTJsonConverter.h> #include <libsolidity/interface/Version.h> +#include "license.h" + using namespace std; using namespace dev; using namespace solidity; @@ -305,6 +307,11 @@ static string s_outputBuffer; extern "C" { +extern char const* license() +{ + /// TOOD: include the copyright information on the top. + return licenseText; +} extern char const* version() { return VersionString.c_str(); |