[PATCH] D29563: [Polly][External] Move jsoncpp to lib/External/JSON. NFC.

[Michael Kruse via Phabricator via llvm-commits]

Meinersbur created this revision.
Meinersbur added a project: Polly.
Herald added a subscriber: mgorny.

For consistency with isl and ppcg which are already in lib/External.

Further changes might compile jsoncpp into its own library and optionally use the system's version instead. Debian's llvm package currently patches this in. See Debian Wiki <https://wiki.debian.org/SoftwarePackaging> and Debian's Polly patch <https://anonscm.debian.org/viewvc/pkg-llvm/llvm-toolchain/branches/3.9/debian/patches/use-deb-json.diff?view=markup>.


https://reviews.llvm.org/D29563

Files:
  .arclint
  CMakeLists.txt
  LICENSE.txt
  lib/CMakeLists.txt
  lib/External/JSON/LICENSE.txt
  lib/External/JSON/include/json/autolink.h
  lib/External/JSON/include/json/config.h
  lib/External/JSON/include/json/features.h
  lib/External/JSON/include/json/forwards.h
  lib/External/JSON/include/json/json.h
  lib/External/JSON/include/json/reader.h
  lib/External/JSON/include/json/value.h
  lib/External/JSON/include/json/writer.h
  lib/External/JSON/json_batchallocator.h
  lib/External/JSON/json_internalarray.inl
  lib/External/JSON/json_internalmap.inl
  lib/External/JSON/json_reader.cpp
  lib/External/JSON/json_value.cpp
  lib/External/JSON/json_valueiterator.inl
  lib/External/JSON/json_writer.cpp
  lib/External/JSON/sconscript
  lib/JSON/LICENSE.txt
  lib/JSON/include/json/autolink.h
  lib/JSON/include/json/config.h
  lib/JSON/include/json/features.h
  lib/JSON/include/json/forwards.h
  lib/JSON/include/json/json.h
  lib/JSON/include/json/reader.h
  lib/JSON/include/json/value.h
  lib/JSON/include/json/writer.h
  lib/JSON/json_batchallocator.h
  lib/JSON/json_internalarray.inl
  lib/JSON/json_internalmap.inl
  lib/JSON/json_reader.cpp
  lib/JSON/json_value.cpp
  lib/JSON/json_valueiterator.inl
  lib/JSON/json_writer.cpp
  lib/JSON/sconscript


Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(LLVM_NO_RTTI 1)
 
 set(POLLY_JSON_FILES
-    JSON/json_reader.cpp
-    JSON/json_value.cpp
-    JSON/json_writer.cpp
+    External/JSON/json_reader.cpp
+    External/JSON/json_value.cpp
+    External/JSON/json_writer.cpp
 )
 
 set(ISL_CODEGEN_FILES
Index: LICENSE.txt
===================================================================
--- LICENSE.txt
+++ LICENSE.txt
@@ -55,7 +55,7 @@
 
 Program             Directory
 -------             ---------
-jsoncpp             lib/JSON
+jsoncpp             lib/External/JSON
 
 
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -161,7 +161,7 @@
 include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
@@ -203,9 +203,8 @@
 
 # Add target to check formatting of polly files
 file( GLOB_RECURSE files *.h lib/*.cpp lib/*.c tools/*.cpp tools/*.c tools/*.h unittests/*.cpp)
-file( GLOB_RECURSE jsonfiles lib/JSON/*.h lib/JSON/*.cpp)
-file( GLOB_RECURSE external lib/External/*.h lib/External/*.c)
-list( REMOVE_ITEM files ${jsonfiles} ${external})
+file( GLOB_RECURSE external lib/External/*.h lib/External/*.c lib/External/*.cpp)
+list( REMOVE_ITEM files ${external})
 
 set(check_format_depends)
 set(update_format_depends)
Index: .arclint
===================================================================
--- .arclint
+++ .arclint
@@ -2,7 +2,7 @@
   "linters": {
     "format": {
       "include": "(include/polly/.+\\.h$|lib/.+\\.cpp$)",
-      "exclude": "(lib/JSON/.*)",
+      "exclude": "(lib/External/JSON/.*)",
       "type": "script-and-regex",
       "script-and-regex.script": "sh -c './utils/check_format.sh \"$0\" 2> /dev/null || true'",
       "script-and-regex.regex": "/^(OK:(?P<ignore>.+)|Error:) (?P<message>.+)$/m"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29563.87144.patch
Type: text/x-patch
Size: 2210 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170205/66c5cec0/attachment.bin>