Alon Bar-Lev has posted comments on this change. Change subject: packaging: open source like versioning scheme ......................................................................
Patch Set 1: (3 inline comments) .................................................... File Makefile Line 24: include version.mak Line 25: # major, minor, seq Line 26: POM_VERSION:=$(shell cat pom.xml | grep '<engine.version>' | sed -e 's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//') Line 27: # major, minor from pom and fix Line 28: APP_VERSION=$(shell echo $(POM_VERSION) | sed 's/\([^.]*\.[^.]\)\..*/\1/').$(FIX_RELEASE) No, file names should be consistent across z-stream. pom last component is not z-stream, but sequence, as far as I understand. If pom was well behaved, I would have generated the version out of the build and include it at pom and not the other way around. Please also keep in mind that this is not java project, it is integration of several technologies, forcing the pom over the other is wrong. For example, a fix in setup (python) should not effect any of the java stuff. I did not have enough courage to set constant 0.0.0 for pom in this patch... but please keep in mind that the version of the artifacts are completely meaningless, as there is no user, and if there was, we should have versioned artifacts based on interface version and not product version. [1] http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-pom-syntax.html Line 29: RPM_VERSION=$(APP_VERSION) Line 30: PACKAGE_VERSION=$(APP_VERSION)$(if $(MILESTONE),_$(MILESTONE)) Line 31: PACKAGE_NAME=ovirt-engine Line 32: DISPLAY_VERSION=$(PACKAGE_VERSION) .................................................... File version.mak Line 1: # Version Information Line 2: Line 3: # Major and minor are taken from pom.xml Not as far as I understand. Line 4: Line 5: # Fix release is manually specified, Line 6: # increment after releasing/branching Line 7: FIX_RELEASE=0 Line 31: # For release: Line 32: # RPM_RELEASE=N Line 33: # while N is incremented each re-release Line 34: # Line 35: RPM_RELEASE=0.0.$(MILESTONE).$(shell date +%Y%m%d%H%M%S) Yes, when merge we can revbump to whatever be appropriate at the time. -- To view, visit http://gerrit.ovirt.org/12406 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibe7d85addc16950a3efbebb1f6e157d5401745b2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: Alex Lourie <[email protected]> Gerrit-Reviewer: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: Eyal Edri <[email protected]> Gerrit-Reviewer: Juan Hernandez <[email protected]> Gerrit-Reviewer: Moran Goldboim <[email protected]> Gerrit-Reviewer: Ofer Schreiber <[email protected]> Gerrit-Reviewer: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
