Skip to content
Snippets Groups Projects

configure_file: canonicalize paths in dependencies

fix duplicate phony edges when configure_file is called on the same file from multiple directories

This addresses the issue outlined here: https://github.com/ninja-build/ninja/pull/1425#issuecomment-435854564

This change affects all generators since the easiest way was to address the issue of .. in paths directly in the configure_file implementation. Also, I've normalized the output as well even though that doesn't seem necessary.

If needed I can revert the output change or even try to make this change affect the ninja generator only.

Fixes: #18584 (closed)
Topic-rename: configure_file-canonical-deps

Edited by Brad King

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Resolved by Frank Benkstein

      @fbenkstein thanks for working on this. Please open a dedicated issue in CMake's tracker for this. It should be tracked here and not just in Ninja's issue tracker. Then please add a Fixes: #NNNNN footer to the commit message to mention the CMake issue number.

  • Author Contributor

    I've filed #18584 (closed).

  • added 1 commit

    • 430ca507 - collapse ".." in configure_file inputs and outputs

    Compare with previous version

  • Frank Benkstein resolved all discussions

    resolved all discussions

  • Brad King changed title from fix duplicate phony edges when configure_file is called on the same file from multiple directories to configure_file: canonicalize paths in dependencies

    changed title from fix duplicate phony edges when configure_file is called on the same file from multiple directories to configure_file: canonicalize paths in dependencies

  • Brad King changed the description

    changed the description

  • Kitware Robot added 1 commit

    added 1 commit

    • 70fc32cb - configure_file: canonicalize input and output path in dependencies

    Compare with previous version

    • Resolved by Brad King

      @fbenkstein thanks. I updated your branch to revise the commit message and squash the test (we like all commits to have passing tests). Please fetch and reset your checkout (no push needed).

  • Do: test

  • assigned to @brad.king

  • Brad King changed milestone to %3.14.0

    changed milestone to %3.14.0

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 70fc32cb

  • Brad King added workflow:in-review label and removed workflow:wip label

    added workflow:in-review label and removed workflow:wip label

  • Kitware Robot added 1 commit

    added 1 commit

    • 6199637e - configure_file: canonicalize input and output path in dependencies

    Compare with previous version

  • Do: test

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 6199637e

  • Do: stage

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading