Fluidity

Revision number in usage not updated without a 'make clean'

Bug #814839 reported by Adam Candy
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Fluidity
Fix Released
Low
Adam Candy

Bug Description

The fix to bug lp:786075 updates the revision number in include/confdefs.h when the fluidity_library is rebuilt (i.e. on the issue of a 'make'). However, this is not usually picked up by Usage.cpp on a 'make'. This can be forced with a 'make clean', but this is rather extreme when, most likely, there are only a few changes to build.

Instead a rebuild of Usage.o could be forced to ensure the revision number is updated in the binary usage info.

Related branches

lp:~asc/fluidity/ensurerevisionnumberupdate
lp:~wence/fluidity/fixup-version-number
Adam Candy: Needs Fixing
Tim Bond (community): Approve
Diff: 232 lines (+19/-43)
13 files modified
Makefile.in (+10/-2)
configure (+0/-7)
configure.in (+0/-6)
femtools/Diagnostic_variables.F90 (+1/-0)
femtools/Makefile.dependencies (+2/-2)
include/Usage.h (+1/-0)
include/qg_usage.h (+1/-0)
libadaptivity/configure (+0/-7)
libadaptivity/configure.in (+0/-6)
libvtkfortran/configure (+0/-7)
libvtkfortran/configure.in (+0/-6)
main/Makefile.in (+2/-0)
qg_strat/Makefile.in (+2/-0)
lp:~asc/fluidity/fixup-version-number2
Tim Bond (community): Approve
Diff: 18 lines (+7/-1)
1 file modified
Makefile.in (+7/-1)
Adam Candy (asc)
Changed in fluidity:
importance: Undecided → Low
assignee: nobody → Adam Candy (asc)
Adam Candy (asc)
Changed in fluidity:
status: New → Fix Released
Revision history for this message
Stephan Kramer (s-kramer) wrote :

This seems to break 'make -j' for me. 'make -j' seems to still work after a "make clean", but if you do the following afterwards:

[skramer@stommel]{/data/stephan/bzr/fluidity}$ touch femtools/Fields_Base.F90
[skramer@stommel]{/data/stephan/bzr/fluidity}$ make -j
Updating version number
BUILD libfluidity
    MKDIR lib
    MAKE debug
    MAKE libwm
    MAKE femtools
make[1]: *** No rule to make target `../include/version.h', needed by `Diagnostic_variables.o'. Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [lib/libfluidity.a] Error 2
make: *** Waiting for unfinished jobs....
DEFINE __FLUIDITY_VERSION__

Revision history for this message
Adam Candy (asc) wrote :

This was addressed in the comments with the merge request for the branch: lp:~asc/fluidity/fixup-version-number2
(https://code.launchpad.net/~asc/fluidity/fixup-version-number2/+merge/71887)
and is highlighted as outstanding work.

I'll look at this and prepare a fix in time for the release.

Revision history for this message
Adam Candy (asc) wrote :

Fix committed to ~fluidity-core/fluidity/dev-trunk , revision 3678.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.