Skip to content
This repository has been archived by the owner on Aug 11, 2021. It is now read-only.

Commit

Permalink
all changes of 4.4.1 merged in 4.4.0
Browse files Browse the repository at this point in the history
* CMake fixed for GTest usage.
* a_util version set to 5.6.1.
  • Loading branch information
Ralf Belke authored and Aalmann committed Jun 30, 2020
1 parent 1dacaff commit ff542d6
Show file tree
Hide file tree
Showing 70 changed files with 920 additions and 509 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
- name: download and extract a_util
env:
NAME: 'a_util'
VERSION: 'v5.6.0'
PACKAGE_NAME: a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.0.${{ matrix.compressed_suffix }}
VERSION: 'v5.6.1'
PACKAGE_NAME: a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.1.${{ matrix.compressed_suffix }}
PACKAGE_NAME_DOWNLOADED: a_util.${{ matrix.compressed_suffix }}
run: |
echo ${{ matrix.download_cmd }}
Expand All @@ -79,7 +79,7 @@ jobs:
run: |
mkdir _build
cd _build
cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.arch_key }} ${{ matrix.arch_value }} ${{ matrix.toolset_key }} ${{ matrix.toolset_value }} -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="../ddl_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-${{ steps.get_branch_name.outputs.BRANCH_NAME }}" -Da_util_DIR="${{ matrix.workspace_dir }}/a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.0/lib/cmake/a_util" ..
cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.arch_key }} ${{ matrix.arch_value }} ${{ matrix.toolset_key }} ${{ matrix.toolset_value }} -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="../ddl_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-${{ steps.get_branch_name.outputs.BRANCH_NAME }}" -Da_util_DIR="${{ matrix.workspace_dir }}/a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.1/lib/cmake/a_util" ..
- name: cmake build
run: |
cd _build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
- name: download and extract a_util
env:
NAME: 'a_util'
VERSION: 'v5.6.0'
PACKAGE_NAME: a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.0.${{ matrix.compressed_suffix }}
VERSION: 'v5.6.1'
PACKAGE_NAME: a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.1.${{ matrix.compressed_suffix }}
PACKAGE_NAME_DOWNLOADED: a_util.${{ matrix.compressed_suffix }}
run: |
echo ${{ matrix.download_cmd }}
Expand All @@ -78,7 +78,7 @@ jobs:
run: |
mkdir _build
cd _build
cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.arch_key }} ${{ matrix.arch_value }} ${{ matrix.toolset_key }} ${{ matrix.toolset_value }} -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="../ddl_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-${{ steps.get_tag_name.outputs.TAG_NAME }}" -Da_util_DIR="${{ matrix.workspace_dir }}/a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.0/lib/cmake/a_util" ..
cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.arch_key }} ${{ matrix.arch_value }} ${{ matrix.toolset_key }} ${{ matrix.toolset_value }} -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="../ddl_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-${{ steps.get_tag_name.outputs.TAG_NAME }}" -Da_util_DIR="${{ matrix.workspace_dir }}/a_util_${{ matrix.os }}-${{ matrix.arch_value }}-${{ matrix.toolset_value }}-v5.6.1/lib/cmake/a_util" ..
- name: cmake build
run: |
cd _build
Expand Down
18 changes: 11 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.8.2) # cxx_std_11
project(ddl_library VERSION 4.4.0)
project(ddl_library VERSION 4.4.1)

# Disable extensions here and require the chosen CMAKE_CXX_STANDARD (coming from e.g. Conan)
# Disable extensions here and require the chosen CMAKE_CXX_STANDARD
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -33,14 +33,18 @@ option(ddl_cmake_enable_tests
OFF)

option(ddl_cmake_enable_installation
"Enable installation of the ddl library to CMAKE_INSTALL_PREFIX (default: ON)"
ON)
"Enable installation of the ddl library to CMAKE_INSTALL_PREFIX (default: OFF)"
OFF)

option(ddl_cmake_enable_ddl_generator_tools
"Enable building of the two tools ddl2header and header2ddl (default: ON)"
ON)
"Enable building of the two tools ddl2header and header2ddl (default: OFF)"
OFF)
# End Options #############################################

# Disable extensions here and require the chosen CMAKE_CXX_STANDARD (coming from e.g. Conan)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# Check for default install prefix and cmake build type (UNIX)
include(./cmake/check_cmake_install_prefix.cmake)
include(./cmake/check_cmake_build_type.cmake)
Expand All @@ -58,7 +62,7 @@ include(./cmake/set_library_naming_conventions.cmake)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# Add a_util dependency
find_package(a_util 5.4 REQUIRED)
find_package(a_util 5.6.1 REQUIRED)

# Include sources
include(./ddlrepresentation/pkg_ddlrepresentation.sources)
Expand Down
4 changes: 2 additions & 2 deletions codec/access_element.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ namespace access_element
{

//define all needed error types and values locally
_MAKE_RESULT(-3, ERR_UNEXPECTED)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-3, ERR_UNEXPECTED);
_MAKE_RESULT(-20, ERR_NOT_FOUND);

