David Caro has posted comments on this change. Change subject: Update the build process to determine versioning using git tags ......................................................................
Patch Set 1: (2 comments) I prefer git count and hash to dates, as it surely identifies the source that was used. But maybe check alon's comments about automake. Looks a little silly to have one shell script that only executes one simple command though. http://gerrit.ovirt.org/#/c/25404/1/README.maintainer File README.maintainer: Line 55: a tag has to be created on that branch for the above Line 56: automatic to work properly: Line 57: Line 58: X.Y will becomes X.Y.0 Line 59: X.Y.Z becomes X.Y.Z.0 I don't see that flow :/ Does that mean that a branch can have newer version than master? Example: master | | - t:1.0 | + | \ | + | t - t:1.0.0 | | | t - t:1.0.1 At this point you have 1.0 on master and 1.0.1 (greater version) on the branch. I think that a tag has also to be created on master to bump the version, and the branch has to have the version in the last tag in master: master | | - t:1.0 | b - b:1.0 | \ | + t1 t2 - t1:1.1, t2:1.0.0 | | | t - t:1.0.1 | | So you'll end up with master branch, with latest tag 1.1, and 1.0 branch with latest tag 1.0.1 (the tip of the branch being 1.0.1.$(gitcount).$(githash)). Line 60: Line 61: The meaning of this is that the beginning represents Line 62: the version the branch was based on and the last digit Line 63: represents the updates to this specific branch. http://gerrit.ovirt.org/#/c/25404/1/autogen.sh File autogen.sh: Line 22: # - autoconf Line 23: # - automake Line 24: # - gettext-devel Line 25: Line 26: if git status; then &>/dev/unll here to avoid ugly error messages on the logs that are not really errors Line 27: GITVER=$(git describe --match='[[:digit:]].[[:digit:]]*' --tags | tr -d '\n' | sed 's/-/.0./' | tr - .) Line 28: echo "define([VERSION_NUMBER], [$GITVER])" >build/m4/version.m4 Line 29: else Line 30: GITVER=$(cat VERSION | tr -d '\n') -- To view, visit http://gerrit.ovirt.org/25404 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iacfec13ee13abf05c781d820e865b2d4d54398ac Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Martin Sivák <[email protected]> Gerrit-Reviewer: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: David Caro <[email protected]> Gerrit-Reviewer: Greg Padgett <[email protected]> Gerrit-Reviewer: Jiří Moskovčák <[email protected]> Gerrit-Reviewer: Kiril Nesenko <[email protected]> Gerrit-Reviewer: Martin Sivák <[email protected]> Gerrit-Reviewer: Sandro Bonazzola <[email protected]> Gerrit-Reviewer: Yedidyah Bar David <[email protected]> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
