From c79e1781054f009f6eff6bd2355777b0b5eb76ca Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 13 Apr 2020 04:03:03 +0100
Subject: [PATCH] Set version as 2.1.0

Signed-off-by: falkTX <falktx@falktx.com>
---
 data/carla-native-plugin.pc     | 2 +-
 data/carla-standalone.pc        | 2 +-
 data/carla-utils.pc             | 2 +-
 data/linux/build-all.sh         | 6 +++---
 data/macos/build.sh             | 2 +-
 data/windows/build-win-all.sh   | 2 +-
 data/windows/pack-win.sh        | 2 +-
 source/frontend/carla_shared.py | 2 +-
 source/includes/CarlaDefines.h  | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/carla-native-plugin.pc b/data/carla-native-plugin.pc
index d00404524..3895f1421 100644
--- a/data/carla-native-plugin.pc
+++ b/data/carla-native-plugin.pc
@@ -3,7 +3,7 @@ libdir=X-LIBDIR-X/carla
 includedir=X-INCLUDEDIR-X/carla
 
 Name: carla-native-plugin
-Version: 2.0.97
+Version: 2.1.0
 Description: Carla Native Plugin
 Libs: -Wl,-rpath=${libdir} -L${libdir} -lcarla_native-plugin
 Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff --git a/data/carla-standalone.pc b/data/carla-standalone.pc
index d0ca14a17..47d31147a 100644
--- a/data/carla-standalone.pc
+++ b/data/carla-standalone.pc
@@ -3,7 +3,7 @@ libdir=X-LIBDIR-X/carla
 includedir=X-INCLUDEDIR-X/carla
 
 Name: carla-standalone
-Version: 2.0.97
+Version: 2.1.0
 Description: Carla Host Standalone
 Libs: -Wl,-rpath=${libdir} -L${libdir} -lcarla_standalone2
 Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff --git a/data/carla-utils.pc b/data/carla-utils.pc
index 9a10d3ed5..bb0910751 100644
--- a/data/carla-utils.pc
+++ b/data/carla-utils.pc
@@ -3,7 +3,7 @@ libdir=X-LIBDIR-X/carla
 includedir=X-INCLUDEDIR-X/carla
 
 Name: carla-utils
-Version: 2.0.97
+Version: 2.1.0
 Description: Carla Host Utilities
 Libs: -Wl,-rpath=${libdir} -L${libdir} -lcarla_utils
 Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes -I${includedir}/utils
diff --git a/data/linux/build-all.sh b/data/linux/build-all.sh
index d384f0782..6b50ef709 100755
--- a/data/linux/build-all.sh
+++ b/data/linux/build-all.sh
@@ -28,8 +28,8 @@ source common.env
 CHROOT_CARLA_DIR="/tmp/carla-src"
 
 # used for downloading packages from kxstudio repos, in order to get lv2-gtk3 and windows bridges
-CARLA_GIT_VER="2.1~rc1+git20200116"
-PKGS_NUM="20200116"
+CARLA_GIT_VER="2.1~rc1+git20200331"
+PKGS_NUM="20200331"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # function to remove old stuff
@@ -504,7 +504,7 @@ EOF
 
 if [ -z "${SOURCED_BY_DOCKER}" ]; then
     # name of final dir and xz file, needed only by chroot_pack_carla
-    export PKG_FOLDER="Carla_2.1-RC2-linux"
+    export PKG_FOLDER="Carla_2.1-linux"
 
     # cleanup
     prepare
diff --git a/data/macos/build.sh b/data/macos/build.sh
index 463251846..2e721848f 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -15,7 +15,7 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # set variables
 
-PKG_FOLDER="Carla_2.1-RC2-macos"
+PKG_FOLDER="Carla_2.1-macos"
 
 source data/macos/common.env
 
diff --git a/data/windows/build-win-all.sh b/data/windows/build-win-all.sh
index 0a2b6e22f..1358c67e8 100755
--- a/data/windows/build-win-all.sh
+++ b/data/windows/build-win-all.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="2.1-RC2"
+VERSION="2.1"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # stop on error
diff --git a/data/windows/pack-win.sh b/data/windows/pack-win.sh
index a6dbed2ab..7aca7c181 100755
--- a/data/windows/pack-win.sh
+++ b/data/windows/pack-win.sh
@@ -33,7 +33,7 @@ fi
 
 source data/windows/common.env
 
-PKG_FOLDER="Carla_2.1-RC2-win${ARCH}"
+PKG_FOLDER="Carla_2.1-win${ARCH}"
 
 export WIN32=true
 
diff --git a/source/frontend/carla_shared.py b/source/frontend/carla_shared.py
index 4e9faf70b..916ce8e1b 100644
--- a/source/frontend/carla_shared.py
+++ b/source/frontend/carla_shared.py
@@ -61,7 +61,7 @@ if WINDOWS:
 # ------------------------------------------------------------------------------------------------------------
 # Set Version
 
-VERSION = "2.0.97 (2.1-RC2)"
+VERSION = "2.1.0"
 
 # ------------------------------------------------------------------------------------------------------------
 # Set TMP
diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h
index 7ea4fc9ee..402fa235d 100644
--- a/source/includes/CarlaDefines.h
+++ b/source/includes/CarlaDefines.h
@@ -32,8 +32,8 @@
 #endif
 
 /* Set Version */
-#define CARLA_VERSION_HEX    0x020097
-#define CARLA_VERSION_STRING "2.0.97 (2.1-RC2)"
+#define CARLA_VERSION_HEX    0x020100
+#define CARLA_VERSION_STRING "2.1.0"
 
 /* Check OS */
 #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__)