Bug 1356382 - Move jsoncpp library and ensure it is included even when crashreporter is not r=ted

MozReview-Commit-ID: 2g9sFP6QQCU

--HG--
rename : toolkit/crashreporter/jsoncpp/AUTHORS => toolkit/components/jsoncpp/AUTHORS
rename : toolkit/crashreporter/jsoncpp/GIT-INFO => toolkit/components/jsoncpp/GIT-INFO
rename : toolkit/crashreporter/jsoncpp/LICENSE => toolkit/components/jsoncpp/LICENSE
rename : toolkit/crashreporter/jsoncpp/NEWS.txt => toolkit/components/jsoncpp/NEWS.txt
rename : toolkit/crashreporter/jsoncpp/README.md => toolkit/components/jsoncpp/README.md
rename : toolkit/crashreporter/jsoncpp/include/json/allocator.h => toolkit/components/jsoncpp/include/json/allocator.h
rename : toolkit/crashreporter/jsoncpp/include/json/assertions.h => toolkit/components/jsoncpp/include/json/assertions.h
rename : toolkit/crashreporter/jsoncpp/include/json/autolink.h => toolkit/components/jsoncpp/include/json/autolink.h
rename : toolkit/crashreporter/jsoncpp/include/json/config.h => toolkit/components/jsoncpp/include/json/config.h
rename : toolkit/crashreporter/jsoncpp/include/json/features.h => toolkit/components/jsoncpp/include/json/features.h
rename : toolkit/crashreporter/jsoncpp/include/json/forwards.h => toolkit/components/jsoncpp/include/json/forwards.h
rename : toolkit/crashreporter/jsoncpp/include/json/json.h => toolkit/components/jsoncpp/include/json/json.h
rename : toolkit/crashreporter/jsoncpp/include/json/reader.h => toolkit/components/jsoncpp/include/json/reader.h
rename : toolkit/crashreporter/jsoncpp/include/json/value.h => toolkit/components/jsoncpp/include/json/value.h
rename : toolkit/crashreporter/jsoncpp/include/json/version.h => toolkit/components/jsoncpp/include/json/version.h
rename : toolkit/crashreporter/jsoncpp/include/json/writer.h => toolkit/components/jsoncpp/include/json/writer.h
rename : toolkit/crashreporter/jsoncpp/src/lib_json/json_reader.cpp => toolkit/components/jsoncpp/src/lib_json/json_reader.cpp
rename : toolkit/crashreporter/jsoncpp/src/lib_json/json_tool.h => toolkit/components/jsoncpp/src/lib_json/json_tool.h
rename : toolkit/crashreporter/jsoncpp/src/lib_json/json_value.cpp => toolkit/components/jsoncpp/src/lib_json/json_value.cpp
rename : toolkit/crashreporter/jsoncpp/src/lib_json/json_valueiterator.inl => toolkit/components/jsoncpp/src/lib_json/json_valueiterator.inl
rename : toolkit/crashreporter/jsoncpp/src/lib_json/json_writer.cpp => toolkit/components/jsoncpp/src/lib_json/json_writer.cpp
extra : rebase_source : 6996fe5fd4a8e704a138b568d636c1d5238f15b2

build/clang-plugin/Utils.h

@@ -239,6 +239,7 @@ inline bool isIgnoredPathForSprintfLiteral(const CallExpr *Call, const SourceMan
         Begin->compare_lower(StringRef("google-breakpad")) == 0 ||
         Begin->compare_lower(StringRef("gflags")) == 0 ||
         Begin->compare_lower(StringRef("harfbuzz")) == 0 ||
+        Begin->compare_lower(StringRef("jsoncpp")) == 0 ||
         Begin->compare_lower(StringRef("libstagefright")) == 0 ||
         Begin->compare_lower(StringRef("mtransport")) == 0 ||
         Begin->compare_lower(StringRef("protobuf")) == 0 ||

gfx/vr/openvr/moz.build

@@ -23,7 +23,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 #   POSIX
 
 LOCAL_INCLUDES += [
-    '/toolkit/crashreporter/jsoncpp/include',
+    '/toolkit/components/jsoncpp/include',
 ]
 
 USE_LIBS += [

toolkit/components/jsoncpp/src/lib_json/moz.build

@@ -11,7 +11,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/toolkit/crashreporter/jsoncpp/include',
+    '/toolkit/components/jsoncpp/include',
 ]
 
 # This code is only used in the stand-alone minidump analyzer executable so
@@ -31,4 +31,19 @@ DISABLE_STL_WRAPPING = True
 
 Library('jsoncpp')
 
-include('/toolkit/crashreporter/crashreporter.mozbuild')
+# Suppress warnings in third-party code.
+if CONFIG['_MSC_VER']:
+    CXXFLAGS += [
+        '-wd4005', # macro redefinition
+    ]
+elif CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-unused-local-typedefs',
+        '-Wno-shadow',
+    ]
+
+if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
+    CXXFLAGS += [
+        '-Wno-implicit-fallthrough',
+        '-Wno-c++11-narrowing',
+    ]

toolkit/components/moz.build

@@ -34,6 +34,7 @@ DIRS += [
     'formautofill',
     'find',
     'jsdownloads',
+    'jsoncpp/src/lib_json',
     'lz4',
     'mediasniffer',
     'microformats',

toolkit/crashreporter/client/moz.build

@@ -13,7 +13,7 @@ if CONFIG['OS_TARGET'] != 'Android':
     ]
 
     LOCAL_INCLUDES += [
-        '/toolkit/crashreporter/jsoncpp/include',
+        '/toolkit/components/jsoncpp/include',
     ]
 
     USE_LIBS += [

toolkit/crashreporter/minidump-analyzer/moz.build

@@ -20,7 +20,7 @@ if CONFIG['OS_TARGET'] != 'Android':
     ]
 
     LOCAL_INCLUDES += [
-        '/toolkit/crashreporter/jsoncpp/include',
+        '/toolkit/components/jsoncpp/include',
     ]
 
 

toolkit/crashreporter/moz.build

@@ -43,7 +43,6 @@ elif CONFIG['OS_ARCH'] == 'Linux':
 
 DIRS += [
     'client',
-    'jsoncpp/src/lib_json',
     'minidump-analyzer',
 ]
 

toolkit/crashreporter/update-jsoncpp.sh

@@ -18,7 +18,7 @@ rm -rf ${crashreporter_dir}/jsoncpp
 
 jsoncpp_repo=$1
 rev=${2-HEAD}
-(cd $jsoncpp_repo; git archive --prefix=toolkit/crashreporter/jsoncpp/ $rev) | (cd $repo; tar xf -)
+(cd $jsoncpp_repo; git archive --prefix=toolkit/components/jsoncpp/ $rev) | (cd $repo; tar xf -)
 
 # remove some extraneous bits
 rm -rf \