hrev52295 adds 1 changeset to branch 'master'
old head: e998f2e4ac63415a637177c0ec438b3329f6521b
new head: 372195500ddc3a88c8a30f63824c7b63a3c4ab25
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=372195500ddc+%5Ee998f2e4ac63
----------------------------------------------------------------------------
372195500ddc: Versioning: Add BETA_1 and PRE_BETA_2 version constants.
* PRE_BETA_2 is now the default in master.
* For libbe: R1/alpha4 used internal=8, but nobody bumped master
at the same time, so now we are on internal=9.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52295
Commit: 372195500ddc3a88c8a30f63824c7b63a3c4ab25
URL: https://git.haiku-os.org/haiku/commit/?id=372195500ddc
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Aug 28 04:14:20 2018 UTC
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 6 deletions(-)
build/jam/BuildSetup | 2 +-
headers/os/BeBuild.h | 6 ++++--
src/kits/libbe_version.rdef | 6 +++---
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 550a230862..fb04daf770 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -12,7 +12,7 @@
# The Haiku (base) version. For development builds the revision will be
# attached.
-HAIKU_VERSION = r1~alpha4_pm ;
+HAIKU_VERSION = r1~beta1 ;
#pragma mark - container settings
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 5a34a95259..f99212bd72 100644
--- a/headers/os/BeBuild.h
+++ b/headers/os/BeBuild.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2012, Haiku, Inc. All Rights Reserved.
+ * Copyright 2007-2018, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _BE_BUILD_H
@@ -28,9 +28,11 @@
#define B_HAIKU_VERSION_1_PRE_ALPHA_4 0x00000301
#define B_HAIKU_VERSION_1_ALPHA_4 0x00000400
#define B_HAIKU_VERSION_1_PRE_BETA_1 0x00000401
+#define B_HAIKU_VERSION_1_BETA_1 0x00000500
+#define B_HAIKU_VERSION_1_PRE_BETA_2 0x00000501
#define B_HAIKU_VERSION_1 0x00010000
-#define B_HAIKU_VERSION
B_HAIKU_VERSION_1_PRE_BETA_1
+#define B_HAIKU_VERSION
B_HAIKU_VERSION_1_PRE_BETA_2
/* Haiku ABI */
#define B_HAIKU_ABI_MAJOR 0xffff0000
diff --git a/src/kits/libbe_version.rdef b/src/kits/libbe_version.rdef
index f7a90b9d8d..ed02d9dff1 100644
--- a/src/kits/libbe_version.rdef
+++ b/src/kits/libbe_version.rdef
@@ -3,12 +3,12 @@ resource app_version {
middle = 0,
minor = 0,
- variety = B_APPV_ALPHA,
+ variety = B_APPV_BETA,
- internal = 7,
+ internal = 9,
short_info = "Walter",
- long_info = "©2001-2011 Haiku Inc."
+ long_info = "©2001-2018 Haiku Inc."
};
resource app_signature "application/x-vnd.Haiku-libbe" ;
