diff options
author | ronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:33:19 +0000 |
---|---|---|
committer | ronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:33:19 +0000 |
commit | 3bd20ee4e815188e6c9bc116ae9ea29cdc0b8505 (patch) | |
tree | 0d9481f5edcfc5cc1fa5ef235964374267cc9606 /third_party/jsoncpp | |
parent | 332749034b6cf2164b364c8020aadcee17ff0d26 (diff) | |
download | chromium_src-3bd20ee4e815188e6c9bc116ae9ea29cdc0b8505.zip chromium_src-3bd20ee4e815188e6c9bc116ae9ea29cdc0b8505.tar.gz chromium_src-3bd20ee4e815188e6c9bc116ae9ea29cdc0b8505.tar.bz2 |
Add jsoncpp in DEPS and the gyp file to build jsoncpp in chromium.
The jsoncpp is needed by libjingle as part of the webrtc effort. This patch probably not be the best solution as there's already one chrome json parser in base and another jsoncpp copy in native_client. However since the libjingle can depend on neither of them, here comes this patch. We hope to take this patch as a chance to get some advices on how should we handle this case.
BUGS=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106424
Review URL: http://codereview.chromium.org/8251003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/jsoncpp')
-rw-r--r-- | third_party/jsoncpp/LICENSE | 55 | ||||
-rw-r--r-- | third_party/jsoncpp/README.chromium | 10 | ||||
-rw-r--r-- | third_party/jsoncpp/jsoncpp.gyp | 45 |
3 files changed, 110 insertions, 0 deletions
diff --git a/third_party/jsoncpp/LICENSE b/third_party/jsoncpp/LICENSE new file mode 100644 index 0000000..ca2bfe1 --- /dev/null +++ b/third_party/jsoncpp/LICENSE @@ -0,0 +1,55 @@ +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... + +The author (Baptiste Lepilleur) explicitly disclaims copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. + +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is +released under the terms of the MIT License (see below). + +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. + +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: + + http://en.wikipedia.org/wiki/MIT_License + +The full text of the MIT License follows: + +======================================================================== +Copyright (c) 2007-2010 Baptiste Lepilleur + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +======================================================================== +(END LICENSE TEXT) + +The MIT license is compatible with both the GPL and commercial +software, affording one all of the rights of Public Domain with the +minor nuisance of being required to keep the above copyright notice +and license text in the source code. Note also that by accepting the +Public Domain "license" you can re-license your copy using whatever +license you like. diff --git a/third_party/jsoncpp/README.chromium b/third_party/jsoncpp/README.chromium new file mode 100644 index 0000000..8d50a92 --- /dev/null +++ b/third_party/jsoncpp/README.chromium @@ -0,0 +1,10 @@ +Name: jsoncpp +URL: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp +Version: 246 +License: MIT +License File: LICENSE +Security Critical: yes + +Description: +The libjingle/webrtc uses jsoncpp for signaling message serialization and deserialization. + diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp new file mode 100644 index 0000000..bb323ef --- /dev/null +++ b/third_party/jsoncpp/jsoncpp.gyp @@ -0,0 +1,45 @@ +# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'jsoncpp', + 'type': 'static_library', + 'defines': [ + 'JSON_USE_EXCEPTION=0', + ], + 'sources': [ + 'source/include/json/assertions.h', + 'source/include/json/autolink.h', + 'source/include/json/config.h', + 'source/include/json/features.h', + 'source/include/json/forwards.h', + 'source/include/json/json.h', + 'source/include/json/reader.h', + 'source/include/json/value.h', + 'source/include/json/writer.h', + 'source/src/lib_json/json_batchallocator.h', + 'source/src/lib_json/json_reader.cpp', + 'source/src/lib_json/json_tool.h', + 'source/src/lib_json/json_value.cpp', + 'source/src/lib_json/json_writer.cpp', + ], + 'include_dirs': [ + 'source/include/', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'source/include/', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: |