Skip to content

Add github action to ensure build [VC2022] #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cielavenir wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add github action to ensure build [VC2022] #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
045f81e
Add github action to ensure build
Dec 8, 2023
ff29a3e
Fix msvc compilation
Dec 8, 2023
9e986d7
Merge remote-tracking branch 'origin/master' into githubaction
Apr 30, 2024
518e7c5
Merge remote-tracking branch 'origin/master' into githubaction
Feb 3, 2026
c640c64
Use ubuntu22
Feb 3, 2026
14a5f61
Use c++17
Feb 3, 2026
1ce7ca1
Update common.h
cielavenir Feb 3, 2026
d647858
Update build_windows.yaml
cielavenir Feb 3, 2026
795faa7
Update mujincontrollerclient.h
cielavenir Feb 3, 2026
4973027
Update build_windows.yaml
cielavenir Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/build_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build Linux

on:
push:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
architecture: ["x64"]

steps:
- uses: actions/checkout@v3
- name: Set up APT
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' }}
run: |
sudo apt-get update -y
sudo apt-get -y install g++ cmake-data cmake ninja-build libzmq3-dev liblog4cxx-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev libboost-program-options-dev libcurl4-openssl-dev
- name: Install RapidJSON
run: |
set -e
git clone https://github.com/Tencent/rapidjson.git && mkdir rapidjson/build
cd rapidjson/build
# there are no stable version available
cmake .. -GNinja -DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
ninja -j4 && sudo ninja install
cd ../..
- name: Install
run: |
set -e
mkdir -p build
cd build
cmake .. -GNinja -DOPT_SAMPLES=OFF -DOPT_BUILD_TESTS=OFF
ninja -j4 && sudo ninja install
cd ..
48 changes: 48 additions & 0 deletions .github/workflows/build_windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Windows

on:
push:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2022]
architecture: ["x64"]

steps:
- uses: actions/checkout@v3
- uses: microsoft/[email protected]
- name: Set up Boost
run: |
choco install boost-msvc-14.3 -f -y
- name: Set up curl
run: |
curl -O -L https://curl.se/windows/dl-8.5.0_1/curl-8.5.0_1-win64-mingw.zip
7z x -y curl-8.5.0_1-win64-mingw.zip
- name: Install RapidJSON
run: |
git clone https://github.com/Tencent/rapidjson.git && mkdir rapidjson\build
cd rapidjson\build
# there are no stable version available
# but take the last version without -targets.cmake
git checkout 516d0473949fdcf0a6dc9fbb40fa92b3b85db184
cmake .. -G 'Visual Studio 17 2022' -A x64 -DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
msbuild ALL_BUILD.vcxproj /p:Configuration=Release
cd ..\..
- name: Install libzmq
Copy link

@hemangandhi hemangandhi Apr 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're maintaining this approach, should we also get rid of the msvc_binaries?

run: |
git clone https://github.com/zeromq/libzmq.git && mkdir libzmq\build
cd libzmq\build
git checkout v4.3.5
cmake .. -G 'Visual Studio 17 2022' -A x64 -DBUILD_TESTS=OFF
msbuild ALL_BUILD.vcxproj /p:Configuration=Release
cd ..\..
- name: Install
run: |
mkdir -p build
cd build
cmake .. -G 'Visual Studio 17 2022' -A x64 -DCMAKE_CXX_STANDARD=17 "-DZeroMQ_DIR=${PWD}\..\libzmq\build" "-DCURL_INCLUDE_DIR=${PWD}\..\curl-8.5.0_1-win64-mingw\include" "-DCURL_LIBRARY=${PWD}\..\curl-8.5.0_1-win64-mingw\lib\libcurl.dll.a" -DCMAKE_CONFIGURATION_TYPES=Release -DOPT_SAMPLES=OFF -DOPT_BUILD_TESTS=OFF
msbuild ALL_BUILD.vcxproj /p:Configuration=Release
cd ..
1 change: 1 addition & 0 deletions include/mujincontrollerclient/mujincontrollerclient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#ifdef _MSC_VER

#define NOMINMAX
#pragma warning(disable:4251)// needs to have dll-interface to be used by clients of class
#pragma warning(disable:4190)// C-linkage specified, but returns UDT 'boost::shared_ptr<T>' which is incompatible with C
#pragma warning(disable:4819)//The file contains a character that cannot be represented in the current code page (932). Save the file in Unicode format to prevent data loss using native typeof
Expand Down
4 changes: 4 additions & 0 deletions include/mujincontrollerclient/mujinjson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ inline void LoadJsonValue(const rapidjson::GenericValue<Encoding, Allocator>& v,
}
}

#ifndef _MSC_VER
Copy link

@hemangandhi hemangandhi Apr 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we #include <stdint.h> instead? Based on https://stackoverflow.com/questions/13604137/definition-of-int64-t

Copy link
Author

@cielavenir cielavenir Apr 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hemangandhi The thing is, there exists a branch which supports VC2010 https://github.com/mujin/controllerclientcpp/tree/savebackup and VC2010 does not support <stdint.h>.

template <typename Encoding=rapidjson::UTF8<>, typename Allocator=rapidjson::MemoryPoolAllocator<> >
inline void LoadJsonValue(const rapidjson::GenericValue<Encoding, Allocator>& v, uint64_t& t) {
if (v.IsUint64()) {
Expand All @@ -486,6 +487,7 @@ inline void LoadJsonValue(const rapidjson::GenericValue<Encoding, Allocator>& v,
throw MujinJSONException("Cannot convert json type " + GetJsonString(v) + " to Int64");
}
}
#endif

template <typename Encoding=rapidjson::UTF8<>, typename Allocator=rapidjson::MemoryPoolAllocator<> >
inline void LoadJsonValue(const rapidjson::GenericValue<Encoding, Allocator>& v, double& t) {
Expand Down Expand Up @@ -802,10 +804,12 @@ inline void SaveJsonValue(rapidjson::GenericValue<Encoding, Allocator>& v, const
v.SetInt64(t);
}

#ifndef _MSC_VER
template <typename Encoding, typename Allocator, typename Allocator2>
inline void SaveJsonValue(rapidjson::GenericValue<Encoding, Allocator>& v, const int64_t& t, Allocator2& alloc) {
v.SetInt64(t);
}
#endif

template <typename Encoding, typename Allocator, typename Allocator2>
inline void SaveJsonValue(rapidjson::GenericValue<Encoding, Allocator>& v, const unsigned long long& t, Allocator2& alloc) {
Expand Down
1 change: 1 addition & 0 deletions src/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <curl/curl.h>

#if defined(_WIN32) || defined(_WIN64)
#define NOMINMAX
#include <windows.h>
#undef GetUserName // classes with ControllerClient::GetUserName

Expand Down
10 changes: 10 additions & 0 deletions src/mujinjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@

#include <fcntl.h>
#include <sys/stat.h>

#if defined(_WIN32)
#include <io.h>
#else
#include <unistd.h>
#endif

#if defined(_MSC_VER)
#include <BaseTsd.h>
typedef SSIZE_T ssize_t;
#endif

namespace mujinjson {

Expand Down