ceedling 1.2.1 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/GIT_COMMIT_SHA +1 -1
- data/README.md +11 -9
- data/Rakefile +2 -1
- data/assets/features/ceedling +1 -1
- data/assets/fixtures/test_source_file_duplicate_basenames/test_calc_typo.c +14 -0
- data/assets/fixtures/tests_with_duplicate_test_names/test_foo.c +21 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.c +7 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.h +5 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.c +13 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.h +4 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_private_macro.c +10 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_tally.c +9 -0
- data/bin/actionator.rb +6 -12
- data/bin/app_cfg.rb +14 -1
- data/bin/ceedling +13 -3
- data/bin/cli.rb +25 -6
- data/bin/cli_handler.rb +113 -73
- data/bin/cli_helper.rb +51 -78
- data/bin/installation_selector.rb +81 -0
- data/bin/launchinator.rb +69 -0
- data/bin/mixin_resolvinator.rb +26 -36
- data/bin/objects.yml +13 -0
- data/bin/path_validator.rb +25 -29
- data/bin/versionator.rb +47 -48
- data/ceedling.gemspec +19 -15
- data/docs/BreakingChanges.md +86 -1
- data/docs/Changelog.md +145 -3
- data/docs/KnownIssues.md +179 -6
- data/docs/ReleaseNotes.md +13 -0
- data/examples/wondrous_forest/README.md +29 -1
- data/examples/wondrous_forest/src/ForestUnits.h +23 -0
- data/examples/wondrous_forest/src/RainGauge.c +59 -0
- data/examples/wondrous_forest/src/RainGauge.h +39 -0
- data/examples/wondrous_forest/src/RainTipIsr.c +17 -0
- data/examples/wondrous_forest/src/RainTipIsr.h +14 -0
- data/examples/wondrous_forest/test/TestRainGauge.c +126 -0
- data/lib/ceedling/build_log_writer.rb +33 -0
- data/lib/ceedling/c_extractor/README.md +15 -7
- data/lib/ceedling/c_extractor/c_extractor.rb +25 -14
- data/lib/ceedling/c_extractor/c_extractor_code_text.rb +84 -54
- data/lib/ceedling/c_extractor/c_extractor_constants.rb +18 -7
- data/lib/ceedling/c_extractor/c_extractor_declarations.rb +319 -283
- data/lib/ceedling/c_extractor/c_extractor_declarator.rb +285 -0
- data/lib/ceedling/c_extractor/c_extractor_defined_type.rb +111 -0
- data/lib/ceedling/c_extractor/c_extractor_definitions.rb +174 -121
- data/lib/ceedling/c_extractor/c_extractor_functions.rb +191 -162
- data/lib/ceedling/c_extractor/c_extractor_preprocessing.rb +46 -55
- data/lib/ceedling/c_extractor/c_extractor_statement.rb +30 -0
- data/lib/ceedling/c_extractor/c_extractor_types.rb +63 -41
- data/lib/ceedling/c_extractor/c_module_edits.rb +48 -0
- data/lib/ceedling/c_identifier.rb +21 -0
- data/lib/ceedling/ceedling.h +8 -0
- data/lib/ceedling/config/build_root_policy.rb +70 -0
- data/lib/ceedling/config/configurator.rb +18 -19
- data/lib/ceedling/config/configurator_builder.rb +75 -28
- data/lib/ceedling/config/configurator_paths_validator.rb +179 -0
- data/lib/ceedling/config/configurator_plugins.rb +1 -1
- data/lib/ceedling/config/configurator_setup.rb +44 -33
- data/lib/ceedling/config/configurator_validator.rb +1 -110
- data/lib/ceedling/constants.rb +5 -1
- data/lib/ceedling/defaults.rb +35 -5
- data/lib/ceedling/dependencies/CACHE_SCHEMA.md +118 -0
- data/lib/ceedling/dependencies/README.md +18 -16
- data/lib/ceedling/dependencies/dependency_cache_store.rb +43 -21
- data/lib/ceedling/dependencies/dependency_hasher.rb +35 -1
- data/lib/ceedling/dependencies/dependency_tracker.rb +9 -3
- data/lib/ceedling/dependencies/dependinator.rb +13 -1
- data/lib/ceedling/diagnostics/DOCTOR.md +142 -0
- data/lib/ceedling/diagnostics/README.md +5 -0
- data/lib/ceedling/diagnostics/build_step_doctor.rb +110 -0
- data/lib/ceedling/diagnostics/duplicate_symbol_specialist.rb +108 -0
- data/lib/ceedling/diagnostics/guidance_phrases.rb +30 -0
- data/lib/ceedling/diagnostics/header_collision_guidance.rb +56 -0
- data/lib/ceedling/diagnostics/header_collision_specialist.rb +152 -0
- data/lib/ceedling/diagnostics/include_depth_specialist.rb +132 -0
- data/lib/ceedling/diagnostics/missing_symbol_specialist.rb +111 -0
- data/lib/ceedling/diagnostics/partial_name_specialist.rb +134 -0
- data/lib/ceedling/diagnostics/toolchain_output.rb +44 -0
- data/lib/ceedling/filename_extension.rb +7 -1
- data/lib/ceedling/filesystem/FILE_TREE.md +253 -0
- data/lib/ceedling/filesystem/PATH_HANDLING.md +360 -0
- data/lib/ceedling/filesystem/README.md +46 -0
- data/lib/ceedling/filesystem/build_roots.rb +105 -0
- data/lib/ceedling/filesystem/build_subpath.rb +187 -0
- data/lib/ceedling/filesystem/destination_collision.rb +25 -0
- data/lib/ceedling/{file_finder.rb → filesystem/file_finder.rb} +177 -156
- data/lib/ceedling/filesystem/file_finder_helper.rb +154 -0
- data/lib/ceedling/filesystem/file_path_collection_utils.rb +183 -0
- data/lib/ceedling/{file_path_utils.rb → filesystem/file_path_utils.rb} +200 -167
- data/lib/ceedling/{file_system_wrapper.rb → filesystem/file_system_wrapper.rb} +6 -5
- data/lib/ceedling/filesystem/file_tree.rb +241 -0
- data/lib/ceedling/{file_wrapper.rb → filesystem/file_wrapper.rb} +149 -65
- data/lib/ceedling/filesystem/path_exclusions.rb +30 -0
- data/lib/ceedling/{path_matcher.rb → filesystem/path_matcher.rb} +48 -23
- data/lib/ceedling/{path_mirror.rb → filesystem/path_mirror.rb} +19 -18
- data/lib/ceedling/filesystem/path_spellings.rb +55 -0
- data/lib/ceedling/filesystem/project_paths.rb +184 -0
- data/lib/ceedling/filesystem/test_build_layout.rb +114 -0
- data/lib/ceedling/filesystem/win_long_paths.rb +153 -0
- data/lib/ceedling/filesystem/win_path_limit.rb +83 -0
- data/lib/ceedling/filesystem/win_path_prober.rb +52 -0
- data/lib/ceedling/filesystem/working_dir.rb +40 -0
- data/lib/ceedling/generators/generator.rb +32 -70
- data/lib/ceedling/generators/generator_helper.rb +0 -44
- data/lib/ceedling/generators/generator_mocks.rb +5 -0
- data/lib/ceedling/generators/generator_partials.rb +306 -244
- data/lib/ceedling/generators/generator_test_results_backtrace.rb +7 -7
- data/lib/ceedling/generators/generator_test_runner.rb +5 -8
- data/lib/ceedling/generators/partial_header_writer.rb +95 -0
- data/lib/ceedling/generators/partial_source_writer.rb +137 -0
- data/lib/ceedling/handoff.rb +121 -0
- data/lib/ceedling/includes/header_search.rb +225 -0
- data/lib/ceedling/includes/include_factory.rb +9 -12
- data/lib/ceedling/includes/include_pathinator.rb +112 -33
- data/lib/ceedling/includes/includes.rb +150 -38
- data/lib/ceedling/installation.rb +92 -0
- data/lib/ceedling/library_resolver.rb +99 -0
- data/lib/ceedling/objects.yml +112 -6
- data/lib/ceedling/partials/README.md +110 -16
- data/lib/ceedling/partials/carry_plan.rb +71 -0
- data/lib/ceedling/partials/definition_head.rb +74 -0
- data/lib/ceedling/partials/include_groups.rb +37 -0
- data/lib/ceedling/partials/interface_extras.rb +25 -0
- data/lib/ceedling/partials/partializer.rb +603 -124
- data/lib/ceedling/partials/partializer_config.rb +8 -1
- data/lib/ceedling/partials/partializer_helper.rb +851 -145
- data/lib/ceedling/partials/partializer_reconciler.rb +174 -0
- data/lib/ceedling/partials/partializer_utils.rb +89 -109
- data/lib/ceedling/partials/partials.rb +153 -10
- data/lib/ceedling/partials/type_macros.rb +126 -0
- data/lib/ceedling/plugins/report_log_writer_plugin.rb +3 -5
- data/lib/ceedling/preprocess/README.md +43 -33
- data/lib/ceedling/preprocess/preprocessinator.rb +100 -186
- data/lib/ceedling/preprocess/preprocessinator_code_finder.rb +65 -72
- data/lib/ceedling/preprocess/preprocessinator_file_assembler.rb +32 -76
- data/lib/ceedling/preprocess/preprocessinator_includes_handler.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_line_marker_includes_extractor.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_reconstructor.rb +51 -14
- data/lib/ceedling/rake_app/rakefile_component_resolver.rb +10 -17
- data/lib/ceedling/rakefile.rb +15 -1
- data/lib/ceedling/rakefiles/base/tasks_base.rake +1 -1
- data/lib/ceedling/rakefiles/release/rules_release.rake +4 -7
- data/lib/ceedling/release_invoker/release_build_executor.rb +33 -44
- data/lib/ceedling/release_invoker/release_build_planner.rb +14 -6
- data/lib/ceedling/reportinator.rb +3 -4
- data/lib/ceedling/setupinator.rb +104 -87
- data/lib/ceedling/test_context_extractor.rb +5 -1
- data/lib/ceedling/test_invoker/HEADER_COLLISIONS.md +21 -7
- data/lib/ceedling/test_invoker/PIPELINE.md +62 -19
- data/lib/ceedling/test_invoker/README.md +1 -1
- data/lib/ceedling/test_invoker/derived_search_path_notices.rb +45 -0
- data/lib/ceedling/test_invoker/mock_locator.rb +175 -10
- data/lib/ceedling/test_invoker/partial_files_preprocessinator.rb +181 -0
- data/lib/ceedling/test_invoker/partials_manager.rb +271 -302
- data/lib/ceedling/test_invoker/standin_headerinator.rb +19 -17
- data/lib/ceedling/test_invoker/test_bare_includes_extractinator.rb +26 -3
- data/lib/ceedling/test_invoker/test_build_executor.rb +358 -234
- data/lib/ceedling/test_invoker/test_build_planner.rb +46 -33
- data/lib/ceedling/test_invoker/test_build_setup.rb +43 -18
- data/lib/ceedling/test_invoker/test_build_validations.rb +35 -47
- data/lib/ceedling/test_invoker/test_derived_search_paths.rb +189 -0
- data/lib/ceedling/test_invoker/test_file_preprocessinator.rb +2 -3
- data/lib/ceedling/test_invoker/test_includes_reconcilinator.rb +1 -1
- data/lib/ceedling/test_invoker/test_invoker.rb +6 -1
- data/lib/ceedling/test_invoker/test_invoker_types.rb +28 -20
- data/lib/ceedling/test_invoker/test_pipeline_helpers.rb +6 -4
- data/lib/ceedling/test_invoker/test_pipeline_manager.rb +25 -8
- data/lib/ceedling/test_invoker/test_runner_generatinator.rb +31 -3
- data/lib/ceedling/test_invoker/test_search_paths.rb +30 -8
- data/lib/ceedling/test_invoker/test_source_file_directive_resolver.rb +40 -20
- data/lib/ceedling/test_invoker/test_substitutions.rb +72 -0
- data/lib/ceedling/tools/shell_quoting.rb +45 -0
- data/lib/ceedling/{tool_executor.rb → tools/tool_executor.rb} +9 -3
- data/lib/ceedling/tools/tool_quoting.rb +79 -0
- data/lib/ceedling/{tool_validator.rb → tools/tool_validator.rb} +18 -7
- data/lib/ceedling/yaml_wrapper.rb +3 -2
- data/lib/version.rb +1 -1
- data/plugins/bullseye/bullseye.rake +1 -3
- data/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/plugins/bullseye/lib/bullseye.rb +24 -9
- data/plugins/command_hooks/lib/command_hooks.rb +1 -1
- data/plugins/cppcheck/config/defaults_cppcheck.rb +1 -1
- data/plugins/dependencies/config/defaults.yml +6 -6
- data/plugins/dependencies/dependencies.rake +4 -1
- data/plugins/dependencies/lib/dependencies.rb +18 -8
- data/plugins/dependencies/lib/dependency_spec.rb +17 -5
- data/plugins/fff/lib/fff.rb +79 -46
- data/plugins/fff/lib/fff_mock_generator.rb +12 -9
- data/plugins/fff/spec/fff_cmock_wrapper_spec.rb +262 -0
- data/plugins/fff/spec/fff_mock_header_generator_spec.rb +9 -0
- data/plugins/fff/spec/fff_mock_source_generator_spec.rb +20 -0
- data/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/plugins/gcov/lib/console_reportinator.rb +28 -36
- data/plugins/gcov/lib/gcov.rb +9 -2
- data/plugins/gcov/lib/gcovr_reportinator.rb +8 -40
- data/plugins/gcov/lib/gcovr_thresholds.rb +74 -0
- data/plugins/gcov/lib/reportgenerator_reportinator.rb +3 -2
- data/plugins/module_generator/lib/module_generator.rb +3 -3
- data/plugins/report_tests_teamcity_stdout/lib/report_tests_teamcity_stdout.rb +53 -80
- data/plugins/sanitize/lib/sanitize_records.rb +3 -6
- data/plugins/valgrind/lib/valgrind.rb +14 -7
- data/site-local/404.html +2 -2
- data/site-local/assets/javascripts/{bundle.c21346df.min.js → bundle.a5f9d56c.min.js} +1 -1
- data/site-local/assets/javascripts/{bundle.c21346df.min.js.map → bundle.a5f9d56c.min.js.map} +2 -2
- data/site-local/configuration/environment-vars.html +2 -2
- data/site-local/configuration/global-collections.html +3 -3
- data/site-local/configuration/index.html +2 -2
- data/site-local/configuration/loading.html +2 -2
- data/site-local/configuration/mixins.html +2 -2
- data/site-local/configuration/parallel-builds.html +2 -2
- data/site-local/configuration/project-file.html +2 -2
- data/site-local/configuration/reference/cexception.html +2 -2
- data/site-local/configuration/reference/cmock.html +7 -3
- data/site-local/configuration/reference/defines.html +2 -2
- data/site-local/configuration/reference/environment.html +2 -2
- data/site-local/configuration/reference/extension.html +2 -2
- data/site-local/configuration/reference/files.html +65 -12
- data/site-local/configuration/reference/flags.html +2 -2
- data/site-local/configuration/reference/index.html +2 -2
- data/site-local/configuration/reference/libraries.html +23 -5
- data/site-local/configuration/reference/mixins.html +2 -2
- data/site-local/configuration/reference/partials.html +84 -2
- data/site-local/configuration/reference/paths.html +36 -8
- data/site-local/configuration/reference/plugins.html +2 -2
- data/site-local/configuration/reference/project.html +264 -12
- data/site-local/configuration/reference/release-build.html +4 -2
- data/site-local/configuration/reference/test-build.html +2 -2
- data/site-local/configuration/reference/test-runner.html +2 -2
- data/site-local/configuration/reference/tools.html +58 -4
- data/site-local/configuration/reference/unity.html +2 -2
- data/site-local/configuration/which-ceedling.html +379 -19
- data/site-local/development/index.html +2 -2
- data/site-local/development/plugins/configuration.html +2 -2
- data/site-local/development/plugins/index.html +2 -2
- data/site-local/development/plugins/plugin-subclass.html +5 -4
- data/site-local/development/plugins/rake-tasks.html +2 -2
- data/site-local/development/releases.html +7 -3
- data/site-local/development/workflow.html +50 -45
- data/site-local/getting-started/builds.html +4 -2
- data/site-local/getting-started/command-line.html +58 -6
- data/site-local/getting-started/example-projects/cipher-quest.html +2 -2
- data/site-local/getting-started/example-projects/index.html +2 -2
- data/site-local/getting-started/example-projects/temp-sensor.html +2 -2
- data/site-local/getting-started/example-projects/wondrous-forest.html +10 -2
- data/site-local/getting-started/index.html +2 -2
- data/site-local/getting-started/installation.html +2 -2
- data/site-local/getting-started/quick-start.html +2 -2
- data/site-local/help.html +2 -2
- data/site-local/index.html +2 -2
- data/site-local/overview/build-system.html +2 -2
- data/site-local/overview/index.html +2 -2
- data/site-local/overview/test-environments.html +2 -2
- data/site-local/overview/tools-and-frameworks.html +2 -2
- data/site-local/plugins/beep.html +2 -2
- data/site-local/plugins/bullseye/index.html +45 -38
- data/site-local/plugins/bullseye/licensing.html +2 -2
- data/site-local/plugins/command-hooks.html +4 -4
- data/site-local/plugins/compile-commands-json-db.html +2 -2
- data/site-local/plugins/cppcheck.html +2 -2
- data/site-local/plugins/dependencies.html +8 -5
- data/site-local/plugins/fff.html +58 -13
- data/site-local/plugins/gcov/examples.html +2 -2
- data/site-local/plugins/gcov/gcovr.html +23 -14
- data/site-local/plugins/gcov/index.html +2 -2
- data/site-local/plugins/gcov/overview.html +2 -2
- data/site-local/plugins/gcov/reportgenerator.html +18 -14
- data/site-local/plugins/gcov/reporting.html +2 -2
- data/site-local/plugins/gcov/setup.html +4 -3
- data/site-local/plugins/gcov/tool-versions.html +2 -2
- data/site-local/plugins/gcov/troubleshooting.html +2 -2
- data/site-local/plugins/index.html +2 -2
- data/site-local/plugins/module-generator.html +2 -2
- data/site-local/plugins/report-build-warnings-log.html +2 -2
- data/site-local/plugins/report-tests-gtestlike-stdout.html +2 -2
- data/site-local/plugins/report-tests-ide-stdout.html +2 -2
- data/site-local/plugins/report-tests-log-factory.html +2 -2
- data/site-local/plugins/report-tests-pretty-stdout.html +2 -2
- data/site-local/plugins/report-tests-raw-output-log.html +5 -3
- data/site-local/plugins/report-tests-teamcity-stdout.html +8 -5
- data/site-local/plugins/sanitize.html +9 -8
- data/site-local/plugins/valgrind.html +10 -9
- data/site-local/project/index.html +2 -2
- data/site-local/project/release-history.html +2 -2
- data/site-local/project/sbom.html +2 -2
- data/site-local/project/upgrade.html +5 -2
- data/site-local/reference/build-directives.html +2 -2
- data/site-local/reference/command-line.html +11 -4
- data/site-local/reference/environment-vars.html +2 -2
- data/site-local/reference/gcov-plugin.html +2 -2
- data/site-local/reference/global-collections.html +12 -12
- data/site-local/reference/index.html +2 -2
- data/site-local/reference/partials-macros.html +47 -2
- data/site-local/reference/project-configuration.html +2 -2
- data/site-local/sitemap.xml.gz +0 -0
- data/site-local/snapshot/examples/cipher_quest/index.html +2 -2
- data/site-local/snapshot/examples/temp_sensor/index.html +2 -2
- data/site-local/snapshot/examples/wondrous_forest/index.html +72 -15
- data/site-local/snapshot/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/site-local/snapshot/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/site-local/testing-guide/build-directives.html +2 -2
- data/site-local/testing-guide/conventions.html +113 -15
- data/site-local/testing-guide/frameworks.html +2 -2
- data/site-local/testing-guide/index.html +2 -2
- data/site-local/testing-guide/partials/configuration.html +31 -4
- data/site-local/testing-guide/partials/conventions.html +509 -8
- data/site-local/testing-guide/partials/directives.html +4 -3
- data/site-local/testing-guide/partials/example.html +2 -2
- data/site-local/testing-guide/partials/index.html +2 -2
- data/site-local/testing-guide/partials/overview.html +30 -12
- data/site-local/testing-guide/partials/variables.html +169 -4
- data/site-local/testing-guide/test-cases.html +2 -2
- data/site-local/testing-guide/test-sample.html +2 -2
- data/site-local/testing-guide/test-suite-anatomy.html +2 -2
- data/spec/integration/actionator_file_operations_spec.rb +91 -1
- data/spec/integration/build_step_doctor_spec.rb +270 -0
- data/spec/integration/c_extractor_composition_spec.rb +254 -4
- data/spec/integration/compile_commands_json_db_spec.rb +1 -1
- data/spec/integration/configurator_validation_spec.rb +1 -1
- data/spec/integration/dependencies/dependency_tracker_cache_hardening_spec.rb +26 -0
- data/spec/integration/dependencies/dependency_tracker_core_spec.rb +22 -0
- data/spec/integration/includes_extraction_spec.rb +27 -14
- data/spec/integration/launcher_handoff_spec.rb +297 -0
- data/spec/integration/mixin_loading_spec.rb +1 -1
- data/spec/integration/module_generator_spec.rb +3 -3
- data/spec/integration/nested_test_artifacts_spec.rb +99 -0
- data/spec/integration/partial_files_preprocessing_spec.rb +128 -0
- data/spec/integration/partials_carry_spec.rb +520 -0
- data/spec/integration/partials_declarations_spec.rb +655 -0
- data/spec/integration/partials_fallback_preprocessing_spec.rb +65 -0
- data/spec/integration/partials_function_pointers_spec.rb +277 -0
- data/spec/integration/partials_header_composition_spec.rb +268 -35
- data/spec/integration/partials_macro_decorators_spec.rb +267 -0
- data/spec/integration/partials_module_resolution_spec.rb +33 -23
- data/spec/integration/partials_symbol_linkage_spec.rb +13 -0
- data/spec/integration/path_intake_scenarios_spec.rb +101 -0
- data/spec/integration/path_length_reporting_spec.rb +64 -0
- data/spec/integration/path_scenarios_spec.rb +399 -0
- data/spec/integration/quote_include_isolator_spec.rb +57 -1
- data/spec/integration/report_build_warnings_log_spec.rb +1 -1
- data/spec/integration/report_tests_log_factory_spec.rb +1 -1
- data/spec/integration/test_build_parallel_barrier_spec.rb +1 -1
- data/spec/integration/test_executable_manifest_spec.rb +1 -1
- data/spec/integration/test_includes_extractinator_spec.rb +69 -3
- data/spec/integration/test_naming_spec.rb +201 -0
- data/spec/integration/test_source_file_checks_spec.rb +168 -0
- data/spec/integration/tool_executor_spec.rb +1 -1
- data/spec/integration/tool_validator_spec.rb +3 -3
- data/spec/integration/upgrade_docs_spec.rb +84 -0
- data/spec/integration/vendor_copy_transient_io_retry_spec.rb +74 -5
- data/spec/integration/win_long_paths_probe_spec.rb +46 -0
- data/spec/integration/win_path_limit_spec.rb +53 -0
- data/spec/integration/windows_registry_query_tool_spec.rb +41 -0
- data/spec/support/file_tree_helper.rb +88 -0
- data/spec/support/integration/configurator_integration_helper.rb +14 -9
- data/spec/support/integration/dependency_tracker_integration_helper.rb +1 -1
- data/spec/support/integration/partial_files_harness.rb +181 -0
- data/spec/support/integration/partials_generation_integration_helper.rb +239 -143
- data/spec/support/integration/path_scenario_harness.rb +175 -0
- data/spec/support/integration/spec_integration_helper.rb +9 -4
- data/spec/support/integration/test_includes_harness.rb +69 -37
- data/spec/support/integration/tool_executor_integration_helper.rb +14 -2
- data/spec/support/spec_helper.rb +2 -0
- data/spec/support/system/spec_system_helper.rb +7 -6
- data/spec/support/system/system_context.rb +21 -3
- data/spec/support/working_dir_tracking.rb +49 -0
- data/spec/system/build_output_mirroring_spec.rb +2 -2
- data/spec/system/bullseye_deployment_spec.rb +2 -0
- data/spec/system/conditional_mock_includes_spec.rb +1 -1
- data/spec/system/delta_builds_spec.rb +163 -23
- data/spec/system/encoding_stress_spec.rb +4 -4
- data/spec/system/example_wondrous_forest_spec.rb +2 -2
- data/spec/system/gcov_deployment_spec.rb +3 -0
- data/spec/system/header_include_path_validation_spec.rb +4 -4
- data/spec/system/header_search_paths_spec.rb +1083 -0
- data/spec/system/launcher_handoff_spec.rb +82 -0
- data/spec/system/mock_include_folders_spec.rb +212 -0
- data/spec/system/mockable_header_reassembly_spec.rb +184 -0
- data/spec/system/parent_directory_reference_spec.rb +5 -3
- data/spec/system/partials_carry_spec.rb +581 -0
- data/spec/system/partials_delta_builds_spec.rb +280 -0
- data/spec/system/partials_function_pointers_spec.rb +106 -0
- data/spec/system/partials_macro_decorators_spec.rb +127 -0
- data/spec/system/partials_module_disambiguation_spec.rb +125 -0
- data/spec/system/path_handling_probes_spec.rb +196 -0
- data/spec/system/pinned_thread_count_spec.rb +4 -4
- data/spec/system/preprocessing_fallback_conditionals_spec.rb +1 -1
- data/spec/system/preprocessing_parameterized_tests_spec.rb +1 -1
- data/spec/system/rake_release_task_path_disambiguation_spec.rb +6 -6
- data/spec/system/rake_test_task_path_disambiguation_spec.rb +85 -0
- data/spec/system/short_build_paths_spec.rb +87 -0
- data/spec/system/sibling_header_collision_spec.rb +30 -6
- data/spec/system/special_path_characters_spec.rb +86 -0
- data/spec/system/support/bullseye_common_test_cases.rb +42 -0
- data/spec/system/support/common_test_cases.rb +23 -21
- data/spec/system/support/gcov_common_test_cases.rb +37 -9
- data/spec/system/support/gcov_partials_test_cases.rb +48 -0
- data/spec/system/support/sanitize_common_test_cases.rb +2 -2
- data/spec/system/support/valgrind_common_test_cases.rb +12 -12
- data/spec/system/test_build_layout_spec.rb +209 -0
- data/spec/system/test_pipeline_stop_points_spec.rb +4 -4
- data/spec/system/test_runner_system_include_spec.rb +1 -1
- data/spec/system/test_source_file_directive_spec.rb +64 -5
- data/spec/units/bin/actionator_spec.rb +14 -17
- data/spec/units/bin/app_cfg_spec.rb +37 -0
- data/spec/units/bin/cli_handler_spec.rb +282 -6
- data/spec/units/bin/cli_helper_spec.rb +116 -45
- data/spec/units/bin/installation_selector_spec.rb +114 -0
- data/spec/units/bin/launchinator_spec.rb +171 -0
- data/spec/units/bin/path_validator_spec.rb +10 -0
- data/spec/units/bin/versionator_spec.rb +38 -6
- data/spec/units/build_log_writer_spec.rb +57 -0
- data/spec/units/c_extractor/c_extractor_code_text_spec.rb +67 -10
- data/spec/units/c_extractor/c_extractor_declarations_spec.rb +501 -4
- data/spec/units/c_extractor/c_extractor_declarator_spec.rb +245 -0
- data/spec/units/c_extractor/c_extractor_defined_type_spec.rb +45 -0
- data/spec/units/c_extractor/c_extractor_definitions_spec.rb +163 -3
- data/spec/units/c_extractor/c_extractor_functions_spec.rb +462 -21
- data/spec/units/c_extractor/c_extractor_preprocessing_spec.rb +39 -0
- data/spec/units/c_extractor/c_extractor_spec.rb +4 -4
- data/spec/units/c_extractor/c_extractor_types_spec.rb +163 -0
- data/spec/units/c_identifier_spec.rb +35 -0
- data/spec/units/config/build_root_policy_spec.rb +61 -0
- data/spec/units/config/configurator_builder_spec.rb +61 -6
- data/spec/units/config/configurator_paths_validator_spec.rb +292 -0
- data/spec/units/config/configurator_setup_spec.rb +80 -68
- data/spec/units/config/configurator_spec.rb +54 -6
- data/spec/units/config/configurator_validator_spec.rb +1 -172
- data/spec/units/dependencies/dependency_cache_store_spec.rb +98 -2
- data/spec/units/dependencies/dependency_debug_tree_spec.rb +1 -1
- data/spec/units/dependencies/dependency_hasher_spec.rb +42 -1
- data/spec/units/dependencies/dependency_path_normalizer_spec.rb +1 -1
- data/spec/units/dependencies/dependency_tracker_spec.rb +28 -1
- data/spec/units/dependencies/dependinator_spec.rb +17 -2
- data/spec/units/diagnostics/build_step_doctor_spec.rb +170 -0
- data/spec/units/diagnostics/duplicate_symbol_specialist_spec.rb +117 -0
- data/spec/units/diagnostics/header_collision_specialist_spec.rb +267 -0
- data/spec/units/diagnostics/include_depth_specialist_spec.rb +137 -0
- data/spec/units/diagnostics/missing_symbol_specialist_spec.rb +154 -0
- data/spec/units/diagnostics/partial_name_specialist_spec.rb +129 -0
- data/spec/units/diagnostics/toolchain_output_spec.rb +86 -0
- data/spec/units/encodinator_spec.rb +3 -4
- data/spec/units/filename_extension_spec.rb +11 -0
- data/spec/units/filesystem/build_roots_spec.rb +131 -0
- data/spec/units/filesystem/build_subpath_spec.rb +235 -0
- data/spec/units/filesystem/destination_collision_spec.rb +30 -0
- data/spec/units/{file_finder_helper_spec.rb → filesystem/file_finder_helper_spec.rb} +126 -1
- data/spec/units/filesystem/file_finder_spec.rb +845 -0
- data/spec/units/{file_path_collection_utils_spec.rb → filesystem/file_path_collection_utils_spec.rb} +181 -1
- data/spec/units/{file_path_utils_spec.rb → filesystem/file_path_utils_spec.rb} +435 -185
- data/spec/units/filesystem/file_system_wrapper_spec.rb +33 -0
- data/spec/units/filesystem/file_tree_spec.rb +511 -0
- data/spec/units/filesystem/file_tree_windows_spec.rb +78 -0
- data/spec/units/{file_wrapper_spec.rb → filesystem/file_wrapper_spec.rb} +286 -18
- data/spec/units/{path_matcher_spec.rb → filesystem/path_matcher_spec.rb} +48 -1
- data/spec/units/{path_mirror_spec.rb → filesystem/path_mirror_spec.rb} +32 -4
- data/spec/units/filesystem/project_paths_spec.rb +147 -0
- data/spec/units/filesystem/test_build_layout_spec.rb +216 -0
- data/spec/units/filesystem/win_long_paths_spec.rb +204 -0
- data/spec/units/filesystem/win_path_prober_spec.rb +158 -0
- data/spec/units/filesystem/working_dir_spec.rb +71 -0
- data/spec/units/generators/generator_helper_spec.rb +0 -60
- data/spec/units/generators/generator_mocks_spec.rb +13 -0
- data/spec/units/generators/generator_partials_spec.rb +656 -55
- data/spec/units/generators/generator_spec.rb +38 -6
- data/spec/units/generators/generator_test_results_backtrace_spec.rb +50 -46
- data/spec/units/generators/generator_test_results_spec.rb +1 -1
- data/spec/units/generators/generator_test_runner_spec.rb +9 -5
- data/spec/units/generators/partial_source_writer_spec.rb +129 -0
- data/spec/units/handoff_spec.rb +205 -0
- data/spec/units/includes/header_search_spec.rb +406 -0
- data/spec/units/includes/include_factory_spec.rb +23 -6
- data/spec/units/includes/include_pathinator_spec.rb +118 -8
- data/spec/units/includes/include_spec.rb +14 -0
- data/spec/units/includes/includes_spec.rb +176 -19
- data/spec/units/installation_spec.rb +228 -0
- data/spec/units/library_resolver_spec.rb +157 -0
- data/spec/units/loginator_spec.rb +31 -0
- data/spec/units/mock_locator_spec.rb +275 -6
- data/spec/units/partials/include_groups_spec.rb +42 -0
- data/spec/units/partials/partializer_config_spec.rb +32 -0
- data/spec/units/partials/partializer_helper_carry_spec.rb +661 -0
- data/spec/units/partials/partializer_helper_interface_extras_spec.rb +396 -0
- data/spec/units/partials/partializer_helper_spec.rb +529 -277
- data/spec/units/partials/partializer_reconciler_spec.rb +661 -0
- data/spec/units/partials/partializer_spec.rb +1579 -270
- data/spec/units/partials/partializer_utils_spec.rb +269 -232
- data/spec/units/partials/partials_rename_spec.rb +160 -0
- data/spec/units/partials_manager_spec.rb +561 -251
- data/spec/units/plugins/bullseye_spec.rb +49 -2
- data/spec/units/plugins/console_reportinator_spec.rb +73 -26
- data/spec/units/plugins/dependencies_spec.rb +33 -7
- data/spec/units/plugins/dependency_spec_spec.rb +17 -0
- data/spec/units/plugins/gcov_spec.rb +28 -3
- data/spec/units/plugins/gcovr_reportinator_spec.rb +19 -47
- data/spec/units/plugins/gcovr_thresholds_spec.rb +95 -0
- data/spec/units/plugins/module_generator_spec.rb +5 -5
- data/spec/units/plugins/report_build_warnings_log_spec.rb +3 -3
- data/spec/units/plugins/report_log_writer_plugin_spec.rb +10 -1
- data/spec/units/plugins/report_tests_raw_output_log_spec.rb +13 -2
- data/spec/units/plugins/report_tests_teamcity_stdout_spec.rb +77 -3
- data/spec/units/plugins/reportgenerator_reportinator_spec.rb +52 -4
- data/spec/units/plugins/sanitize_records_spec.rb +3 -1
- data/spec/units/plugins/sanitize_spec.rb +1 -1
- data/spec/units/plugins/valgrind_spec.rb +23 -8
- data/spec/units/preprocess/preprocessinator_code_finder_spec.rb +73 -10
- data/spec/units/preprocess/preprocessinator_comment_stripper_spec.rb +1 -1
- data/spec/units/preprocess/preprocessinator_file_assembler_spec.rb +125 -37
- data/spec/units/preprocess/preprocessinator_includes_handler_spec.rb +15 -0
- data/spec/units/preprocess/preprocessinator_reconstructor_spec.rb +197 -0
- data/spec/units/preprocess/preprocessinator_spec.rb +153 -95
- data/spec/units/rake_app/rakefile_component_resolver_spec.rb +21 -0
- data/spec/units/release_build_executor_spec.rb +53 -14
- data/spec/units/release_build_planner_spec.rb +15 -3
- data/spec/units/reportinator_spec.rb +5 -5
- data/spec/units/setupinator_spec.rb +51 -0
- data/spec/units/standin_headerinator_spec.rb +55 -9
- data/spec/units/test_build_executor_spec.rb +842 -166
- data/spec/units/test_build_planner_spec.rb +205 -15
- data/spec/units/test_build_setup_spec.rb +179 -30
- data/spec/units/test_context_extractor_spec.rb +36 -2
- data/spec/units/test_derived_search_paths_spec.rb +259 -0
- data/spec/units/test_file_preprocessinator_spec.rb +17 -1
- data/spec/units/test_includes_extractinator_spec.rb +61 -9
- data/spec/units/test_invoker/objects_wiring_spec.rb +24 -4
- data/spec/units/test_invoker/partial_files_preprocessinator_spec.rb +264 -0
- data/spec/units/test_invoker/test_substitutions_spec.rb +122 -0
- data/spec/units/test_invoker_spec.rb +14 -1
- data/spec/units/test_invoker_types_spec.rb +8 -7
- data/spec/units/test_pipeline_manager_spec.rb +54 -13
- data/spec/units/test_runner_generatinator_spec.rb +93 -1
- data/spec/units/test_search_paths_spec.rb +73 -5
- data/spec/units/test_source_file_directive_resolver_spec.rb +38 -7
- data/spec/units/tools/default_tools_quoting_spec.rb +117 -0
- data/spec/units/tools/shell_quoting_spec.rb +76 -0
- data/spec/units/{tool_executor_helper_spec.rb → tools/tool_executor_helper_spec.rb} +1 -1
- data/spec/units/{tool_executor_spec.rb → tools/tool_executor_spec.rb} +27 -1
- data/spec/units/{tool_validator_spec.rb → tools/tool_validator_spec.rb} +110 -1
- data/spec/units/windows_registry_query_tool_spec.rb +53 -0
- data/spec/units/yaml_wrapper_spec.rb +11 -0
- metadata +265 -36
- data/lib/ceedling/file_finder_helper.rb +0 -127
- data/lib/ceedling/file_path_collection_utils.rb +0 -164
- data/spec/units/file_finder_spec.rb +0 -495
- /data/lib/ceedling/{tool_executor_helper.rb → tools/tool_executor_helper.rb} +0 -0
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
8
|
require 'rake' # for ext() method
|
|
9
|
-
require 'ceedling/file_wrapper'
|
|
9
|
+
require 'ceedling/filesystem/file_wrapper'
|
|
10
10
|
require 'ceedling/encodinator'
|
|
11
11
|
require 'ceedling/preprocess/c_preprocessor_conditionals'
|
|
12
12
|
|
|
@@ -20,7 +20,8 @@ class PreprocessinatorFileAssembler
|
|
|
20
20
|
:file_wrapper,
|
|
21
21
|
:parsing_parcels,
|
|
22
22
|
:loginator,
|
|
23
|
-
:reportinator
|
|
23
|
+
:reportinator,
|
|
24
|
+
:build_step_doctor
|
|
24
25
|
)
|
|
25
26
|
|
|
26
27
|
def collect_mockable_header_file_contents(
|
|
@@ -33,35 +34,18 @@ class PreprocessinatorFileAssembler
|
|
|
33
34
|
include_paths:,
|
|
34
35
|
extras:
|
|
35
36
|
)
|
|
36
|
-
contents = []
|
|
37
|
-
|
|
38
37
|
preprocessed_filepath = @file_path_utils.form_preprocessed_file_full_expansion_filepath( filepath, test )
|
|
39
38
|
|
|
40
39
|
@file_wrapper.mkdir( File.dirname( preprocessed_filepath ) )
|
|
41
40
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
# Additional arguments
|
|
46
|
-
flags,
|
|
47
|
-
# Argument replacement
|
|
48
|
-
filepath,
|
|
49
|
-
preprocessed_filepath,
|
|
50
|
-
defines,
|
|
51
|
-
include_paths
|
|
52
|
-
)
|
|
53
|
-
@tool_executor.exec( command )
|
|
54
|
-
|
|
55
|
-
# `preprocessed_filepath` is this same build's own gcc output -- open_with_retry
|
|
56
|
-
# rides out the file briefly not yet being visible right after the shell-out exits.
|
|
57
|
-
@file_wrapper.open_with_retry( preprocessed_filepath, 'r' ) do |file|
|
|
58
|
-
contents = @preprocessinator_reconstructor.extract_file_as_array_from_expansion( file, filepath )
|
|
59
|
-
end
|
|
41
|
+
expand_fully( filepath: filepath, preprocessed_filepath: preprocessed_filepath, flags: flags, defines: defines, include_paths: include_paths )
|
|
42
|
+
|
|
43
|
+
contents = collect_own_lines( source_filepath: filepath, preprocessed_filepath: preprocessed_filepath )
|
|
60
44
|
|
|
61
45
|
# Bail out if no extras are required
|
|
62
46
|
return contents, [], nil if !extras
|
|
63
47
|
|
|
64
|
-
# Try to find an #include guard
|
|
48
|
+
# Try to find an #include guard near the top of the file's code. This name is used two ways:
|
|
65
49
|
# 1. To exclude the guard's own #define from the macro definitions preserved as "extras" below
|
|
66
50
|
# (it would be redundant -- assemble_preprocessed_header_file writes its own guard).
|
|
67
51
|
# 2. Returned to the caller so the reconstructed header can reuse this exact guard name (see
|
|
@@ -73,12 +57,7 @@ class PreprocessinatorFileAssembler
|
|
|
73
57
|
# If no guard is found (e.g. the header uses `#pragma once` or has none), `nil` flows through and
|
|
74
58
|
# assemble_preprocessed_header_file falls back to a synthetic guard, matching prior behavior.
|
|
75
59
|
include_guard =
|
|
76
|
-
@preprocessinator_reconstructor.extract_include_guard(
|
|
77
|
-
@file_wrapper.read(
|
|
78
|
-
filepath,
|
|
79
|
-
2048
|
|
80
|
-
).clean_encoding
|
|
81
|
-
)
|
|
60
|
+
@preprocessinator_reconstructor.extract_include_guard( @file_wrapper.read( filepath ).clean_encoding )
|
|
82
61
|
|
|
83
62
|
if fallback
|
|
84
63
|
msg = @reportinator.generate_module_progress(
|
|
@@ -104,18 +83,17 @@ class PreprocessinatorFileAssembler
|
|
|
104
83
|
end
|
|
105
84
|
|
|
106
85
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
86
|
+
# The lines a preprocessor run kept from `source_filepath`, one per element. A full
|
|
87
|
+
# expansion can wrap one source line across several, which `rejoin` joins back.
|
|
88
|
+
# Directives-only output never wraps, so its readers pass `rejoin: false`. Rejoining
|
|
89
|
+
# there would only merge distinct lines a marker puts at the same count.
|
|
90
|
+
#
|
|
91
|
+
# `preprocessed_filepath` is this same build's own preprocessor output. open_with_retry
|
|
92
|
+
# rides out the file briefly not yet being visible right after the shell-out exits.
|
|
93
|
+
def collect_own_lines(source_filepath:, preprocessed_filepath:, rejoin: true)
|
|
114
94
|
@file_wrapper.open_with_retry( preprocessed_filepath, 'r' ) do |file|
|
|
115
|
-
|
|
95
|
+
return @preprocessinator_reconstructor.extract_file_as_array_from_expansion( file, source_filepath, rejoin: rejoin )
|
|
116
96
|
end
|
|
117
|
-
|
|
118
|
-
return contents
|
|
119
97
|
end
|
|
120
98
|
|
|
121
99
|
# Extract macro definitions and pragmas from a file using text scanning (fallback mode).
|
|
@@ -124,7 +102,7 @@ class PreprocessinatorFileAssembler
|
|
|
124
102
|
# Mirrors the fallback branch of collect_mockable_header_file_contents.
|
|
125
103
|
def collect_macros_and_pragmas_fallback(source_filepath:, defines: [])
|
|
126
104
|
include_guard = @preprocessinator_reconstructor.extract_include_guard(
|
|
127
|
-
@file_wrapper.read( source_filepath
|
|
105
|
+
@file_wrapper.read( source_filepath ).clean_encoding
|
|
128
106
|
)
|
|
129
107
|
|
|
130
108
|
_contents = _active_content_for( fallback: true, filepath: source_filepath, defines: defines )
|
|
@@ -176,21 +154,6 @@ class PreprocessinatorFileAssembler
|
|
|
176
154
|
end
|
|
177
155
|
|
|
178
156
|
|
|
179
|
-
def collect_file_contents_from_full_expansion(source_filepath:, test:)
|
|
180
|
-
contents = []
|
|
181
|
-
|
|
182
|
-
full_expansion_filepath = @file_path_utils.form_preprocessed_file_full_expansion_filepath( source_filepath, test )
|
|
183
|
-
|
|
184
|
-
# `full_expansion_filepath` is this same build's own gcc output -- open_with_retry
|
|
185
|
-
# rides out the file briefly not yet being visible right after the shell-out exits.
|
|
186
|
-
@file_wrapper.open_with_retry( full_expansion_filepath, 'r' ) do |file|
|
|
187
|
-
contents = @preprocessinator_reconstructor.extract_file_as_array_from_expansion( file, source_filepath )
|
|
188
|
-
end
|
|
189
|
-
|
|
190
|
-
return contents
|
|
191
|
-
end
|
|
192
|
-
|
|
193
|
-
|
|
194
157
|
# `filepath` is the header's own path below its configured root, and its only use is the
|
|
195
158
|
# synthetic guard below. A bare basename there would give two headers sharing one name
|
|
196
159
|
# the same guard.
|
|
@@ -252,30 +215,13 @@ class PreprocessinatorFileAssembler
|
|
|
252
215
|
defines:,
|
|
253
216
|
include_paths:
|
|
254
217
|
)
|
|
255
|
-
contents = []
|
|
256
|
-
|
|
257
218
|
preprocessed_filepath = @file_path_utils.form_preprocessed_file_full_expansion_filepath( filepath, test )
|
|
258
219
|
|
|
259
220
|
@file_wrapper.mkdir( File.dirname( preprocessed_filepath ) )
|
|
260
221
|
|
|
261
|
-
|
|
262
|
-
command = @tool_executor.build_command_line(
|
|
263
|
-
@configurator.tools_test_file_full_preprocessor,
|
|
264
|
-
# Additional arguments
|
|
265
|
-
flags,
|
|
266
|
-
# Argument replacement
|
|
267
|
-
filepath,
|
|
268
|
-
preprocessed_filepath,
|
|
269
|
-
defines,
|
|
270
|
-
include_paths
|
|
271
|
-
)
|
|
272
|
-
@tool_executor.exec( command )
|
|
222
|
+
expand_fully( filepath: filepath, preprocessed_filepath: preprocessed_filepath, flags: flags, defines: defines, include_paths: include_paths )
|
|
273
223
|
|
|
274
|
-
|
|
275
|
-
# rides out the file briefly not yet being visible right after the shell-out exits.
|
|
276
|
-
@file_wrapper.open_with_retry( preprocessed_filepath, 'r' ) do |file|
|
|
277
|
-
contents = @preprocessinator_reconstructor.extract_file_as_array_from_expansion( file, filepath )
|
|
278
|
-
end
|
|
224
|
+
contents = collect_own_lines( source_filepath: filepath, preprocessed_filepath: preprocessed_filepath )
|
|
279
225
|
|
|
280
226
|
if fallback
|
|
281
227
|
msg = @reportinator.generate_module_progress(
|
|
@@ -318,6 +264,16 @@ class PreprocessinatorFileAssembler
|
|
|
318
264
|
|
|
319
265
|
private
|
|
320
266
|
|
|
267
|
+
# Runs GCC with full preprocessor expansion. This run has no fallback, so a failure goes
|
|
268
|
+
# to the build step doctor before it is raised.
|
|
269
|
+
def expand_fully(filepath:, preprocessed_filepath:, flags:, defines:, include_paths:)
|
|
270
|
+
tool = @configurator.tools_test_file_full_preprocessor
|
|
271
|
+
command = @tool_executor.build_command_line( tool, flags, filepath, preprocessed_filepath, defines, include_paths )
|
|
272
|
+
inputs = { tool: tool, source: filepath, search_paths: include_paths, flags: flags, defines: defines }
|
|
273
|
+
|
|
274
|
+
@build_step_doctor.attend( step: :preprocess, inputs: inputs ) { @tool_executor.exec( command ) }
|
|
275
|
+
end
|
|
276
|
+
|
|
321
277
|
# Returns the content string used to extract pragmas, macro definitions, and
|
|
322
278
|
# test directives -- either by binary-mode-reading and conditional-filtering
|
|
323
279
|
# the original file (fallback mode) or by reading the already directives-only
|
|
@@ -342,7 +298,7 @@ class PreprocessinatorFileAssembler
|
|
|
342
298
|
# rides out the file briefly not yet being visible right after the shell-out exits.
|
|
343
299
|
@file_wrapper.open_with_retry( directives_only_filepath, 'r' ) do |file|
|
|
344
300
|
# TODO: Modify to process line-at-a-time for memory savings & performance boost
|
|
345
|
-
@preprocessinator_reconstructor.extract_file_as_string_from_expansion( file, filepath )
|
|
301
|
+
@preprocessinator_reconstructor.extract_file_as_string_from_expansion( file, filepath, rejoin: false )
|
|
346
302
|
end
|
|
347
303
|
end
|
|
348
304
|
end
|
|
@@ -364,7 +320,7 @@ class PreprocessinatorFileAssembler
|
|
|
364
320
|
|
|
365
321
|
public
|
|
366
322
|
|
|
367
|
-
def assemble_preprocessed_code_file(
|
|
323
|
+
def assemble_preprocessed_code_file(preprocessed_filepath:, contents:, extras:, includes:)
|
|
368
324
|
# Write contents of final preprocessed file a line at a time
|
|
369
325
|
# ----------------------------------------------------------
|
|
370
326
|
# Binary mode: `contents` lines below come from an upstream preprocessed
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
8
|
require 'ceedling/includes/includes'
|
|
9
|
-
require 'ceedling/path_matcher'
|
|
9
|
+
require 'ceedling/filesystem/path_matcher'
|
|
10
10
|
require 'ceedling/preprocess/preprocessinator_bare_includes_extractor'
|
|
11
11
|
require 'ceedling/preprocess/preprocessinator_line_marker_includes_extractor'
|
|
12
12
|
require 'ceedling/preprocess/c_preprocessor_conditionals'
|
|
@@ -12,6 +12,11 @@ require 'ceedling/exceptions'
|
|
|
12
12
|
|
|
13
13
|
class PreprocessinatorReconstructor
|
|
14
14
|
|
|
15
|
+
# How much of a header's code, comments and blank lines left out, is searched for its include
|
|
16
|
+
# guard. The guard pair opens a header by construction. A limit keeps a `#ifndef X` / `#define X`
|
|
17
|
+
# default deep in a `#pragma once` header from passing for one.
|
|
18
|
+
INCLUDE_GUARD_SCAN_BYTES = 2048
|
|
19
|
+
|
|
15
20
|
constructor :parsing_parcels, :file_wrapper
|
|
16
21
|
|
|
17
22
|
##
|
|
@@ -26,8 +31,11 @@ class PreprocessinatorReconstructor
|
|
|
26
31
|
## ignoring text based on preprocessor statements referencing the file we're
|
|
27
32
|
## seeking to reassemble.
|
|
28
33
|
##
|
|
29
|
-
## Note that the same text handling approach applies to full preprocessor
|
|
30
|
-
## expansion as directives only expansion.
|
|
34
|
+
## Note that the same text handling approach applies to full preprocessor
|
|
35
|
+
## expansion as directives only expansion, with one difference. Full expansion
|
|
36
|
+
## can wrap one source line's expansion across several physical lines, which
|
|
37
|
+
## `rejoin` puts back together. Directives-only output expands no macros and
|
|
38
|
+
## never wraps a line, so its readers pass `rejoin: false`.
|
|
31
39
|
##
|
|
32
40
|
## Example preprocessed expansion output
|
|
33
41
|
## --------------------------------------
|
|
@@ -80,31 +88,31 @@ class PreprocessinatorReconstructor
|
|
|
80
88
|
## }
|
|
81
89
|
|
|
82
90
|
# `input` must have the interface of IO -- StringIO for testing or File in typical use
|
|
83
|
-
def extract_file_as_array_from_expansion(input, filepath)
|
|
91
|
+
def extract_file_as_array_from_expansion(input, filepath, rejoin: true)
|
|
84
92
|
lines = []
|
|
85
|
-
_scan_expansion_for_file(input, filepath) { |line| lines << line }
|
|
93
|
+
_scan_expansion_for_file(input, filepath, rejoin: rejoin) { |line| lines << line }
|
|
86
94
|
return lines
|
|
87
95
|
end
|
|
88
96
|
|
|
89
97
|
|
|
90
98
|
# Simple variation of preceding that returns file contents as single string
|
|
91
|
-
def extract_file_as_string_from_expansion(input, filepath)
|
|
92
|
-
return extract_file_as_array_from_expansion(input, filepath).join( "\n" )
|
|
99
|
+
def extract_file_as_string_from_expansion(input, filepath, rejoin: true)
|
|
100
|
+
return extract_file_as_array_from_expansion(input, filepath, rejoin: rejoin).join( "\n" )
|
|
93
101
|
end
|
|
94
102
|
|
|
95
103
|
|
|
96
104
|
# Writes only C code from `input` preprocessor expansion belonging to `filepath`
|
|
97
105
|
# to `output` IO object incrementally (one logical line at a time) without building
|
|
98
106
|
# an intermediate array. `output` must respond to `puts` (e.g. File or StringIO).
|
|
99
|
-
def compact_from_expansion(input:, filepath:, output:)
|
|
100
|
-
_scan_expansion_for_file(input, filepath) { |line| output.puts(line) }
|
|
107
|
+
def compact_from_expansion(input:, filepath:, output:, rejoin: true)
|
|
108
|
+
_scan_expansion_for_file(input, filepath, rejoin: rejoin) { |line| output.puts(line) }
|
|
101
109
|
end
|
|
102
110
|
|
|
103
111
|
|
|
104
112
|
# File-based convenience wrapper around `compact_from_expansion`.
|
|
105
113
|
# Opens `input_filepath` for reading and `output_filepath` for writing,
|
|
106
114
|
# then delegates to `compact_from_expansion` with the resulting IO objects.
|
|
107
|
-
def compact_file_from_expansion(input_filepath:, source_filepath:, output_filepath:)
|
|
115
|
+
def compact_file_from_expansion(input_filepath:, source_filepath:, output_filepath:, rejoin: true)
|
|
108
116
|
# Binary mode on both ends: GCC output under non-C locale contains non-ASCII
|
|
109
117
|
# bytes (localized markers; the whole-buffer clean_encoding in
|
|
110
118
|
# _scan_expansion_for_file handles content), and the compacted output is
|
|
@@ -120,7 +128,7 @@ class PreprocessinatorReconstructor
|
|
|
120
128
|
begin
|
|
121
129
|
@file_wrapper.open_with_retry( input_filepath, 'rb' ) do |input|
|
|
122
130
|
@file_wrapper.open( output_filepath, 'wb' ) do |output|
|
|
123
|
-
compact_from_expansion( input: input, filepath: source_filepath, output: output )
|
|
131
|
+
compact_from_expansion( input: input, filepath: source_filepath, output: output, rejoin: rejoin )
|
|
124
132
|
end
|
|
125
133
|
end
|
|
126
134
|
rescue => e
|
|
@@ -224,11 +232,18 @@ class PreprocessinatorReconstructor
|
|
|
224
232
|
end
|
|
225
233
|
|
|
226
234
|
|
|
227
|
-
#
|
|
235
|
+
# Whether a header guards itself with `#pragma once`, looked for in the same leading code as
|
|
236
|
+
# an include guard
|
|
237
|
+
def pragma_once?(file_contents)
|
|
238
|
+
return leading_code( file_contents, INCLUDE_GUARD_SCAN_BYTES ).match?( /^\s*#\s*pragma\s+once\b/ )
|
|
239
|
+
end
|
|
240
|
+
|
|
241
|
+
# Find include guard in a whole file's contents as string. Only code counts toward the scan
|
|
242
|
+
# window, so a long license comment ahead of the guard doesn't hide it.
|
|
228
243
|
def extract_include_guard(file_contents)
|
|
229
244
|
# Look for first occurrence of #ifndef <sring> followed by #define <string>
|
|
230
245
|
regex = /#\s*ifndef\s+(\w+)(?:\s*\n)+\s*#\s*define\s+(\w+)/
|
|
231
|
-
matches = file_contents.match( regex )
|
|
246
|
+
matches = leading_code( file_contents, INCLUDE_GUARD_SCAN_BYTES ).match( regex )
|
|
232
247
|
|
|
233
248
|
# Return if no match results
|
|
234
249
|
return nil if matches.nil?
|
|
@@ -286,8 +301,14 @@ class PreprocessinatorReconstructor
|
|
|
286
301
|
## Yields one complete logical line at a time to the given block.
|
|
287
302
|
## A single `pending_line` buffer is held to allow aggregation of preprocessor-wrapped
|
|
288
303
|
## expansions (multiple physical lines at the same logical line number) before yielding.
|
|
304
|
+
## `rejoin: false` turns that aggregation off.
|
|
289
305
|
##
|
|
290
|
-
|
|
306
|
+
## A directive is never joined to a neighbor. The preprocessor writes each directive it
|
|
307
|
+
## keeps on a line of its own, such as a mid-line _Pragma() between two markers for the
|
|
308
|
+
## same source line. A marker that names a line already counted would otherwise glue a
|
|
309
|
+
## declaration onto an empty #define before it.
|
|
310
|
+
##
|
|
311
|
+
def _scan_expansion_for_file(input, filepath, rejoin: true, &block)
|
|
291
312
|
# Expand filepath under inspection to ensure proper match
|
|
292
313
|
extraction_filepath = File.expand_path( filepath )
|
|
293
314
|
# Preprocessor directive blocks generally take the form of '# <digits> <text> [optional digits]'.
|
|
@@ -300,6 +321,8 @@ class PreprocessinatorReconstructor
|
|
|
300
321
|
directive = /^\s*# \d+ \"/
|
|
301
322
|
# Line markers have the specific form of '# <digits> "path/filename.ext" [optional digits]' (see above)
|
|
302
323
|
line_marker = /^\s*#\s(\d+)\s\"(.+)\"/
|
|
324
|
+
# Any other directive the preprocessor kept, such as #define or #pragma
|
|
325
|
+
kept_directive = /\A\s*#/
|
|
303
326
|
# Boolean to ping pong between line-by-line extract/ignore
|
|
304
327
|
extract = false
|
|
305
328
|
|
|
@@ -356,7 +379,8 @@ class PreprocessinatorReconstructor
|
|
|
356
379
|
end
|
|
357
380
|
|
|
358
381
|
# If the linemarker line number hasn't advanced, aggregate the expanded line into pending
|
|
359
|
-
if (last_line_num == line_num) and !pending_line.nil?
|
|
382
|
+
if rejoin and (last_line_num == line_num) and !pending_line.nil? and
|
|
383
|
+
!pending_line.match?( kept_directive ) and !_line.match?( kept_directive )
|
|
360
384
|
# Append the stripped line to the pending line
|
|
361
385
|
# Include a space in the concatenation unless it's a semicolon or pending_line is blank
|
|
362
386
|
pending_line = (_line == ';' or pending_line.empty?) ? (pending_line + _line) : (pending_line + ' ' + _line)
|
|
@@ -388,6 +412,19 @@ class PreprocessinatorReconstructor
|
|
|
388
412
|
end
|
|
389
413
|
|
|
390
414
|
|
|
415
|
+
# The first `bytes` of a file's code, comments and blank lines left out
|
|
416
|
+
def leading_code(file_contents, bytes)
|
|
417
|
+
code = +''
|
|
418
|
+
@parsing_parcels.code_lines( file_contents ) do |line|
|
|
419
|
+
next if line.strip.empty?
|
|
420
|
+
code << line.rstrip << "\n"
|
|
421
|
+
break if code.bytesize >= bytes
|
|
422
|
+
end
|
|
423
|
+
|
|
424
|
+
return code.byteslice( 0, bytes ).scrub
|
|
425
|
+
end
|
|
426
|
+
|
|
427
|
+
|
|
391
428
|
def extract_multiline_directives(file_contents, directive)
|
|
392
429
|
results = []
|
|
393
430
|
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
8
|
require 'ceedling/constants'
|
|
9
|
+
require 'ceedling/filesystem/project_paths'
|
|
9
10
|
|
|
10
11
|
# Resolves the ordered list of .rake files Ceedling will load for a given project
|
|
11
12
|
# configuration. Callable from both bin/ (early, before do_setup) and lib/ (within
|
|
@@ -39,8 +40,11 @@ module RakefileComponentResolver
|
|
|
39
40
|
# plugins path last. This ordering lets user plugins shadow built-in plugins of the
|
|
40
41
|
# same name. Used by both resolve() (bin/ CLI scope) and Configurator#prepare_plugins_load_paths
|
|
41
42
|
# (application scope) so both scopes search plugins in the same priority order.
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
#
|
|
44
|
+
# `expand` applies inline Ruby string expansion to each configured path, and each is then
|
|
45
|
+
# standardized as every other configured path is, so both scopes read them alike.
|
|
46
|
+
def prepare_plugin_load_paths(config, ceedling_plugins_path, expand: ->(path) { path })
|
|
47
|
+
load_paths = Array( config.dig(:plugins, :load_paths) ).compact.map { |path| ProjectPaths.standardize( expand.call( path ) ) }
|
|
44
48
|
load_paths << ceedling_plugins_path
|
|
45
49
|
load_paths.compact!
|
|
46
50
|
load_paths.uniq!
|
|
@@ -51,7 +55,7 @@ module RakefileComponentResolver
|
|
|
51
55
|
# - Stock files (always)
|
|
52
56
|
# - Conditional stock files (rules_release, tasks_release if release_build is enabled)
|
|
53
57
|
# - Plugin .rake files (first matching <root>/<plugin>/<plugin>.rake across load_paths)
|
|
54
|
-
def resolve(config, ceedling_lib_path, ceedling_plugins_path)
|
|
58
|
+
def resolve(config, ceedling_lib_path, ceedling_plugins_path, expand: ->(path) { path })
|
|
55
59
|
paths = base_rakefiles(ceedling_lib_path) + test_rakefiles(ceedling_lib_path)
|
|
56
60
|
|
|
57
61
|
if config.dig(:project, :release_build)
|
|
@@ -59,7 +63,7 @@ module RakefileComponentResolver
|
|
|
59
63
|
end
|
|
60
64
|
|
|
61
65
|
paths.concat(
|
|
62
|
-
plugin_rake_files( config, prepare_plugin_load_paths(config, ceedling_plugins_path) )
|
|
66
|
+
plugin_rake_files( config, prepare_plugin_load_paths(config, ceedling_plugins_path, expand: expand) )
|
|
63
67
|
)
|
|
64
68
|
|
|
65
69
|
return paths
|
|
@@ -70,20 +74,9 @@ module RakefileComponentResolver
|
|
|
70
74
|
# Uses File.exist? directly (no DI needed) — same check as ConfiguratorPlugins#find_rake_plugins.
|
|
71
75
|
# Array() wraps nil gracefully so missing config keys don't raise.
|
|
72
76
|
def plugin_rake_files(config, load_paths)
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
enabled.each do |plugin|
|
|
77
|
-
load_paths.each do |load_path|
|
|
78
|
-
candidate = File.join(load_path, plugin, "#{plugin}.rake")
|
|
79
|
-
if File.exist?(candidate)
|
|
80
|
-
results << candidate
|
|
81
|
-
break
|
|
82
|
-
end
|
|
83
|
-
end
|
|
77
|
+
return Array( config.dig(:plugins, :enabled) ).filter_map do |plugin|
|
|
78
|
+
load_paths.lazy.map { |load_path| File.join(load_path, plugin, "#{plugin}.rake") }.find { |candidate| File.exist?(candidate) }
|
|
84
79
|
end
|
|
85
|
-
|
|
86
|
-
results
|
|
87
80
|
end
|
|
88
81
|
|
|
89
82
|
end
|
data/lib/ceedling/rakefile.rb
CHANGED
|
@@ -5,6 +5,18 @@
|
|
|
5
5
|
# SPDX-License-Identifier: MIT
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
|
+
# A launcher before 1.2.2 loads this application into its own process, where its code
|
|
9
|
+
# mixes with this installation's. Before anything else loads, restart in this
|
|
10
|
+
# installation's own process. require_relative, because such a launcher's load path
|
|
11
|
+
# cannot reach files newer than itself.
|
|
12
|
+
require_relative 'handoff'
|
|
13
|
+
Handoff.complete_in_process(
|
|
14
|
+
app_root: File.expand_path( File.join( __dir__, '..', '..' ) ),
|
|
15
|
+
app_cfg: CEEDLING_APPCFG,
|
|
16
|
+
handoff_objects: CEEDLING_HANDOFF_OBJECTS,
|
|
17
|
+
env: ENV
|
|
18
|
+
)
|
|
19
|
+
|
|
8
20
|
require 'fileutils'
|
|
9
21
|
|
|
10
22
|
# Add Unity and CMock's Ruby code paths to $LOAD_PATH for runner generation and mocking
|
|
@@ -49,7 +61,9 @@ begin
|
|
|
49
61
|
# 1. Add full path to $LOAD_PATH to simplify objects.yml
|
|
50
62
|
# 2. Perform object construction + dependency injection
|
|
51
63
|
# 3. Remove full path from $LOAD_PATH
|
|
52
|
-
|
|
64
|
+
# The full path comes last, behind its subdirectories, so a file an older Ceedling left
|
|
65
|
+
# directly in lib/ceedling/ never stands in for one that has moved below it
|
|
66
|
+
$LOAD_PATH.push( CEEDLING_APPCFG[:ceedling_lib_path] )
|
|
53
67
|
objects_filepath = File.join( CEEDLING_APPCFG[:ceedling_lib_path], 'objects.yml' )
|
|
54
68
|
|
|
55
69
|
# Create object hash and dependency injection context
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
8
|
require 'ceedling/constants'
|
|
9
|
-
require 'ceedling/file_path_utils'
|
|
9
|
+
require 'ceedling/filesystem/file_path_utils'
|
|
10
10
|
|
|
11
11
|
# Set Rake verbosity using global constant verbosity set before Rake is loaded
|
|
12
12
|
if !!defined?(PROJECT_VERBOSITY)
|
|
@@ -21,11 +21,9 @@ namespace RELEASE_SYM do
|
|
|
21
21
|
# Use rules to increase efficiency for large projects (instead of iterating through all sources and creating defined tasks)
|
|
22
22
|
|
|
23
23
|
# Unadvertised Rake task to execute source file compilation in isolation.
|
|
24
|
-
# A source extension can be configured as more than one string, so
|
|
25
|
-
#
|
|
26
|
-
|
|
27
|
-
release_source_extensions = EXTENSION_SOURCE.to_a.map { |ext| Regexp.escape(ext) }.join('|')
|
|
28
|
-
rule(/^#{RELEASE_COMPILE_TASK_ROOT}\S+(?:#{release_source_extensions}|#{Regexp.escape(EXTENSION_CORE_SOURCE)})$/ => [ # compile task names by regex
|
|
24
|
+
# A source extension can be configured as more than one string, so a task name ending in
|
|
25
|
+
# any of them matches, rather than only the first/primary one.
|
|
26
|
+
rule(/^#{RELEASE_COMPILE_TASK_ROOT}\S+(?:#{EXTENSION_SOURCE.pattern}|#{Regexp.escape(EXTENSION_CORE_SOURCE)})$/ => [ # compile task names by regex
|
|
29
27
|
proc do |task_name|
|
|
30
28
|
source = task_name.sub(/#{RELEASE_COMPILE_TASK_ROOT}/, '')
|
|
31
29
|
@ceedling[:file_finder].find_source_file(source)
|
|
@@ -37,8 +35,7 @@ namespace RELEASE_SYM do
|
|
|
37
35
|
|
|
38
36
|
# Unadvertised Rake task to execute source file assembly in isolation
|
|
39
37
|
if (RELEASE_BUILD_USE_ASSEMBLY)
|
|
40
|
-
|
|
41
|
-
rule(/^#{RELEASE_ASSEMBLE_TASK_ROOT}\S+(?:#{release_assembly_extensions})$/ => [ # assemble task names by regex
|
|
38
|
+
rule(/^#{RELEASE_ASSEMBLE_TASK_ROOT}\S+#{EXTENSION_ASSEMBLY.pattern}$/ => [ # assemble task names by regex
|
|
42
39
|
proc do |task_name|
|
|
43
40
|
source = task_name.sub(/#{RELEASE_ASSEMBLE_TASK_ROOT}/, '')
|
|
44
41
|
@ceedling[:file_finder].find_assembly_file(source)
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
8
|
require 'ceedling/constants'
|
|
9
|
+
require 'ceedling/filename_extension'
|
|
9
10
|
require 'ceedling/release_invoker/release_invoker_types'
|
|
10
11
|
|
|
11
12
|
# Does the actual work of a release build: compiling objects, linking the
|
|
@@ -24,7 +25,8 @@ class ReleaseBuildExecutor
|
|
|
24
25
|
:file_finder,
|
|
25
26
|
:file_wrapper,
|
|
26
27
|
:file_path_utils,
|
|
27
|
-
:dependinator
|
|
28
|
+
:dependinator,
|
|
29
|
+
:library_resolver
|
|
28
30
|
)
|
|
29
31
|
|
|
30
32
|
def compile_objects(state)
|
|
@@ -44,17 +46,22 @@ class ReleaseBuildExecutor
|
|
|
44
46
|
def link(state)
|
|
45
47
|
objects, libraries = sort_objects_and_libraries( state.objects )
|
|
46
48
|
lib_args = convert_libraries_to_arguments( libraries )
|
|
47
|
-
lib_paths =
|
|
49
|
+
lib_paths = @library_resolver.search_path_arguments()
|
|
50
|
+
library_files = @library_resolver.link_files( release_library_entries( libraries ) )
|
|
48
51
|
target = @configurator.project_release_build_target
|
|
49
52
|
|
|
53
|
+
# As with a test link, the object and library lists as meta relink an artifact that a
|
|
54
|
+
# dropped source or library would otherwise leave holding its code
|
|
50
55
|
@dependinator.register(
|
|
51
56
|
target,
|
|
52
|
-
files: objects,
|
|
53
|
-
meta: { flags: state.link_flags, lib_args: lib_args, lib_paths: lib_paths, tools: [@configurator.tools_release_linker] }
|
|
57
|
+
files: objects + library_files,
|
|
58
|
+
meta: { flags: state.link_flags, lib_args: lib_args, lib_paths: lib_paths, tools: [@configurator.tools_release_linker], objects: objects, libraries: library_files }
|
|
54
59
|
)
|
|
55
60
|
stale = @dependinator.stale?( target )
|
|
56
61
|
|
|
57
62
|
if stale
|
|
63
|
+
# A target named by an absolute :output may sit in a directory no build made
|
|
64
|
+
@file_wrapper.mkdir( File.dirname( target ) )
|
|
58
65
|
@generator.generate_executable_file(
|
|
59
66
|
@configurator.tools_release_linker,
|
|
60
67
|
RELEASE_SYM,
|
|
@@ -192,13 +199,7 @@ class ReleaseBuildExecutor
|
|
|
192
199
|
end
|
|
193
200
|
|
|
194
201
|
def convert_libraries_to_arguments(libraries)
|
|
195
|
-
args =
|
|
196
|
-
(libraries || []) +
|
|
197
|
-
((defined? LIBRARIES_SYSTEM) ? LIBRARIES_SYSTEM : []) +
|
|
198
|
-
((defined? LIBRARIES_RELEASE) ? LIBRARIES_RELEASE : [])
|
|
199
|
-
|
|
200
|
-
args.flatten!
|
|
201
|
-
args.compact!
|
|
202
|
+
args = release_library_entries( libraries )
|
|
202
203
|
|
|
203
204
|
if (defined? LIBRARIES_FLAG)
|
|
204
205
|
args.map! { |v| LIBRARIES_FLAG.gsub(/\$\{1\}/, v) }
|
|
@@ -207,12 +208,15 @@ class ReleaseBuildExecutor
|
|
|
207
208
|
return args
|
|
208
209
|
end
|
|
209
210
|
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
211
|
+
# The :libraries entries a release links, whatever form each takes, beside the library
|
|
212
|
+
# files its object list names
|
|
213
|
+
def release_library_entries(libraries)
|
|
214
|
+
entries =
|
|
215
|
+
(libraries || []) +
|
|
216
|
+
((defined? LIBRARIES_SYSTEM) ? LIBRARIES_SYSTEM : []) +
|
|
217
|
+
((defined? LIBRARIES_RELEASE) ? LIBRARIES_RELEASE : [])
|
|
218
|
+
|
|
219
|
+
return entries.flatten.compact
|
|
216
220
|
end
|
|
217
221
|
|
|
218
222
|
# A release's object list can include precompiled libraries/archives
|
|
@@ -221,35 +225,20 @@ class ReleaseBuildExecutor
|
|
|
221
225
|
# arguments rather than as ordinary link inputs, so they're split out here
|
|
222
226
|
# by file extension before linking.
|
|
223
227
|
def sort_objects_and_libraries(both)
|
|
224
|
-
# A library type may be named by several extensions at once (.a and .so, say), so its
|
|
225
|
-
# regex alternation is built from however many are configured -- one entry needs no
|
|
226
|
-
# alternation at all, several are joined into one. Enumerable is the test rather than
|
|
227
|
-
# Array specifically, since a library-type extension is a FilenameExtension by the time
|
|
228
|
-
# it reaches here, not a raw Array, even though both are iterable the same way.
|
|
229
|
-
extension = if ((defined? EXTENSION_SUBPROJECTS) && (defined? EXTENSION_LIBRARIES))
|
|
230
|
-
extension_libraries = if (EXTENSION_LIBRARIES.is_a? Enumerable)
|
|
231
|
-
EXTENSION_LIBRARIES.to_a.join(")|(?:\\")
|
|
232
|
-
else
|
|
233
|
-
EXTENSION_LIBRARIES
|
|
234
|
-
end
|
|
235
|
-
"(?:\\#{EXTENSION_SUBPROJECTS})|(?:\\#{extension_libraries})"
|
|
236
|
-
elsif (defined? EXTENSION_SUBPROJECTS)
|
|
237
|
-
"\\#{EXTENSION_SUBPROJECTS}"
|
|
238
|
-
elsif (defined? EXTENSION_LIBRARIES)
|
|
239
|
-
if (EXTENSION_LIBRARIES.is_a? Enumerable)
|
|
240
|
-
"(?:\\#{EXTENSION_LIBRARIES.to_a.join(")|(?:\\")})"
|
|
241
|
-
else
|
|
242
|
-
"\\#{EXTENSION_LIBRARIES}"
|
|
243
|
-
end
|
|
244
|
-
else
|
|
245
|
-
"\\.LIBRARY"
|
|
246
|
-
end
|
|
247
228
|
# Compile once rather than once per entry in `both`
|
|
248
|
-
library_pattern = /.+#{
|
|
229
|
+
library_pattern = /.+#{library_endings()}$/
|
|
249
230
|
sorted_objects = both.group_by { |v| v.match?( library_pattern ) ? :libraries : :objects }
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
231
|
+
return (sorted_objects[:objects] || []), (sorted_objects[:libraries] || [])
|
|
232
|
+
end
|
|
233
|
+
|
|
234
|
+
# A library type may be named by several extensions at once (.a and .so, say), and a
|
|
235
|
+
# subproject's by its own
|
|
236
|
+
def library_endings
|
|
237
|
+
endings = []
|
|
238
|
+
endings << FilenameExtension.new( EXTENSION_SUBPROJECTS ).pattern if defined? EXTENSION_SUBPROJECTS
|
|
239
|
+
endings << FilenameExtension.new( EXTENSION_LIBRARIES ).pattern if defined? EXTENSION_LIBRARIES
|
|
240
|
+
endings << Regexp.escape( '.LIBRARY' ) if endings.empty?
|
|
241
|
+
return "(?:#{endings.join( '|' )})"
|
|
253
242
|
end
|
|
254
243
|
|
|
255
244
|
# States, in one line, how many targets a build step left untouched because nothing
|