Enable appveyor builds. (#3)

Author: ObiWahn

.appveyor.yml

@@ -0,0 +1,41 @@
+branches:
+  only:
+    - master
+    - appveyor
+
+version: '{branch}-{build}'
+
+os:
+  - Visual Studio 2019 Preview
+
+configuration:
+  #- Debug
+  - Release
+
+skip_commits:
+  files:
+    - support/**/*
+    - .build_scripts/**/*
+
+environment:
+  matrix:
+    - GENERATOR: Visual Studio 16 2019
+
+init: []
+
+install:
+  - git submodule update --init --recursive
+  - cd external_libs
+  - cd ..
+
+before_build:
+  - if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")
+  - md build_dir
+  - cd build_dir
+  - cmake -Wno-dev -DEXTLOG_TESTS=ON -DEXTLOG_EXAMPLES=ON --config "%CONFIGURATION%" -G "%GENERATOR%" ..
+
+build_script:
+  - cmake --build . --config "%CONFIGURATION%"
+
+test_script:
+  - ctest -C "%CONFIGURATION%" --output-on-failure

CMakeLists.txt

@@ -61,7 +61,7 @@ set(ext_common_compile_definitions
 )
 
 
-add_library(ext-logging ${ext-logging-source} ${ext-logging-header})
+add_library(ext-logging SHARED ${ext-logging-source} ${ext-logging-header})
 target_include_directories(ext-logging PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
@@ -122,9 +122,9 @@ if(COMMAND ext_install)
 endif()
 
 add_custom_target(
-    update_logging_version ALL
+    ext_logging_version_update ALL
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMAND ${CMAKE_COMMAND}
-                -D "EXT_GIT_VERSION_OUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/ext_version.hpp"
+                -D "EXT_GIT_VERSION_OUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/ext_logging_version.hpp"
                 -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ext_script_git_version.cmake"
 )

README.rst

@@ -1,7 +1,9 @@
-|travis|
+|travis| |appveyor|
 
 Simple Logging Library
 ======================
+Known Issues:
+ - Fails on Windows/VC - `init_seg` problem (used to work)
 
 Advantages:
  - Has variable and constexpr activation level checks. The constexpr check
@@ -26,3 +28,6 @@ Disadvantages:
 
 .. |travis| image:: https://travis-ci.org/extcpp/logging.svg?branch=master
    :target: https://travis-ci.org/extcpp/logging
+
+.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/7evseehi5ejvbgpc/branch/master?svg=true
+   :target: https://ci.appveyor.com/project/obiwahn/logging

external_libs/ext-basics

@@ -83,9 +83,16 @@
 #define EXT_LOGCONST2(id, macro_level_) _EXT_LOG_INTERNAL_ADD_PREFIX_CONST(id, no_topic, macro_level_, true)
 #define EXT_LOGCONST1(id) _EXT_LOG_INTERNAL_ADD_PREFIX_CONST(id, no_topic, EXT_LOGGING_DEFAULT_LEVEL, true)
 
-#define EXT_LOGCONST(...)                                                                       \
-    _EXT_LOG_SELECT5TH_PARAMETER(__VA_ARGS__, EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
-    (__VA_ARGS__)
+#ifdef EXT_COMPILER_VC
+    #define _EXT_LOG_EXPAND(x) x
+    #define EXT_LOGCONST(...)                                                                                        \
+        _EXT_LOG_SELECT5TH_PARAMETER(_EXT_LOG_EXPAND(__VA_ARGS__), EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
+        (_EXT_LOG_EXPAND(__VA_ARGS__))
+#else
+    #define EXT_LOGCONST(...)                                                                       \
+        _EXT_LOG_SELECT5TH_PARAMETER(__VA_ARGS__, EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
+        (__VA_ARGS__)
+#endif // EXT_COMPILER_VC
 
 #define EXT_DEV _EXT_LOG_INTERNAL_ADD_PREFIX_CONST("@@@@", dev, EXT_LOGGING_DEFAULT_LEVEL, true)
 #define EXT_DEV_IF_CONST(cond_) _EXT_LOG_INTERNAL_ADD_PREFIX_CONST("@@@@", dev, EXT_LOGGING_DEFAULT_LEVEL, cond_)

include/ext/logging.hpp

@@ -61,7 +61,7 @@ struct logtopic {
 } // namespace _detail
 
 namespace configuration {
-extern std::map<int, _detail::logtopic*> topics;
+EXT_EXPORT_VC extern std::map<int, _detail::logtopic*> topics;
 // logging is configured globally via these variables
 // configure logging before you start logging!!!
 EXT_EXPORT_VC extern bool prefix_newline;

include/ext/logging/definitions.hpp

@@ -34,8 +34,6 @@ bool configuration::vim{false};
 bool configuration::gdb{false};
 #endif
 std::ostream* configuration::stream = &std::cout;
-
-EXT_INIT_PRIORITY_VC_LOW
 /////////////////////////////////////////////////////////////////////////////
 
 // the logger is a class that creates the log stream and writes
@@ -55,15 +53,12 @@ _detail::logger::logger(
     }
 
     if (configuration::gdb) {
-    #ifndef _WIN32
-        _ss << "# break " << ext::util::filename(file_name) << ":" << line_no << "\n";
-    #endif
+        _ss << "# break " << ext::util::filename(file_name, true, true) << ":" << line_no << "\n";
     }
 #endif
 
-    if (true) {
-        _ss << "[" << id << "] ";
-    }
+    // id
+    _ss << "[" << id << "] ";
     // log level
     _ss << level_to_str(level_);
 
@@ -75,11 +70,7 @@ _detail::logger::logger(
     // log filename
     if (configuration::filename) {
             _ss << " "
-#ifndef _WIN32
-                << ext::util::filename(file_name)
-#else
-                << file_name
-#endif
+                << ext::util::filename(file_name, true, true)
                 << ":" << line_no;
     }
 

src/logging.cpp

@@ -23,7 +23,7 @@ struct LoggingTest : public ::testing::Test {
 #ifdef EXT_LOGGING_ENABLE_VIM_GDB
         configuration::gdb = false;
         configuration::vim = false;
-#endif
+#endif // EXT_LOGGING_ENABLE_VIM_GDB
         configuration::prefix_newline = false;
         configuration::append_newline = true;
         configuration::filename = true;
@@ -37,9 +37,13 @@ struct LoggingTest : public ::testing::Test {
     }
 
     std::string path() {
+#ifdef EXT_COMPILER_VC
+        return "logging.cpp";
+#else
         auto path = std::filesystem::current_path().parent_path().parent_path().parent_path() / "logging" / "tests" /
                     "logging.cpp";
         return path.string();
+#endif // EXT_COMPILER_VC
     };
 
     std::string line() {
@@ -57,6 +61,7 @@ TEST_F(LoggingTest, logging_dev) {
     compare("[@@@@] warning (development) logging.cpp:" + line() + " in TestBody(): 'development'\n");
 }
 
+#ifndef EXT_COMPILER_VC
 TEST_F(LoggingTest, logging_dev_if_static) {
     _line = __LINE__ + 1;
     ASSERT_NO_THROW(EXT_DEV_IF_CONST(true) << "development");
@@ -151,7 +156,7 @@ TEST_F(LoggingTest, logging_gdb_vim) {
 #ifdef EXT_LOGGING_ENABLE_VIM_GDB
     configuration::gdb = true;
     configuration::vim = true;
-#endif
+#endif // EXT_LOGGING_ENABLE_VIM_GDB
 
     _line = __LINE__ + 1;
     ASSERT_NO_THROW(EXT_LOG("babe") << "cafe?");
@@ -160,7 +165,7 @@ TEST_F(LoggingTest, logging_gdb_vim) {
 #ifdef EXT_LOGGING_ENABLE_VIM_GDB
         "# vim "s + path() + " +" + line() + "\n"
         "# break logging.cpp:" + line() + "\n"
-#endif
+#endif // EXT_LOGGING_ENABLE_VIM_GDB
         "[babe] warning logging.cpp:"s +
         line() + " in TestBody(): 'cafe?'\n");
 }
@@ -174,6 +179,7 @@ TEST_F(LoggingTest, logging_prepend_newline) {
     ASSERT_NO_THROW(EXT_LOG("babe") << "2cafe?");
     compare("\n[babe] warning logging.cpp:" + line() + " in TestBody(): '2cafe?'");
 }
+#endif // EXT_COMPILER_VC
 
 // does not die
 #ifndef EXT_COMPILER_VC
@@ -184,6 +190,7 @@ TEST_F(LoggingDeathTest, fatal) {
 }
 #endif // EXT_COMPILER_VC
 
+#ifndef EXT_COMPILER_VC
 TEST_F(LoggingTest, change_all_levels) {
     using namespace ext::logging;
 
@@ -229,3 +236,4 @@ TEST_F(LoggingTest, levels_to_string) {
     EXPECT_STREQ(_detail::level_to_str(level::trace).c_str(), "trace");
     EXPECT_STREQ(_detail::level_to_str(static_cast<level>(1337)).c_str(), "unknown");
 }
+#endif // EXT_COMPILER_VC