Use individual files for lists of source files.
This will make it easier to support other build systems rather
than relying on names of files matching a special pattern to
mean a special thing.
Bug: 1322914
Change-Id: I3d1df70e79934717275c0c331e7e5cd3cc5c99e5
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/61245
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Auto-Submit: Bob Beck <bbe@google.com>
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt
index 72bbe43..b808282 100644
--- a/pki/CMakeLists.txt
+++ b/pki/CMakeLists.txt
@@ -2,50 +2,13 @@
set(PKI_CXX_FLAGS "-fno-aligned-new")
endif()
+file(STRINGS pki_sources.txt pki_sources)
+file(STRINGS pki_test_sources.txt pki_test_sources)
+
add_library(
pki
- fillins/ip_address.cc
- fillins/utf_string_conversions.cc
- fillins/string_util.cc
- fillins/base64.cc
- fillins/openssl_util.cc
- string_util.cc
- trust_store.cc
- trust_store_collection.cc
- parse_certificate.cc
- parsed_certificate.cc
- parser.cc
- parse_values.cc
- parse_name.cc
- parsed_certificate.cc
- name_constraints.cc
- input.cc
- tag.cc
- cert_errors.cc
- general_names.cc
- pem.cc
- crl.cc
- revocation_util.cc
- encode_values.cc
- verify_name_match.cc
- cert_errors.cc
- common_cert_errors.cc
- parse_certificate.cc
- parsed_certificate.cc
- extended_key_usage.cc
- certificate_policies.cc
- verify_certificate_chain.cc
- verify_signed_data.cc
- signature_algorithm.cc
- cert_error_id.cc
- cert_error_params.cc
- trust_store.cc
- trust_store_collection.cc
- trust_store_in_memory.cc
- simple_path_builder_delegate.cc
- cert_issuer_source_static.cc
- path_builder.cc
+ ${pki_sources}
)
set_target_properties(
pki
@@ -59,32 +22,7 @@
add_executable(
pki_test
- fillins/path_service.cc
- fillins/file_util.cc
- test_helpers.cc
- string_util_unittest.cc
- parser_unittest.cc
- parse_values_unittest.cc
- input_unittest.cc
- signature_algorithm_unittest.cc
- extended_key_usage_unittest.cc
- parse_name_unittest.cc
- verify_name_match_unittest.cc
- verify_signed_data_unittest.cc
- parse_certificate_unittest.cc
- parsed_certificate_unittest.cc
- simple_path_builder_delegate_unittest.cc
- trust_store_collection_unittest.cc
- certificate_policies_unittest.cc
- verify_certificate_chain_unittest.cc
- nist_pkits_unittest.cc
- path_builder_pkits_unittest.cc
- name_constraints_unittest.cc
- cert_issuer_source_static_unittest.cc
- path_builder_unittest.cc
- mock_signature_verify_cache.cc
- path_builder_verify_certificate_chain_unittest.cc
- verify_certificate_chain_pkits_unittest.cc
+ ${pki_test_sources}
# encode_values_unittest.cc # Currently does a bunch of time goo..
# ocsp_unittest.cc # Not sure we will keep this here..
)
diff --git a/pki/pki_sources.txt b/pki/pki_sources.txt
new file mode 100644
index 0000000..e9f39f4
--- /dev/null
+++ b/pki/pki_sources.txt
@@ -0,0 +1,41 @@
+fillins/ip_address.cc
+fillins/utf_string_conversions.cc
+fillins/string_util.cc
+fillins/base64.cc
+fillins/openssl_util.cc
+string_util.cc
+trust_store.cc
+trust_store_collection.cc
+parse_certificate.cc
+parsed_certificate.cc
+parser.cc
+parse_values.cc
+parse_name.cc
+parsed_certificate.cc
+name_constraints.cc
+input.cc
+tag.cc
+cert_errors.cc
+general_names.cc
+pem.cc
+crl.cc
+revocation_util.cc
+encode_values.cc
+verify_name_match.cc
+cert_errors.cc
+common_cert_errors.cc
+parse_certificate.cc
+parsed_certificate.cc
+extended_key_usage.cc
+certificate_policies.cc
+verify_certificate_chain.cc
+verify_signed_data.cc
+signature_algorithm.cc
+cert_error_id.cc
+cert_error_params.cc
+trust_store.cc
+trust_store_collection.cc
+trust_store_in_memory.cc
+simple_path_builder_delegate.cc
+cert_issuer_source_static.cc
+path_builder.cc
diff --git a/pki/pki_test_sources.txt b/pki/pki_test_sources.txt
new file mode 100644
index 0000000..707206c
--- /dev/null
+++ b/pki/pki_test_sources.txt
@@ -0,0 +1,26 @@
+fillins/path_service.cc
+fillins/file_util.cc
+test_helpers.cc
+string_util_unittest.cc
+parser_unittest.cc
+parse_values_unittest.cc
+input_unittest.cc
+signature_algorithm_unittest.cc
+extended_key_usage_unittest.cc
+parse_name_unittest.cc
+verify_name_match_unittest.cc
+verify_signed_data_unittest.cc
+parse_certificate_unittest.cc
+parsed_certificate_unittest.cc
+simple_path_builder_delegate_unittest.cc
+trust_store_collection_unittest.cc
+certificate_policies_unittest.cc
+verify_certificate_chain_unittest.cc
+nist_pkits_unittest.cc
+path_builder_pkits_unittest.cc
+name_constraints_unittest.cc
+cert_issuer_source_static_unittest.cc
+path_builder_unittest.cc
+mock_signature_verify_cache.cc
+path_builder_verify_certificate_chain_unittest.cc
+verify_certificate_chain_pkits_unittest.cc
