Skip to content

Commit a7fc74b

Browse files
committed
Remove last remnants of jsoncpp
1 parent 9630b54 commit a7fc74b

File tree

4 files changed

+1
-76
lines changed

4 files changed

+1
-76
lines changed

cmake/templates/license.h.in

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -37,63 +37,6 @@ nlohmann-json:
3737
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3838
SOFTWARE.
3939

40-
jsoncpp:
41-
The JsonCpp library's source code, including accompanying documentation,
42-
tests and demonstration applications, are licensed under the following
43-
conditions...
44-
45-
The JsonCpp Authors explicitly disclaim copyright in all
46-
jurisdictions which recognize such a disclaimer. In such jurisdictions,
47-
this software is released into the Public Domain.
48-
49-
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
50-
2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
51-
released under the terms of the MIT License (see below).
52-
53-
In jurisdictions which recognize Public Domain property, the user of this
54-
software may choose to accept it either as 1) Public Domain, 2) under the
55-
conditions of the MIT License (see below), or 3) under the terms of dual
56-
Public Domain/MIT License conditions described here, as they choose.
57-
58-
The MIT License is about as close to Public Domain as a license can get, and is
59-
described in clear, concise terms at:
60-
61-
http://en.wikipedia.org/wiki/MIT_License
62-
63-
The full text of the MIT License follows:
64-
65-
========================================================================
66-
Copyright (c) 2007-2010 The JsonCpp Authors
67-
68-
Permission is hereby granted, free of charge, to any person
69-
obtaining a copy of this software and associated documentation
70-
files (the "Software"), to deal in the Software without
71-
restriction, including without limitation the rights to use, copy,
72-
modify, merge, publish, distribute, sublicense, and/or sell copies
73-
of the Software, and to permit persons to whom the Software is
74-
furnished to do so, subject to the following conditions:
75-
76-
The above copyright notice and this permission notice shall be
77-
included in all copies or substantial portions of the Software.
78-
79-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
80-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
81-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
82-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
83-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
84-
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
85-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
86-
SOFTWARE.
87-
========================================================================
88-
(END LICENSE TEXT)
89-
90-
The MIT license is compatible with both the GPL and commercial
91-
software, affording one all of the rights of Public Domain with the
92-
minor nuisance of being required to keep the above copyright notice
93-
and license text in the source code. Note also that by accepting the
94-
Public Domain "license" you can re-license your copy using whatever
95-
license you like.
96-
9740
scanner/token:
9841
The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are derived from
9942
code originating from the V8 project licensed under the following terms:

scripts/create_source_tarball.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ REPO_ROOT="$(dirname "$0")"/..
3131
fi
3232
# Add dependencies
3333
mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true
34-
wget -O "$SOLDIR/deps/downloads/jsoncpp-1.9.3.tar.gz" https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
3534
mkdir -p "$REPO_ROOT/upload"
3635
tar --owner 0 --group 0 -czf "$REPO_ROOT/upload/solidity_$versionstring.tar.gz" -C "$TEMPDIR" "solidity_$versionstring"
3736
rm -r "$TEMPDIR"

scripts/install_obsolete_jsoncpp_1_7_4.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/release_ppa.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
105105
git clone --depth 2 --recursive https://github.com/ethereum/solidity.git -b "$branch"
106106
mv solidity solc
107107

108-
# Fetch jsoncpp dependency
108+
# Fetch dependencies
109109
mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
110-
wget -O ./solc/deps/downloads/jsoncpp-1.9.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
111110
wget -O ./solc/deps/downloads/range-v3-0.11.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz
112111
wget -O ./solc/deps/nlohmann/json/json.hpp https://github.com/nlohmann/json/releases/download/v3.10.2/json.hpp
113112

0 commit comments

Comments
 (0)