Merge into 0.9.8 : fix-1023742 : Code : Compiz

Status:

Merged

Approved by:

Sam Spilsbury on 2012-07-20

Approved revision:

3285

Merged at revision:

3291

Proposed branch:

lp://qastaging/~vanvugt/compiz/fix-1023742

Merge into:

lp://qastaging/compiz/0.9.8

Diff against target:

14 lines (+3/-1)

1 file modified

po/CMakeLists.txt (+3/-1)

To merge this branch:

bzr merge lp://qastaging/~vanvugt/compiz/fix-1023742

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sam Spilsbury		2012-07-12	Approve on 2012-07-13
jenkins (community)	continuous-integration		Approve on 2012-07-12
Review via email: mp+114584@code.qastaging.launchpad.net

Commit message

Avoid random build failures "_intltool_update-NOTFOUND: not found"
by verifying intltool-update exists. If not, then fail cmake more cleanly
with a nice error message telling the user how to install it.
(LP: #1023742)

The truly weird part is that I've been building compiz successfully for a
long time without intltool-update installed. However we have some broken
cmake dependencies somewhere which *sometimes* make that a problem (like
with make -j2), but mostly not a problem (like make -j1).

Description of the change

Avoid random build failures "_intltool_update-NOTFOUND: not found"
by verifying intltool-update exists. If not, then fail cmake more cleanly
with a nice error message telling the user how to install it.
(LP: #1023742)

The truly weird part is that I've been building compiz successfully for a
long time without intltool-update installed. However we have some broken
cmake dependencies somewhere which *sometimes* make that a problem (like
with make -j2), but mostly not a problem (like make -j1).

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-07-12:

#

PASSED: Continuous integration, rev:3285
http://jenkins.qa.ubuntu.com/job/compiz-ci/10/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/10/console
SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/10/console

review: Approve (continuous-integration)

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-07-13:

#

This is also good, although I'm not sure about the usage of SEND_ERROR here

(See: http://cmake.org/cmake/help/v2.8.8/cmake.html#command:message)

SEND_ERROR will prevent generation but not abort configuration - I think in the case where intltool-update is not found we should just not generate translations and use message (WARNING) for that. If we should enforce the generation of translations, then just put a reason why and mark this branch as approved.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-07-13:

#

I have tested it. If the file doesn't exist then cmake will complete, but says there were errors and won't give you a Makefile. I think that's preferable to aborting cmake immediately. It's still an error and still prevents you from building.

This bug is actually caused by a race of some sort. Because under normal circumstances (make -j1) I can build successfully without intltool* installed.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-07-13:

#

Okay then.

review: Approve

Compiz

Merge lp://qastaging/~vanvugt/compiz/fix-1023742 into lp://qastaging/compiz/0.9.8

Commit message

Description of the change

Preview Diff

Subscribers