Skip to content

move version.h to util/ #2500

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.

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

Merged
merged 1 commit into from
Jul 4, 2018
Merged

move version.h to util/ #2500

merged 1 commit into from
Jul 4, 2018

Conversation

kroening
Copy link
Member

@kroening kroening commented Jul 1, 2018

This speeds up 'make' on my laptop from 3.0s to 0.6s.
It is unclear whether the same can be done with cmake.

Copy link
Collaborator

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

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

Several binaries require that version.h file to exist. One option that might help is to have some version.mk file that is selectively included from those directories that require it.

@tautschnig tautschnig assigned kroening and unassigned tautschnig Jul 2, 2018
@smowton
Copy link
Contributor

smowton commented Jul 3, 2018

@tautschnig the version file is the same for each program that uses it, right? If so should we simply make it out of the util package?

@tautschnig
Copy link
Collaborator

Yes, the file is the same for anything built out of this source tree. My concern is the cross-directory build rule that util/version.h would require - or at least it seems to me that it would. Maybe all that we need is that the all target in util generates version.h.

@kroening
Copy link
Member Author

kroening commented Jul 3, 2018

Ok, let's go for util/version.h, made by all

@kroening kroening force-pushed the git-version-speedup branch from ca09cea to f57e2f6 Compare July 3, 2018 11:24
@kroening kroening requested a review from martin-cs as a code owner July 3, 2018 11:24
@kroening kroening force-pushed the git-version-speedup branch from f57e2f6 to a99875b Compare July 3, 2018 11:53
@kroening kroening requested review from cesaro and mgudemann as code owners July 3, 2018 11:53
@kroening kroening changed the title move build commands for cbmc/version.h from common to cbmc/Makefile move version.h to util/ Jul 3, 2018
@kroening kroening force-pushed the git-version-speedup branch from a99875b to 2f3a4af Compare July 3, 2018 11:54
@kroening kroening force-pushed the git-version-speedup branch 2 times, most recently from d4ae346 to 6930227 Compare July 3, 2018 13:21
@kroening kroening assigned smowton and unassigned kroening Jul 3, 2018
@kroening kroening force-pushed the git-version-speedup branch from 6930227 to b96c7ba Compare July 3, 2018 15:20
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

Passed Diffblue compatibility checks (cbmc commit: b96c7ba).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/77996025

Copy link
Contributor

@smowton smowton left a comment

Choose a reason for hiding this comment

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

Confirmed this does as advertised in CMake world

@kroening kroening merged commit 6e554d9 into develop Jul 4, 2018
@kroening kroening deleted the git-version-speedup branch July 4, 2018 10:39
NathanJPhillips pushed a commit to NathanJPhillips/cbmc that referenced this pull request Aug 22, 2018
6409eae Merge pull request diffblue#2449 from tautschnig/c++-template-cleanup
1134455 Merge pull request diffblue#2443 from tautschnig/vs-rdecl
6e9e655 Merge pull request diffblue#2520 from smowton/smowton/feature/constant-propagator-selectivity
9013779 Merge pull request diffblue#2383 from tautschnig/no-sed
56a487e Constant propagator: add callback to filter tracked values
a354513 Merge pull request diffblue#2510 from polgreen/hex_trace
3545be4 Merge pull request diffblue#2523 from peterschrammel/do-not-ignore-full-slice
819c683 Merge pull request diffblue#2493 from jeannielynnmoulton/jeannie/InnerClasses
a018652 allow unsigned long instead of unsigned in regression test for hex_trace
d5bbdd8 represent numerical values in CBMC trace in hex
19bddce Do not ignore --full-slice
5350133 Refactor inner class parsing.
6e554d9 Merge pull request diffblue#2500 from diffblue/git-version-speedup
9ba55e2 Marks anonymous classes as inner classes
b96c7ba move build commands for version.h from common to util/
6ce7b13 Clarifies language in documentation.
c0c1029 Fixes parsing for anonymous classes
1930aef Refactors parsing of inner classes attribute.
b28562b Adds unit test for parsing inner classes.
c336455 Stores inner class data in java class types.
457bac9 Parses InnerClasses attribute of java bytecode.
34bd58f Clean up unused template instantiation symbols
fea1f47 Remove unused parameter from rDeclarator
e00c6ee Set BUILD_ENV via make variable instead of patching via sed

git-subtree-dir: cbmc
git-subtree-split: 6409eae
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants