From 49c21222a0d6086ea1d3021bfbc0b119e0c07454 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Sun, 5 Feb 2017 15:26:56 +0000 Subject: [PATCH] [External] Move lib/JSON to lib/External/JSON. NFC. For consistency with isl and ppcg which are already in lib/External. llvm-svn: 294126 --- polly/.arclint | 2 +- polly/CMakeLists.txt | 7 +++---- polly/LICENSE.txt | 2 +- polly/lib/CMakeLists.txt | 6 +++--- polly/lib/{ => External}/JSON/LICENSE.txt | 0 polly/lib/{ => External}/JSON/include/json/autolink.h | 0 polly/lib/{ => External}/JSON/include/json/config.h | 0 polly/lib/{ => External}/JSON/include/json/features.h | 0 polly/lib/{ => External}/JSON/include/json/forwards.h | 0 polly/lib/{ => External}/JSON/include/json/json.h | 0 polly/lib/{ => External}/JSON/include/json/reader.h | 0 polly/lib/{ => External}/JSON/include/json/value.h | 0 polly/lib/{ => External}/JSON/include/json/writer.h | 0 polly/lib/{ => External}/JSON/json_batchallocator.h | 0 polly/lib/{ => External}/JSON/json_internalarray.inl | 0 polly/lib/{ => External}/JSON/json_internalmap.inl | 0 polly/lib/{ => External}/JSON/json_reader.cpp | 0 polly/lib/{ => External}/JSON/json_value.cpp | 0 polly/lib/{ => External}/JSON/json_valueiterator.inl | 0 polly/lib/{ => External}/JSON/json_writer.cpp | 0 polly/lib/{ => External}/JSON/sconscript | 0 21 files changed, 8 insertions(+), 9 deletions(-) rename polly/lib/{ => External}/JSON/LICENSE.txt (100%) rename polly/lib/{ => External}/JSON/include/json/autolink.h (100%) rename polly/lib/{ => External}/JSON/include/json/config.h (100%) rename polly/lib/{ => External}/JSON/include/json/features.h (100%) rename polly/lib/{ => External}/JSON/include/json/forwards.h (100%) rename polly/lib/{ => External}/JSON/include/json/json.h (100%) rename polly/lib/{ => External}/JSON/include/json/reader.h (100%) rename polly/lib/{ => External}/JSON/include/json/value.h (100%) rename polly/lib/{ => External}/JSON/include/json/writer.h (100%) rename polly/lib/{ => External}/JSON/json_batchallocator.h (100%) rename polly/lib/{ => External}/JSON/json_internalarray.inl (100%) rename polly/lib/{ => External}/JSON/json_internalmap.inl (100%) rename polly/lib/{ => External}/JSON/json_reader.cpp (100%) rename polly/lib/{ => External}/JSON/json_value.cpp (100%) rename polly/lib/{ => External}/JSON/json_valueiterator.inl (100%) rename polly/lib/{ => External}/JSON/json_writer.cpp (100%) rename polly/lib/{ => External}/JSON/sconscript (100%) diff --git a/polly/.arclint b/polly/.arclint index f1df53b..07bca35 100644 --- a/polly/.arclint +++ b/polly/.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.+)|Error:) (?P.+)$/m" diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt index 38e5e8b..5a908d4 100644 --- a/polly/CMakeLists.txt +++ b/polly/CMakeLists.txt @@ -161,7 +161,7 @@ endif(CUDALIB_FOUND) 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 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake # 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) diff --git a/polly/LICENSE.txt b/polly/LICENSE.txt index d122db4..5019e517 100644 --- a/polly/LICENSE.txt +++ b/polly/LICENSE.txt @@ -55,7 +55,7 @@ licenses, and/or restrictions: Program Directory ------- --------- -jsoncpp lib/JSON +jsoncpp lib/External/JSON diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt index 673db5638..cf4c63c 100644 --- a/polly/lib/CMakeLists.txt +++ b/polly/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 diff --git a/polly/lib/JSON/LICENSE.txt b/polly/lib/External/JSON/LICENSE.txt similarity index 100% rename from polly/lib/JSON/LICENSE.txt rename to polly/lib/External/JSON/LICENSE.txt diff --git a/polly/lib/JSON/include/json/autolink.h b/polly/lib/External/JSON/include/json/autolink.h similarity index 100% rename from polly/lib/JSON/include/json/autolink.h rename to polly/lib/External/JSON/include/json/autolink.h diff --git a/polly/lib/JSON/include/json/config.h b/polly/lib/External/JSON/include/json/config.h similarity index 100% rename from polly/lib/JSON/include/json/config.h rename to polly/lib/External/JSON/include/json/config.h diff --git a/polly/lib/JSON/include/json/features.h b/polly/lib/External/JSON/include/json/features.h similarity index 100% rename from polly/lib/JSON/include/json/features.h rename to polly/lib/External/JSON/include/json/features.h diff --git a/polly/lib/JSON/include/json/forwards.h b/polly/lib/External/JSON/include/json/forwards.h similarity index 100% rename from polly/lib/JSON/include/json/forwards.h rename to polly/lib/External/JSON/include/json/forwards.h diff --git a/polly/lib/JSON/include/json/json.h b/polly/lib/External/JSON/include/json/json.h similarity index 100% rename from polly/lib/JSON/include/json/json.h rename to polly/lib/External/JSON/include/json/json.h diff --git a/polly/lib/JSON/include/json/reader.h b/polly/lib/External/JSON/include/json/reader.h similarity index 100% rename from polly/lib/JSON/include/json/reader.h rename to polly/lib/External/JSON/include/json/reader.h diff --git a/polly/lib/JSON/include/json/value.h b/polly/lib/External/JSON/include/json/value.h similarity index 100% rename from polly/lib/JSON/include/json/value.h rename to polly/lib/External/JSON/include/json/value.h diff --git a/polly/lib/JSON/include/json/writer.h b/polly/lib/External/JSON/include/json/writer.h similarity index 100% rename from polly/lib/JSON/include/json/writer.h rename to polly/lib/External/JSON/include/json/writer.h diff --git a/polly/lib/JSON/json_batchallocator.h b/polly/lib/External/JSON/json_batchallocator.h similarity index 100% rename from polly/lib/JSON/json_batchallocator.h rename to polly/lib/External/JSON/json_batchallocator.h diff --git a/polly/lib/JSON/json_internalarray.inl b/polly/lib/External/JSON/json_internalarray.inl similarity index 100% rename from polly/lib/JSON/json_internalarray.inl rename to polly/lib/External/JSON/json_internalarray.inl diff --git a/polly/lib/JSON/json_internalmap.inl b/polly/lib/External/JSON/json_internalmap.inl similarity index 100% rename from polly/lib/JSON/json_internalmap.inl rename to polly/lib/External/JSON/json_internalmap.inl diff --git a/polly/lib/JSON/json_reader.cpp b/polly/lib/External/JSON/json_reader.cpp similarity index 100% rename from polly/lib/JSON/json_reader.cpp rename to polly/lib/External/JSON/json_reader.cpp diff --git a/polly/lib/JSON/json_value.cpp b/polly/lib/External/JSON/json_value.cpp similarity index 100% rename from polly/lib/JSON/json_value.cpp rename to polly/lib/External/JSON/json_value.cpp diff --git a/polly/lib/JSON/json_valueiterator.inl b/polly/lib/External/JSON/json_valueiterator.inl similarity index 100% rename from polly/lib/JSON/json_valueiterator.inl rename to polly/lib/External/JSON/json_valueiterator.inl diff --git a/polly/lib/JSON/json_writer.cpp b/polly/lib/External/JSON/json_writer.cpp similarity index 100% rename from polly/lib/JSON/json_writer.cpp rename to polly/lib/External/JSON/json_writer.cpp diff --git a/polly/lib/JSON/sconscript b/polly/lib/External/JSON/sconscript similarity index 100% rename from polly/lib/JSON/sconscript rename to polly/lib/External/JSON/sconscript -- 2.7.4