diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-31 15:24:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-03 13:23:39 +0300 |
| commit | 81849e7c9dcd7c41df0b309a04fed34429580748 (patch) | |
| tree | fbbd87b7fea2fbfb5f534860eb903c20e288e083 /source | |
| parent | ad5e91a10720a1b0d8dcfe6ec6e01db7ba836879 (diff) | |
Buildbot: support building releases, make non-releases more consistent
* Auto detect rc and release version cycle in BKE_blender_version.h.
* On Windows, generate zip and installer if a release is detected.
* On macOS, always generate a dmg instead of zip.
* Use standard package names without hash if a release is detected.
* Buildbot package names now match platform names in releases.
Ref T67056
Differential Revision: https://developer.blender.org/D5643
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_splash_screen.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index db93193bfe3..65086f57616 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -37,6 +37,8 @@ #define BLENDER_VERSION_CHAR /** alpha/beta/rc/release, docs use this. */ #define BLENDER_VERSION_CYCLE alpha +/** Optionally set to 1,2,... for example to to get alpha1 or rc2. */ +#define BLENDER_VERSION_CYCLE_NUMBER /** Defined in from blender.c */ extern char versionstr[]; diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c index 8629997030f..9cbcab9e3b2 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.c +++ b/source/blender/windowmanager/intern/wm_splash_screen.c @@ -139,6 +139,11 @@ static void wm_block_splash_add_labels(uiBlock *block, int x, int y) BLENDER_VERSION % 100, version_suffix); + const char *cycle_number_suffix = STRINGIFY(BLENDER_VERSION_CYCLE_NUMBER); + if (strlen(cycle_number_suffix)) { + BLI_snprintf(version_buf, sizeof(version_buf), "%s %s", version_buf, cycle_number_suffix); + } + wm_block_splash_add_label(block, version_buf, x, &y); #ifdef WITH_BUILDINFO |