Merge pull request #5 from BestITUserEUW/feature/explicit-exports-msvc

Feature/explicit exports msvc

Author: BestITUserEUW

.github/workflows/linux.yaml

@@ -66,8 +66,12 @@ jobs:
         include:
           - name: "ASan"
             extra-flags: "-DORYX_CHRON_SANITIZE_ADDRESS=ON"
+          - name: "TSan"
+            extra-flags: "-DORYX_CHRON_SANITIZE_THREAD=ON" # Not doing much right now
           - name: "Optimized Build"
             extra-flags: "-DCMAKE_CXX_FLAGS=-O3"
+          - name: "Shared Build"
+            extra-flags: "-DORYX_CHRON_BUILD_SHARED_LIBS=ON"
 
     name: "${{ github.job }} ${{ matrix.name }}"
     runs-on: ubuntu-latest

.github/workflows/windows.yaml

@@ -2,29 +2,33 @@ name: windows
 
 on: [push, pull_request]
 
-env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-
 jobs:
   windows-msvc:
     runs-on: windows-latest
+    strategy:
+      matrix:
+        shared: [OFF, ON]
+    name: "Windows MSVC ${{ matrix.shared == 'ON' && 'shared' || 'static' }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
+
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v7
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - uses: ilammy/msvc-dev-cmd@v1
+
       - name: Compile
         run: |
-          cmake -B build -DORYX_CHRON_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release
+          cmake -B build -DORYX_CHRON_BUILD_TESTS=ON -DORYX_CHRON_BUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release
           cmake --build build
+
       - name: Run tests
-        run: |
-          .\build\Debug\chron-cpp_tests --success
+        run: .\build\Debug\chron-cpp_tests

CMakeLists.txt

@@ -29,6 +29,7 @@ endif()
 
 if (ORYX_CHRON_BUILD_SHARED_LIBS)
     add_library(${PROJECT_NAME} SHARED)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC ORYX_CHRON_BUILD_SHARED_LIBS)
     set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
 else()
     add_library(${PROJECT_NAME} STATIC)
@@ -40,6 +41,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(${PROJECT_NAME} 
         PRIVATE
             /W4
+        PUBLIC
+            $<$<BOOL:${ORYX_CHRON_BUILD_SHARED_LIBS}>:/wd4251>
     )
 else()
     target_compile_options(${PROJECT_NAME} 

include/oryx/chron/chrono_types.hpp

@@ -4,18 +4,18 @@
 #include <mutex>
 #include <chrono>
 
-#include <oryx/chron/traits.hpp>
-#include <oryx/chron/chrono_types.hpp>
+#include "common.hpp"
+#include "traits.hpp"
 
 namespace oryx::chron {
 
-class UTCClock {
+class ORYX_CHRON_API UTCClock {
 public:
     auto Now() const -> TimePoint { return Clock::now(); }
     auto UtcOffset(TimePoint) const -> std::chrono::seconds { return std::chrono::seconds(0); }
 };
 
-class LocalClock {
+class ORYX_CHRON_API LocalClock {
 public:
     auto Now() const -> TimePoint {
         auto now = Clock::now();
@@ -25,7 +25,7 @@ class LocalClock {
     auto UtcOffset(TimePoint now) const -> std::chrono::seconds;
 };
 
-class TzClock {
+class ORYX_CHRON_API TzClock {
 public:
     auto Now() const -> TimePoint {
         auto now = Clock::now();

include/oryx/chron/clock.hpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <chrono>
+
+#ifdef ORYX_CHRON_BUILD_SHARED_LIBS
+    #ifdef _WIN32
+        #ifdef chron_cpp_EXPORTS
+            #define ORYX_CHRON_API __declspec(dllexport)
+        #else
+            #define ORYX_CHRON_API __declspec(dllimport)
+        #endif
+    #else
+        #define ORYX_CHRON_API __attribute__((visibility("default")))
+    #endif
+#else
+    #define ORYX_CHRON_API
+#endif
+
+namespace oryx::chron {
+
+using Clock = std::chrono::system_clock;
+using TimePoint = std::chrono::time_point<Clock>;
+using Duration = Clock::duration;
+
+}  // namespace oryx::chron

include/oryx/chron/common.hpp

@@ -3,8 +3,6 @@
 #include <cstdint>
 #include <set>
 
-#include <oryx/chron/details/to_underlying.hpp>
-
 namespace oryx::chron::details {
 
 namespace traits {

include/oryx/chron/details/any_of.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "traits.hpp"
+
+namespace oryx::chron {
+
+class NullMutex {
+public:
+    void lock() noexcept {}
+    void unlock() noexcept {}
+};
+
+static_assert(traits::BasicLockable<NullMutex>);
+
+}  // namespace oryx::chron

include/oryx/chron/details/null_mutex.hpp

@@ -1,21 +1,23 @@
 #pragma once
 
-#include <optional>
 #include <mutex>
+#include <string_view>
+#include <optional>
+#include <functional>
 #include <algorithm>
 
-#include <oryx/chron/details/null_mutex.hpp>
-
+#include "common.hpp"
 #include "chron_data.hpp"
 #include "traits.hpp"
+#include "null_mutex.hpp"
 
 namespace oryx::chron {
 
-struct ExpressionParser {
+struct ORYX_CHRON_API ExpressionParser {
     auto operator()(std::string_view cron_expression) const -> std::optional<ChronData>;
 };
 
-template <traits::BasicLockable MutexType = details::NullMutex>
+template <traits::BasicLockable MutexType = NullMutex>
 class CachedExpressionParser : ExpressionParser {
 public:
     using Pair = std::pair<std::size_t, ChronData>;