Skip to content

Commit

Permalink
Build capicxx-someip-runtime on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Roldao authored and Ricardo Roldao committed May 14, 2024
1 parent c2265ee commit ddc7e03
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 16 deletions.
75 changes: 60 additions & 15 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: ["master"]

jobs:
build:
build_on_ubuntu_22_04:
runs-on: [ubuntu-22.04]

steps:
Expand All @@ -26,20 +26,10 @@ jobs:
repository: COVESA/vsomeip
path: "vsomeip"

- name: "Install googletest"
- name: Install googletest
run: |
sudo apt-get install libgtest-dev
cd /usr/src/gtest
sudo cmake CMakeLists.txt
sudo make
sudo cp lib/*.a /usr/lib
sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a
sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
- name: "Build capicxx-core-runtime"
run: |
cmake -S capicxx-core-runtime -B build-core-runtime -D CMAKE_INSTALL_PREFIX=install
cmake --build build-core-runtime --target install
sudo apt-get update -qq
sudo apt-get install -y googletest
- name: Ubuntu - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
Expand All @@ -52,6 +42,11 @@ jobs:
arch: x86
cache: true

- name: "Build capicxx-core-runtime"
run: |
cmake -S capicxx-core-runtime -B build-core-runtime -D CMAKE_INSTALL_PREFIX=install
cmake --build build-core-runtime --target install
- name: "Build vsomeip"
run: |
cmake -S vsomeip -B vsomeip -D GTEST_ROOT=/usr/src/googletest -D BOOST_ROOT=/home/runner/boost/boost/ -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install
Expand All @@ -62,4 +57,54 @@ jobs:
run: |
cmake -S . -B build-someip-runtime -D GTEST_ROOT=/usr/src/googletest -D CMAKE_PREFIX_PATH=install -D CMAKE_INSTALL_PREFIX=install
cmake --build build-someip-runtime
cmake --install build-someip-runtime --strip
build_on_windows_latest:
runs-on: windows-latest

steps:
- name: "Checkout"
uses: actions/checkout@v3

- name: "Checkout capicxx-core-runtime"
uses: actions/checkout@v3
with:
repository: COVESA/capicxx-core-runtime
path: "capicxx-core-runtime"

- name: "Checkout vsomeip"
uses: actions/checkout@v3
with:
repository: COVESA/vsomeip
path: "vsomeip"

- name: "Checkout googletest"
uses: actions/checkout@v3
with:
repository: google/googletest
path: "googletest"

- name: Windows - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
id: windows-gcc-1_83-x86
with:
boost_version: 1.83.0
platform: windows
boost_install_dir: C:\runner
toolset: msvc
arch: x86
cache: true

- name: "Build capicxx-core-runtime"
run: |
cmake -S capicxx-core-runtime -B build-core-runtime -D BOOST_ROOT=C:\runner\boost -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}\install
cmake --build build-core-runtime --target install
- name: "Build vsomeip"
run: |
cmake -S vsomeip -B build-vsomeip -D GTEST_ROOT=${{ runner.workspace }}\capicxx-someip-runtime\googletest -D BOOST_ROOT=C:\runner\boost -D CMAKE_INSTALL_PREFIX=${{ runner.workspace }}\install
cmake --build build-vsomeip --target install
- name: "Build capicxx-someip-runtime"
run: |
cmake -B build-someip-runtime -D GTEST_ROOT=${{ runner.workspace }}\capicxx-someip-runtime\googletest -D BOOST_ROOT=C:\runner\boost -D CMAKE_PREFIX_PATH=${{ runner.workspace }}\install .
cmake --build build-someip-runtime
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ else()
MESSAGE( STATUS "Boost was not found!")
endif()
include_directories( ${Boost_INCLUDE_DIR} )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4503")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 -D_CRT_SECURE_NO_WARNINGS /wd4503")
link_directories(${Boost_LIBRARY_DIR})
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector -fasynchronous-unwind-tables -fno-omit-frame-pointer -DCOMMONAPI_INTERNAL_COMPILATION -D_GLIBCXX_USE_NANOSLEEP -DBOOST_LOG_DYN_LINK -pthread -fvisibility=hidden")
Expand Down
4 changes: 4 additions & 0 deletions include/CommonAPI/SomeIP/OutputStream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,11 @@ class OutputStream: public CommonAPI::OutputStream<OutputStream> {
byte_t raw[sizeof(Type_)];
} value;
value.typed = _value;
#ifndef _WIN32
if ((__BYTE_ORDER == __LITTLE_ENDIAN) != isLittleEndian_) {
#else
if (!isLittleEndian_) {
#endif
byte_t reordered[sizeof(Type_)];
byte_t *source = &value.raw[sizeof(Type_) - 1];
byte_t *target = reordered;
Expand Down

0 comments on commit ddc7e03

Please sign in to comment.