Merge lp:~vanvugt/mir/nextrelease into lp:mir

[Daniel van Vugt]

Drop the 'unreleased' nomenclature in symbols.map. Aside from the fact
that we need to remember (and do forget) to change it at release, we
already know what that next release will be. So the intermediate step of
naming stanzas 'unreleased' is not necessary.

This makes the release process less error prone and a bit quicker.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3427
https://mir-jenkins.ubuntu.com/job/mir-ci/685/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/637
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/674
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/666
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/666
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/647/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/685/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> "we already know what that next release will be."

Do we though? I know it will usually be 0.(N+1).0 but is that always true?

review: Needs Information

[Daniel van Vugt (vanvugt)]

Yes, I assume the next series will almost always be 0.(N+1).

That assumption is factually true much more often than it's not (in fact it's never yet been untrue).

[Alan Griffiths (alan-griffiths)]

Well, I hope it isn't always true: One day we might be releasing 1.0.0.

But on the occasions it isn't true we just need to rename in the release process (which is the same work we do now for every release).

review: Approve

[Daniel van Vugt (vanvugt)]

Exactly. For 99% of releases this branch will save us time and effort. The other 1% we'll require the same time and effort that 'unreleased' already does.

[Andreas Pokorny (andreas-pokorny)]

Agreed.

review: Approve

[Kevin DuBois (kdub)]

lgtm too

review: Approve

[Alberto Aguirre (albaguirre)]

OK though the "# New functions in Mir 0.x" comments are superfluous.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/152/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/664/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/164/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/701/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/691/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/691/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/672/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/672/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/672/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/672/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/672/console

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'doc/dso_versioning_guide.md'
--- doc/dso_versioning_guide.md	2016-01-29 08:18:22 +0000
+++ doc/dso_versioning_guide.md	2016-03-29 05:55:34 +0000
@@ -6,8 +6,9 @@
 
 There are more detailed descriptions below, but as a general rule:
 
- - If you add a new symbol, add it to the `*_unreleased` version stanza,
-   like `MIR_CLIENT_unreleased`, `MIR_PLATFORM_unreleased`, etc.
+ - If you add a new symbol, add it to a `*_NEXTSERIES` version stanza,
+   like `MIR_CLIENT_0.22`, `MIR_PLATFORM_0.22`, etc representing the
+   next future Mir series in which the new symbol will first be released.
  - If you change the behaviour or signature of a symbol _and_ wish to preserve
    backward compatibility, see "Change symbols without breaking ABI" below.
  - At release time, rename the current `*_unversioned` stanzas to have the
@@ -95,7 +96,7 @@
             /* Other symbols go here */
     };
 
-    MIR_CLIENT_unreleased {
+    MIR_CLIENT_0.18 {
         global:
             mir_connect_new_symbol;
         local:
@@ -138,7 +139,7 @@
     /* The old implementation */
 
     /* The @@ specifies that this is the default version */
-    __asm__(".symver mir_connection_create_surface,mir_connection_create_surface@@@MIR_CLIENT_unreleased");
+    __asm__(".symver mir_connection_create_surface,mir_connection_create_surface@@@MIR_CLIENT_0.18");
     MirWaitHandle* mir_connection_create_surface(...)
     /* The new implementation */
 
@@ -151,7 +152,7 @@
             ...
     };
 
-    MIR_CLIENT_unreleased {
+    MIR_CLIENT_0.18 {
         global:
             ...
             mir_connection_create_surface;

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2016-03-28 17:37:35 +0000
+++ src/client/symbols.map	2016-03-29 05:55:34 +0000
@@ -268,7 +268,7 @@
     *;
 } MIR_CLIENT_9v19;
 
-MIR_CLIENT_unreleased {
+MIR_CLIENT_0.22 {  # New functions in Mir 0.22
   global:
     mir_connection_confirm_base_display_configuration;
     mir_connection_preview_base_display_configuration;

=== modified file 'src/protobuf/symbols.map'
--- src/protobuf/symbols.map	2016-03-23 06:39:56 +0000
+++ src/protobuf/symbols.map	2016-03-29 05:55:34 +0000
@@ -1015,7 +1015,7 @@
   };
 } MIR_PROTOBUF_3;
 
-MIR_PROTOBUF_unreleased {
+MIR_PROTOBUF_0.22 {  # New symbols in Mir 0.22
  global:
   extern "C++" {
     mir::protobuf::PreviewConfiguration::ByteSize*;
@@ -1037,4 +1037,4 @@
     typeinfo?for?mir::protobuf::PreviewConfiguration;
     vtable?for?mir::protobuf::PreviewConfiguration;
   };
-} MIR_PROTOBUF_3v19;
\ No newline at end of file
+} MIR_PROTOBUF_3v19;