Fluidity

Revision number given when running fluidity is nonsense

Bug #786075 reported by Jon Hill
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Fluidity
Fix Released
Low
Unassigned

Bug Description

We use svnrevision to get a revision number in both Makefile.in and configure (and of course configure.in) in the main directory. As we're using bzr now, this should be changed.

I propose using modifying Makefile.in
        VERSION = $(shell bzr revision-info)
 @echo "DEFINE __FLUIDITY_VERSION__"
 @echo "#undef __FLUIDITY_VERSION__" >> include/confdefs.h
 @echo "#define __FLUIDITY_VERSION__ \"$(VERSION)\"" >> include/confdefs.h

and removing the definition of VERSION from the configure.in file (or at least not appending it to confdefs.h).

Or would it be better the other way around?

Related branches

lp:~wence/fluidity/make-fixes
Tim Bond (community): Approve
Diff: 286 lines (+102/-35)
5 files modified
Makefile.in (+7/-6)
libwm/Makefile.in (+2/-1)
preprocessor/Makefile.in (+6/-6)
scripts/make_check_options (+44/-11)
scripts/make_register_diagnostics (+43/-11)
lp:fluidity
Revision history for this message
Simon Mouradian (mouradian) wrote :

This has already been addressed, a merge should be on its way.

Revision history for this message
Simon Mouradian (mouradian) wrote :

Check the branch ~wence/fluidity/make-fixes for the changes, revision 3477 bring in VERSION = $(shell bzr revision-info)

Revision history for this message
Jon Hill (jon-hill) wrote :

Excellent. The branch looks good. I think we can still remove the configure VERSION though, unless someone knows why it should be in the configure too?

Lawrence Mitchell (wence)
Changed in fluidity:
status: New → Fix Committed
Revision history for this message
Adam Candy (asc) wrote :

Could also add a flag to indicate whether the source has been modified? I'm using something to the effect of:

$(shell bzr revno)$(shell if bzr st 2>/dev/null | grep -q '^\(added\|modified\):'; then echo M; fi)

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

Of course, this all fails currently on cx1 builds due to the Python library mismatch...

Tim Bond (timothy-bond)
Changed in fluidity:
status: Fix Committed → Fix Released
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.