Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not generate .deps on clean #279

Merged
merged 2 commits into from Aug 12, 2019
Merged

Do not generate .deps on clean #279

merged 2 commits into from Aug 12, 2019

Conversation

Disasm
Copy link
Member

@Disasm Disasm commented Aug 9, 2019

No description provided.

adamgreig
adamgreig reviewed Aug 9, 2019
View reviewed changes
Makefile Outdated
@@ -100,4 +100,6 @@ clean: clean-rs clean-patch clean-html
@mkdir -p .deps
python3 scripts/makedeps.py $< > $@

-include $(patsubst devices/%.yaml, .deps/%.d, $(YAMLS))
$(PATCHED_SVDS): $(patsubst devices/%.yaml, .deps/%.d, $(YAMLS))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we stick the .deps/%.d dependency on L37 with svd/%.svd.patched instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, this way make treats dep files as intermediate and removes them after build.

Copy link
Member

@adamgreig adamgreig Aug 9, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a quick test and that seems to work great, ensuring each SVD only depends on its own .d file too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you're right about the intermediate business. Maybe stick them in .PRECIOUS too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

@adamgreig
Copy link
Member

Thanks! Could you rebase off master, as it now contains .PRECIOUS for the svd/%.svd files as well.

@adamgreig
Copy link
Member

Incidentally I think you could do .PRECIOUS: .deps/%.d rather than having to build the list.

@Disasm
Copy link
Member Author

Disasm commented Aug 9, 2019

Yeah, I see. Didn't know about this.

adamgreig
adamgreig approved these changes Aug 9, 2019
View reviewed changes
Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks!

bors r+

@Disasm
Copy link
Member Author

Disasm commented Aug 11, 2019

bors r=adamgreig

@bors
Copy link
Contributor

bors bot commented Aug 11, 2019

🔒 Permission denied

Existing reviewers: click here to make Disasm a reviewer

adamgreig
adamgreig approved these changes Aug 12, 2019
View reviewed changes
Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

bors bot added a commit that referenced this pull request Aug 12, 2019
@bors @Disasm
Merge #279
4052220 
279: Do not generate .deps on clean r=adamgreig a=Disasm



Co-authored-by: Vadim Kaushan <admin@disasm.info>
@bors
Copy link
Contributor

bors bot commented Aug 12, 2019

Build succeeded

@bors bors bot merged commit 718baed into stm32-rs:master Aug 12, 2019
@Disasm Disasm deleted the no-make-deps-on-clean branch August 12, 2019 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamgreig adamgreig adamgreig approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Disasm @adamgreig