Jsonnet: Move to contrib/

2024-03-22 13:11:30 +08:00 · 2022-01-27 11:43:05 +01:00 · 2022-01-27 11:43:05 +01:00 · 1a02c75bed
commit 1a02c75bed
parent 5c7226ced2
29 changed files with 3 additions and 3 deletions
--- a/oss-internship-2020/jsonnet/CMakeLists.txt
+++ b/oss-internship-2020/jsonnet/CMakeLists.txt
@ -28,7 +28,7 @@ FetchContent_Declare(jsonnet
  GIT_REPOSITORY https://github.com/google/jsonnet.git
  GIT_TAG        v0.18.0 # 2021-12-21
 )
-set(BUILD_TESTS OFF)
+set(BUILD_TESTS OFF CACHE BOOL "") # Do not build jsonnet tests
 FetchContent_MakeAvailable(jsonnet)
 create_directory_symlink("${jsonnet_SOURCE_DIR}"
                         "${PROJECT_BINARY_DIR}/jsonnet")
--- a/oss-internship-2020/jsonnet/README.md
+++ b/oss-internship-2020/jsonnet/README.md
--- a/oss-internship-2020/jsonnet/examples/CMakeLists.txt
+++ b/oss-internship-2020/jsonnet/examples/CMakeLists.txt
--- a/oss-internship-2020/jsonnet/examples/jsonnet_base_example.cc
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_base_example.cc
--- a/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/arith.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/arith.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/formatter_example.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/formatter_example.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/imports.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/imports.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/multiple_files_example.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/multiple_files_example.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/negroni.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/negroni.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/utils.libsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/utils.libsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes/yaml_stream_example.jsonnet
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes/yaml_stream_example.jsonnet
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/arith.golden
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/arith.golden
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/first_file.json
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/first_file.json
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/negroni.golden
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/negroni.golden
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/second_file.json
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/second_file.json
--- a/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/yaml_stream_example.yaml
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_codes_expected_output/yaml_stream_example.yaml
--- a/oss-internship-2020/jsonnet/examples/jsonnet_formatter_example.cc
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_formatter_example.cc
--- a/oss-internship-2020/jsonnet/examples/jsonnet_multiple_files_example.cc
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_multiple_files_example.cc
--- a/oss-internship-2020/jsonnet/examples/jsonnet_yaml_stream_example.cc
+++ b/oss-internship-2020/jsonnet/examples/jsonnet_yaml_stream_example.cc
--- a/oss-internship-2020/jsonnet/headers/jsonnet_base_sandbox.h
+++ b/oss-internship-2020/jsonnet/headers/jsonnet_base_sandbox.h
--- a/oss-internship-2020/jsonnet/headers/jsonnet_base_transaction.h
+++ b/oss-internship-2020/jsonnet/headers/jsonnet_base_transaction.h
--- a/oss-internship-2020/jsonnet/jsonnet.patch
+++ b/oss-internship-2020/jsonnet/jsonnet.patch
--- a/oss-internship-2020/jsonnet/jsonnet_helper.cc
+++ b/oss-internship-2020/jsonnet/jsonnet_helper.cc
--- a/oss-internship-2020/jsonnet/jsonnet_helper.h
+++ b/oss-internship-2020/jsonnet/jsonnet_helper.h
--- a/oss-internship-2020/jsonnet/tests/CMakeLists.txt
+++ b/oss-internship-2020/jsonnet/tests/CMakeLists.txt
@ -23,9 +23,9 @@ add_custom_target(test_preparation ALL
 )

 add_executable(tests
-  ${PROJECT_SOURCE_DIR}/headers/jsonnet_tests.h
+  jsonnet_test_helper.cc
+  jsonnet_test_helper.h
  jsonnet_tests.cc
-  jsonnet_tests_utils.cc
 )

 target_include_directories(tests PUBLIC
--- a/oss-internship-2020/jsonnet/tests/jsonnet_tests_utils.cc
+++ b/oss-internship-2020/jsonnet/tests/jsonnet_tests_utils.cc
--- a/oss-internship-2020/jsonnet/headers/jsonnet_tests.h
+++ b/oss-internship-2020/jsonnet/headers/jsonnet_tests.h
--- a/oss-internship-2020/jsonnet/tests/jsonnet_tests.cc
+++ b/oss-internship-2020/jsonnet/tests/jsonnet_tests.cc