namespace detail
{
Expand Down
7 changes: 4 additions & 3 deletions codec/codec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@

namespace ddl
{
//define all needed error types and values locally
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-10, ERR_INVALID_INDEX)

//define all needed error types and values locally
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-10, ERR_INVALID_INDEX);

static inline void BitToBytes(size_t& size)
{
Expand Down
6 changes: 3 additions & 3 deletions codec/codec_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
namespace ddl
{
//define all needed error types and values locally
_MAKE_RESULT(-10, ERR_INVALID_INDEX)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-37, ERR_NOT_INITIALIZED)
_MAKE_RESULT(-10, ERR_INVALID_INDEX);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
_MAKE_RESULT(-37, ERR_NOT_INITIALIZED);

static a_util::result::Result getDDL(const char* strMediaDescription,
a_util::memory::unique_ptr<DDLDescription>& pDDL)
Expand Down
4 changes: 2 additions & 2 deletions codec/element_accessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ namespace ddl
{

//define all needed error types and values locally
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED)
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED);

template <typename T>
a_util::result::Result get_typed_element_value(const StructLayoutElement& sElement, const void* pData,
Expand Down
4 changes: 2 additions & 2 deletions codec/static_codec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace ddl
{

//define all needed error types and values locally
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-10, ERR_INVALID_INDEX)
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-10, ERR_INVALID_INDEX);

StaticDecoder::StaticDecoder(a_util::memory::shared_ptr<const StructLayout> pLayout,
const void* pData, size_t nDataSize,
Expand Down
6 changes: 3 additions & 3 deletions codec/struct_layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
namespace ddl
{
//define all needed error types and values locally
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED)
_MAKE_RESULT(-37, ERR_NOT_INITIALIZED)
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED);
_MAKE_RESULT(-37, ERR_NOT_INITIALIZED);

StructLayout::StructLayout(const DDLComplex* pStruct)
{
Expand Down
4 changes: 2 additions & 2 deletions ddlgenerators/ddl2header/ddl2header_commandline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}
using namespace ddl_generator::oo;
Expand Down
4 changes: 2 additions & 2 deletions ddlgenerators/ddl2header/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}
using namespace ddl_generator::oo;
Expand Down
4 changes: 2 additions & 2 deletions ddlgenerators/generator_library/commandline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}
using namespace ddl_generator::oo;
Expand Down
10 changes: 5 additions & 5 deletions ddlgenerators/generator_library/ddl_generator_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-11, ERR_INVALID_FILE)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-11, ERR_INVALID_FILE);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND);
_MAKE_RESULT(-38, ERR_FAILED);
}
}
using namespace ddl_generator::oo;
Expand Down
10 changes: 5 additions & 5 deletions ddlgenerators/generator_library/ddl_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-4, ERR_POINTER)
_MAKE_RESULT(-11, ERR_INVALID_FILE)
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-4, ERR_POINTER);
_MAKE_RESULT(-11, ERR_INVALID_FILE);
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND);
_MAKE_RESULT(-38, ERR_FAILED);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-4, ERR_POINTER)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-11, ERR_INVALID_FILE)
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-4, ERR_POINTER);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-11, ERR_INVALID_FILE);
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND);
_MAKE_RESULT(-38, ERR_FAILED);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-4, ERR_POINTER)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-11, ERR_INVALID_FILE)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND)
_MAKE_RESULT(-36, ERR_UNKNOWN_FORMAT)
_MAKE_RESULT(-37, ERR_NOT_INITIALISED)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-4, ERR_POINTER);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-11, ERR_INVALID_FILE);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND);
_MAKE_RESULT(-36, ERR_UNKNOWN_FORMAT);
_MAKE_RESULT(-37, ERR_NOT_INITIALISED);
_MAKE_RESULT(-38, ERR_FAILED);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-4, ERR_POINTER)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-11, ERR_INVALID_FILE)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND)
_MAKE_RESULT(-27, ERR_OPEN_FAILED)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-4, ERR_POINTER);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-11, ERR_INVALID_FILE);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
_MAKE_RESULT(-24, ERR_PATH_NOT_FOUND);
_MAKE_RESULT(-27, ERR_OPEN_FAILED);
_MAKE_RESULT(-38, ERR_FAILED);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(-20, ERR_NOT_FOUND)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
_MAKE_RESULT(-20, ERR_NOT_FOUND);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED)
_MAKE_RESULT(-16, ERR_NOT_IMPL)
_MAKE_RESULT(-38, ERR_FAILED)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-19, ERR_NOT_SUPPORTED);
_MAKE_RESULT(-16, ERR_NOT_IMPL);
_MAKE_RESULT(-38, ERR_FAILED);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(0, ERR_NOERROR);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ namespace ddl_generator
namespace oo
{
//define all needed error types and values locally
_MAKE_RESULT(0, ERR_NOERROR)
_MAKE_RESULT(-5, ERR_INVALID_ARG)
_MAKE_RESULT(0, ERR_NOERROR);
_MAKE_RESULT(-5, ERR_INVALID_ARG);
}
}

Expand Down
Loading

0 comments on commit ff542d6

Please sign in to comment.