WHAT: Change our version numbering scheme to always include all 3 numbers -- even when the 3rd number is 0.
WHY: I think we made a mistake years ago when we designed the version number scheme. It's weird that we drop the last digit when it is 0. WHERE: Trivial patch. See below. WHEN: Tuesday teleconf next week, 30 Sep 2014 MORE DETAIL: Right now, per http://www.open-mpi.org/software/ompi/versions/, when the 3rd digit of our version number is zero, we drop it in the filename and various other outputs (e.g., ompi_info). For example, we have: openmpi-1.8.tar.bz2 instead of openmpi-1.8.0.tar.bz2 Honestly, I think that's just a little weird. I think I was the one who advocated for dropping the 0 way back in the beginning, but I'm now changing my mind. :-) Making this change will be immediately obvious in the filename of the trunk nightly tarball. It won't affect the v1.8 series (or any prior series), because they're all well past their .0 releases. But it will mean that the first release in the v1.9 series will be "v1.9.0". Finally, note that this will also apply to all version numbers shown in ompi_info (e.g., components and projects). Here's the diff: Index: config/opal_get_version.m4 =================================================================== --- config/opal_get_version.m4 (revision 32771) +++ config/opal_get_version.m4 (working copy) @@ -60,12 +60,7 @@ p" < "$1"` [eval] "$opal_vers" - # Only print release version if it isn't 0 - if test $$2_RELEASE_VERSION -ne 0 ; then - $2_VERSION="$$2_MAJOR_VERSION.$$2_MINOR_VERSION.$$2_RELEASE_VERSION" - else - $2_VERSION="$$2_MAJOR_VERSION.$$2_MINOR_VERSION" - fi + $2_VERSION="$$2_MAJOR_VERSION.$$2_MINOR_VERSION.$$2_RELEASE_VERSION" $2_VERSION="${$2_VERSION}${$2_GREEK_VERSION}" $2_BASE_VERSION=$$2_VERSION Index: opal/runtime/opal_info_support.c =================================================================== --- opal/runtime/opal_info_support.c (revision 32771) +++ opal/runtime/opal_info_support.c (working copy) @@ -1099,14 +1099,8 @@ temp[BUFSIZ - 1] = '\0'; if (0 == strcmp(scope, opal_info_ver_full) || 0 == strcmp(scope, opal_info_ver_all)) { - snprintf(temp, BUFSIZ - 1, "%d.%d", major, minor); + snprintf(temp, BUFSIZ - 1, "%d.%d.%d", major, minor, release); str = strdup(temp); - if (release > 0) { - snprintf(temp, BUFSIZ - 1, ".%d", release); - asprintf(&tmp, "%s%s", str, temp); - free(str); - str = tmp; - } if (NULL != greek) { asprintf(&tmp, "%s%s", str, greek); free(str); -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
