From 39c0c89be0390f176f46e355a89db5d055b3e3c9 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 31 Jul 2014 10:58:06 +0100 Subject: [PATCH] Add some constants that show the version of the library Change-Id: I8ae5db2b0d4a6946c74deaf80edefd8a76e60ec9 --- optional/dali-toolkit/dali-toolkit.h | 1 + .../public-api/dali-toolkit-version.cpp | 54 ++++++++++++++++++++++ .../dali-toolkit/public-api/dali-toolkit-version.h | 32 +++++++++++++ optional/dali-toolkit/public-api/file.list | 8 ++-- 4 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 optional/dali-toolkit/public-api/dali-toolkit-version.cpp create mode 100644 optional/dali-toolkit/public-api/dali-toolkit-version.h diff --git a/optional/dali-toolkit/dali-toolkit.h b/optional/dali-toolkit/dali-toolkit.h index c8d9a08..ff72f77 100644 --- a/optional/dali-toolkit/dali-toolkit.h +++ b/optional/dali-toolkit/dali-toolkit.h @@ -129,5 +129,6 @@ #include #include +#include #endif // __DALI_TOOLKIT_EXT_H__ diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp new file mode 100644 index 0000000..8de2f74 --- /dev/null +++ b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// HEADER +#include + +// EXTERNAL INCLUDES +#ifdef DEBUG_ENABLED +#include +#endif + +namespace Dali +{ + +namespace Toolkit +{ + +const unsigned int TOOLKIT_MAJOR_VERSION = 1; +const unsigned int TOOLKIT_MINOR_VERSION = 0; +const unsigned int TOOLKIT_MICRO_VERSION = 1; +const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; + +#ifdef DEBUG_ENABLED +namespace +{ +/// Allows the printing of the version number ONLY when debug is enabled +struct PrintVersion +{ + PrintVersion() + { + std::cout << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << " (" << TOOLKIT_BUILD_DATE << ")" << std::endl; + } +}; +PrintVersion TOOLKIT_VERSION; +} // unnamed namespace +#endif + +} // namespace Toolkit + +} // namespace Dali diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.h b/optional/dali-toolkit/public-api/dali-toolkit-version.h new file mode 100644 index 0000000..e2813bf --- /dev/null +++ b/optional/dali-toolkit/public-api/dali-toolkit-version.h @@ -0,0 +1,32 @@ +#ifndef __DALI_TOOLKIT_VERSION_H__ +#define __DALI_TOOLKIT_VERSION_H__ + +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +namespace Dali +{ +namespace Toolkit +{ +extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit. +extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit. +extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit. +extern const char * const TOOLKIT_BUILD_DATE; ///< The date/time the Toolkit library was built. +} // namespace Toolkit +} // namespace Dali + +#endif // __DALI_TOOLKIT_VERSION_H__ diff --git a/optional/dali-toolkit/public-api/file.list b/optional/dali-toolkit/public-api/file.list index cf2d2c9..31ea4c7 100755 --- a/optional/dali-toolkit/public-api/file.list +++ b/optional/dali-toolkit/public-api/file.list @@ -52,11 +52,13 @@ public_api_optional_src_files = \ $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.cpp \ $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.cpp \ $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.cpp \ - $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp - + $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ + $(public_api_optional_src_dir)/dali-toolkit-version.cpp + # Add public header files here -public_api_optional_header_files = +public_api_optional_header_files = \ + $(public_api_optional_src_dir)/dali-toolkit-version.h public_api_optional_controls_header_files = -- 2.7.4