From a763f769d022ab9e84ad294326b4cca2a3904188 Mon Sep 17 00:00:00 2001 From: Kimon Hoffmann Date: Thu, 14 Feb 2019 13:10:49 +0100 Subject: [PATCH] Updated version information to 1.8.0. --- CMakeLists.txt | 2 +- .../Properties/EmberLib.AssemblyInfo.cs | 2 +- .../EmberLib.Glow.Formula/AssemblyInfo.fs | 2 +- libember/CMakeLists.txt | 2 +- libember/Headers/ember/Version.hpp | 4 ++-- libember_slim/CMakeLists.txt | 2 +- libember_slim/Source/ember.h | 4 ++-- libformula/CMakeLists.txt | 2 +- libformula/Headers/formula/Version.hpp | 4 ++-- libs101/CMakeLists.txt | 2 +- tinyember/TinyEmberPlus/TinyEmberPlus.rc | Bin 4484 -> 4436 bytes .../TinyEmberPlusRouter/main.cpp | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32629b6a..29adbace 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) -project(ember-plus VERSION 1.7.0) +project(ember-plus VERSION 1.8.0) add_subdirectory(libs101) add_subdirectory(libformula) diff --git a/EmberLib.net/BerLib/Properties/EmberLib.AssemblyInfo.cs b/EmberLib.net/BerLib/Properties/EmberLib.AssemblyInfo.cs index 5abf72b1..67d5251b 100644 --- a/EmberLib.net/BerLib/Properties/EmberLib.AssemblyInfo.cs +++ b/EmberLib.net/BerLib/Properties/EmberLib.AssemblyInfo.cs @@ -24,4 +24,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyVersion("1.8.0.0")] diff --git a/EmberLib.net/EmberLib.Glow.Formula/AssemblyInfo.fs b/EmberLib.net/EmberLib.Glow.Formula/AssemblyInfo.fs index 9a9a69e0..ad691224 100644 --- a/EmberLib.net/EmberLib.Glow.Formula/AssemblyInfo.fs +++ b/EmberLib.net/EmberLib.Glow.Formula/AssemblyInfo.fs @@ -8,7 +8,7 @@ module internal EmberLib.Glow.Formula.AssemblyInfo open System.Reflection -[] +[] [] [] [] diff --git a/libember/CMakeLists.txt b/libember/CMakeLists.txt index cb105299..08dffb63 100644 --- a/libember/CMakeLists.txt +++ b/libember/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_policy(SET CMP0063 NEW) # Allow interprocedural optimization cmake_policy(SET CMP0069 NEW) -project(libember VERSION 1.7.0 LANGUAGES CXX) +project(libember VERSION 1.8.0 LANGUAGES CXX) # Use GNUInstallDirs to make sure libraries are installed into correct locations # on all platforms. diff --git a/libember/Headers/ember/Version.hpp b/libember/Headers/ember/Version.hpp index c23adfcb..63985a2f 100644 --- a/libember/Headers/ember/Version.hpp +++ b/libember/Headers/ember/Version.hpp @@ -1,7 +1,7 @@ /* libember -- C++ 03 implementation of the Ember+ Protocol - Copyright (C) 2012-2016 Lawo GmbH (http://www.lawo.com). + Copyright (C) 2012-2019 Lawo GmbH (http://www.lawo.com). Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ @@ -20,7 +20,7 @@ namespace libember { #ifndef LIBEMBER_HEADER_ONLY LIBEMBER_API - LIBEMBER_EXTERN + LIBEMBER_EXTERN char const* const versionString; #endif } diff --git a/libember_slim/CMakeLists.txt b/libember_slim/CMakeLists.txt index 0187b5f2..5a45837d 100644 --- a/libember_slim/CMakeLists.txt +++ b/libember_slim/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_policy(SET CMP0063 NEW) # Allow interprocedural optimization cmake_policy(SET CMP0069 NEW) -project(libember_slim VERSION 1.7.0 LANGUAGES C) +project(libember_slim VERSION 1.8.0 LANGUAGES C) # Use GNUInstallDirs to make sure libraries are installed into correct locations # on all platforms. diff --git a/libember_slim/Source/ember.h b/libember_slim/Source/ember.h index baf75556..2702d787 100644 --- a/libember_slim/Source/ember.h +++ b/libember_slim/Source/ember.h @@ -1,7 +1,7 @@ /* libember_slim -- ANSI C implementation of the Ember+ Protocol - Copyright (C) 2012-2016 Lawo GmbH (http://www.lawo.com). + Copyright (C) 2012-2019 Lawo GmbH (http://www.lawo.com). Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ @@ -25,7 +25,7 @@ * The upper byte is the major version number. * The lower byte is the minor version number. */ -#define EMBER_ENCODING_VERSION (0x0107) +#define EMBER_ENCODING_VERSION (0x0150) // ==================================================================== diff --git a/libformula/CMakeLists.txt b/libformula/CMakeLists.txt index f17bc2f9..924e2579 100644 --- a/libformula/CMakeLists.txt +++ b/libformula/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_policy(SET CMP0063 NEW) # Allow interprocedural optimization cmake_policy(SET CMP0069 NEW) -project(libformula VERSION 1.7.0 LANGUAGES CXX) +project(libformula VERSION 1.8.0 LANGUAGES CXX) # Use GNUInstallDirs to make sure libraries are installed into correct locations # on all platforms. diff --git a/libformula/Headers/formula/Version.hpp b/libformula/Headers/formula/Version.hpp index ea9d7d4d..46525d25 100644 --- a/libformula/Headers/formula/Version.hpp +++ b/libformula/Headers/formula/Version.hpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Lawo GmbH (http://www.lawo.com). + Copyright (C) 2012-2019 Lawo GmbH (http://www.lawo.com). Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ @@ -8,7 +8,7 @@ #define __LIBFORMULA_VERSION_HPP #define LIBFORMULA_VERSION_MAJOR 1 -#define LIBFORMULA_VERSION_MINOR 7 +#define LIBFORMULA_VERSION_MINOR 8 #define LIBFORMULA_VERSION_REVISION 0 #endif // __LIBFORMULA_VERSION_HPP diff --git a/libs101/CMakeLists.txt b/libs101/CMakeLists.txt index c70e700f..7ff13403 100644 --- a/libs101/CMakeLists.txt +++ b/libs101/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_policy(SET CMP0063 NEW) # Allow interprocedural optimization cmake_policy(SET CMP0069 NEW) -project(libs101 VERSION 1.7.0 LANGUAGES CXX) +project(libs101 VERSION 1.8.0 LANGUAGES CXX) # Use GNUInstallDirs to make sure libraries are installed into correct locations # on all platforms. diff --git a/tinyember/TinyEmberPlus/TinyEmberPlus.rc b/tinyember/TinyEmberPlus/TinyEmberPlus.rc index 1f22f0f2e8f3c0fcc33583833a750a534db06c2c..6b91aae4d6411cf48c5b3a6877c1e80913be1be6 100644 GIT binary patch delta 18 ZcmZoszM`}tiHkLnp`0Oq^K`DaYydnd22B6} delta 66 zcmcbj)S|p0iOW=%A(%mz!HGcuh>IBV84?*%7?OcxF+&MZEQBEy$je~J1Ipw8aXLdL MP^5TsI@en^0Nq*+tN;K2 diff --git a/tinyember/TinyEmberPlusRouter/TinyEmberPlusRouter/main.cpp b/tinyember/TinyEmberPlusRouter/TinyEmberPlusRouter/main.cpp index 5a69a7d9..525679d5 100644 --- a/tinyember/TinyEmberPlusRouter/TinyEmberPlusRouter/main.cpp +++ b/tinyember/TinyEmberPlusRouter/TinyEmberPlusRouter/main.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Lawo GmbH (http://www.lawo.com). + Copyright (C) 2012-2019 Lawo GmbH (http://www.lawo.com). Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ @@ -12,7 +12,7 @@ #include "glow/Dispatcher.h" -#define VERSION_STRING "1.5.1" +#define VERSION_STRING "1.8.0" #define TCP_PORT 9092 // =====================================================