From 618a6bd002aa77c8d038091f2c84767b3a4cae66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20D=C3=A9l=C3=A8ze?=
 <benjamin.deleze@cyberbotics.com>
Date: Wed, 5 Jul 2023 13:49:20 +0200
Subject: [PATCH] Bump version to R2023b-rev1 (#6296)

* Bump version to R2023b-rev1

* clangoformat
---
 Contents/Info.plist                   | 6 +++---
 docs/js/showdown-extensions.js        | 4 ++--
 resources/version.txt                 | 2 +-
 scripts/packaging/webots_version.txt  | 2 +-
 src/webots/core/WbApplicationInfo.cpp | 2 +-
 src/webots/gui/WbUpdatedDialog.cpp    | 9 +++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Contents/Info.plist b/Contents/Info.plist
index e1d457462d0..4f84a5fc131 100644
--- a/Contents/Info.plist
+++ b/Contents/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleExecutable</key>
 	<string>webots</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Webots R2023b, Copyright 1998-2023 Cyberbotics Ltd.</string>
+	<string>Webots R2023b revision 1, Copyright 1998-2023 Cyberbotics Ltd.</string>
 	<key>CFBundleIconFile</key>
 	<string>webots_icon</string>
 	<key>CFBundleIdentifier</key>
@@ -47,11 +47,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>R2023b</string>
+	<string>R2023b revision 1</string>
 	<key>CFBundleSignature</key>
 	<string>wbt </string>
 	<key>CFBundleVersion</key>
-	<string>R2023b</string>
+	<string>R2023b revision 1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>CSResourcesFileMapped</key>
diff --git a/docs/js/showdown-extensions.js b/docs/js/showdown-extensions.js
index 3e213aec77c..18eba96efd5 100644
--- a/docs/js/showdown-extensions.js
+++ b/docs/js/showdown-extensions.js
@@ -34,8 +34,8 @@ showdown.extension('wbVariables', function() {
         major: 'R2023b',
         // full is equal to major for the first major version
         // and contains the revision number for subsequent versions
-        full: 'R2023b',
-        package: 'R2023b'
+        full: 'R2023b revision 1',
+        package: 'R2023b-rev1'
       }
     },
     date: {
diff --git a/resources/version.txt b/resources/version.txt
index d0235d228a2..0b9133bdfb4 100644
--- a/resources/version.txt
+++ b/resources/version.txt
@@ -1 +1 @@
-R2023b
+R2023b revision 1
diff --git a/scripts/packaging/webots_version.txt b/scripts/packaging/webots_version.txt
index d0235d228a2..0b9133bdfb4 100644
--- a/scripts/packaging/webots_version.txt
+++ b/scripts/packaging/webots_version.txt
@@ -1 +1 @@
-R2023b
+R2023b revision 1
diff --git a/src/webots/core/WbApplicationInfo.cpp b/src/webots/core/WbApplicationInfo.cpp
index d0a5c7a32f4..9efa015b473 100644
--- a/src/webots/core/WbApplicationInfo.cpp
+++ b/src/webots/core/WbApplicationInfo.cpp
@@ -28,7 +28,7 @@ const WbVersion &WbApplicationInfo::version() {
   static bool firstCall = true;
 
   if (firstCall) {
-    static QString webotsVersionString = "R2023b";  // updated by script
+    static QString webotsVersionString = "R2023b revision 1";  // updated by script
     bool success = webotsVersion.fromString(webotsVersionString);
     if (!success)
       WbLog::fatal(QObject::tr("Internal error: the Webots version is not computable."));
diff --git a/src/webots/gui/WbUpdatedDialog.cpp b/src/webots/gui/WbUpdatedDialog.cpp
index 1bbba1fde6b..5a8aa02accb 100644
--- a/src/webots/gui/WbUpdatedDialog.cpp
+++ b/src/webots/gui/WbUpdatedDialog.cpp
@@ -21,7 +21,7 @@
 #include "WbUpdatedDialog.hpp"
 
 WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
-  setWindowTitle(tr("Welcome to Webots R2023b"));
+  setWindowTitle(tr("Welcome to Webots R2023b revision 1"));
 
   QPixmap webotsLogo("images:webots.png");
   QLabel *image = new QLabel(this);
@@ -31,7 +31,7 @@ WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
 
   QLabel *label = new QLabel(this);
   label->setGeometry(QRect(75, 30, 330, 30));
-  label->setText(tr("<b>Thank you for using Webots R2023b.</b>"));
+  label->setText(tr("<b>Thank you for using Webots R2023b revision 1.</b>"));
   label->setStyleSheet("font-size: 15px;");
   label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
   label->setWordWrap(true);
@@ -56,8 +56,9 @@ WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
 
   label = new QLabel(this);
   label->setGeometry(QRect(35, 200, 283, 44));
-  label->setText(tr("Find out the new features, enhancements and bug fixes of Webots R2023b in the <a style='color: #5DADE2;' "
-                    "href='https://cyberbotics.com/doc/reference/changelog-r2023'>changelog</a>."));
+  label->setText(
+    tr("Find out the new features, enhancements and bug fixes of Webots R2023b revision 1 in the <a style='color: #5DADE2;' "
+       "href='https://cyberbotics.com/doc/reference/changelog-r2023'>changelog</a>."));
   label->setOpenExternalLinks(true);
   label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
   label->setWordWrap(true);