aboutsummaryrefslogtreecommitdiffstats
path: root/solc
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-06-30 22:59:53 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-07-02 05:59:08 +0800
commitc78a3a0b01d934c31f599523bb941d0a6e6ecbc8 (patch)
treefe34c883a108a8cec4ef7ffc9fefd87ad31a3971 /solc
parentdd9416be29e9ac22b9b2a33cb9424514067cc6bf (diff)
downloaddexon-solidity-c78a3a0b01d934c31f599523bb941d0a6e6ecbc8.tar.gz
dexon-solidity-c78a3a0b01d934c31f599523bb941d0a6e6ecbc8.tar.zst
dexon-solidity-c78a3a0b01d934c31f599523bb941d0a6e6ecbc8.zip
Add other licenses.
Diffstat (limited to 'solc')
-rw-r--r--solc/CommandLineInterface.cpp1
-rw-r--r--solc/jsonCompiler.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index d0134113..0222ccb0 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -190,6 +190,7 @@ static void version()
static void license()
{
+ cout << otherLicenses << endl;
// This is a static variable generated by cmake from LICENSE.txt
cout << licenseText << endl;
exit(0);
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index adf991d6..de797b3c 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -266,8 +266,8 @@ extern "C"
{
extern char const* license()
{
- /// TOOD: include the copyright information on the top.
- return licenseText;
+ static string fullLicenseText = otherLicenses + licenseText;
+ return fullLicenseText.c_str();
}
extern char const* version()
{