cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2395 from ethereum/json-license

Browse Source 
Include license text in emscripten output
This commit is contained in:
Alex Beregszaszi 2017-06-14 15:57:18 +01:00 committed by GitHub
commit 5609d2b4a8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/templates/license.h.in
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
static char const licenseText[] = { static char const licenseText[] = {
@LICENSE_TEXT@ @LICENSE_TEXT@, 0
}; };

7
solc/jsonCompiler.cpp
View File

@ -41,6 +41,8 @@
#include <libsolidity/ast/ASTJsonConverter.h> #include <libsolidity/ast/ASTJsonConverter.h>
#include <libsolidity/interface/Version.h> #include <libsolidity/interface/Version.h>
#include "license.h"
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace solidity; using namespace solidity;
@ -305,6 +307,11 @@ static string s_outputBuffer;
extern "C" extern "C"
{ {
extern char const* license()
{
/// TOOD: include the copyright information on the top.
return licenseText;
}
extern char const* version() extern char const* version()
{ {
return VersionString.c_str(); return VersionString.c_str();