kazatsuyu · yumetodo · Mar 4, 2018 · Mar 4, 2018 · Mar 4, 2018 · Mar 4, 2018
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,13 @@ RelWithDebInfo/
 *.sublime-project
 
 # CodeBlocks
-*.cbp
+*.cbp
+### https://raw.github.com/github/gitignore/1a9f616ce525987555d43c72d59eb830d1856bd7/Global/VisualStudioCode.gitignore
+
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+# other
+install*/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,10 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10.0)
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD 17) # C++17...
+set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
 
 project(fafnir VERSION 1.0.1.0)
 
-if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang|GNU|Intel")
-    set(CMAKE_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS}")
-elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
-    set(CMAKE_CXX_FLAGS "/std:c++17 ${CMAKE_CXX_FLAGS}")
-endif()
-
 enable_testing()
 
 add_subdirectory(src)

diff --git a/cmake/FindIutest.cmake b/cmake/FindIutest.cmake
@@ -0,0 +1,34 @@
+# - Try to find iutest include dirs
+#
+# Usage of this module as follows:
+#
+#     find_package(IUTEST)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+#  IUTEST_ROOT_DIR          Set this variable to the root installation of
+#                            iutest if the module has problems finding the
+#                            proper installation path.
+#
+# Variables defined by this module:
+#
+#  IUTEST_FOUND             System has iutest, include dirs found
+#  IUTEST_INCLUDE_DIR       The iutest include directories.
+
+find_path(IUTEST_ROOT_DIR
+        NAMES include/iutest.hpp
+        HINTS 
+            ENV IUTEST_ROOT
+        )
+
+find_path(IUTEST_INCLUDE_DIR
+        NAMES iutest.hpp
+        HINTS 
+            ${IUTEST_ROOT_DIR}/include
+        )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(IUTEST DEFAULT_MSG
+    IUTEST_INCLUDE_DIR
+)
diff --git a/scripts/install.ps1 b/scripts/install.ps1
@@ -36,7 +36,7 @@ $VSInstallDir = Get-Registry Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Vis
 if (!$VSInstallDir) {
     $VSInstallDir = Get-Registry Registry::HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\SxS\VS7 "15.0"
 }
-$LLVMDir = Get-Registry Registry::HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM -ErrorAction 
+$LLVMDir = Get-Registry Registry::HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM -ErrorAction
 if (!$LLVMDir) {
     $LLVMDir = Get-Registry Registry::HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\LLVM\LLVM
 }
@@ -78,11 +78,11 @@ do {
             break
         }
     }
-    
+
     if ($reset -or $ToolsetName -eq "") {
         $prompt = "What is the clang toolset name?"
         if ($reset) {
-            $prompt += "(current: $ToolsetName)" 
+            $prompt += "(current: $ToolsetName)"
         } else {
             $prompt += " (default: v100_clang_fafnir)"
         }
@@ -93,11 +93,11 @@ do {
             $ToolsetName = $tmp
         }
     }
-    
+
     if ($reset -or ($ClangClToolsetName -eq "" -and (Read-Host "Do you want to install a toolset for clang-cl? (y/N)") -match "y|yes")) {
         $prompt = "What is the clang-cl toolset name?"
         if ($reset) {
-            $prompt += "(current: $ClangClToolsetName)" 
+            $prompt += "(current: $ClangClToolsetName)"
         } else {
             $prompt += " (default: fafnir_clang_cl)"
         }
@@ -108,7 +108,7 @@ do {
             $ClangClToolsetName = $tmp
         }
     }
-    
+
     ""
     "=== Install configuration ==="
     "* LLVM install directory: $LLVMDirectory"
@@ -133,20 +133,28 @@ function Install ($arch) {
         return
     }
     $targetPath = "$platformDir\$ToolsetName"
-    
+
     if (!(Test-Path $targetPath)) {
         New-Item -ItemType Directory $targetPath
     }
    Copy-Item "$assets\clang\Toolset.targets" "$targetPath"
     $content = (Get-Content -Encoding UTF8 "$assets\clang\Toolset.props") -replace "{{LLVMDir}}",$LLVMDirectory
     Set-Content "$targetPath\Toolset.props" $content -Encoding UTF8
-
-    if (!(Test-Path "$targetPath\bin")) {
-        New-Item -ItemType Directory "$targetPath\bin"
+
+    $targetBinPath = "$targetPath\bin"
+    if (!(Test-Path $targetBinPath)) {
+        New-Item -ItemType Directory $targetBinPath
+    }
+    Copy-Item $bin $targetBinPath
+    Copy-Item $dll $targetBinPath
+    $mingwDLLs = @("libstdc++-6.dll", "libwinpthread-1.dll", "libgcc_s_seh-1.dll", "libgcc_s_dw2-1.dll")
+    foreach ($mingwDLL in $mingwDLLs) {
+        $mingwDLLFullPath = "${rootDir}\bin\${mingwDLL}"
+        if (Test-Path $mingwDLLFullPath) {
+            Copy-Item $mingwDLLFullPath $targetBinPath
+        }
     }
-    Copy-Item $bin "$targetPath\bin"
-    Copy-Item $dll "$targetPath\bin"
-    Set-Content -Path "$targetPath\bin\.target" "$LLVMDirectory\bin\clang.exe" -Encoding UTF8 -NoNewline
+    Set-Content -Path "${targetBinPath}\.target" "$LLVMDirectory\bin\clang.exe" -Encoding UTF8 -NoNewline
 
     if ($ClangClToolsetName -ne "") {
         $targetPath = "$platformDir\$ClangClToolsetName"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,32 @@
+cmake_minimum_required(VERSION 3.10.0)
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD 17) # C++17...
+set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
 add_executable(clang main.cpp custom_api.cpp)
 add_library(fafnir_injection SHARED dll_main.cpp custom_api.cpp)
+# remove "lib" prefix
+set_target_properties(fafnir_injection PROPERTIES PREFIX "")
 
 target_link_libraries(fafnir_injection ImageHlp)
+if(CMAKE_COMPILER_IS_GNUCXX)
+    target_link_libraries(clang stdc++fs)
+    target_link_libraries(fafnir_injection stdc++fs)
+endif()
+if(MINGW)
+    message(STATUS "Installing system-libraries: MinGW DLLs.")
+    get_filename_component(Mingw_Path ${CMAKE_CXX_COMPILER} PATH)
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${Mingw_Path}/libstdc++-6.dll ${Mingw_Path}/libwinpthread-1.dll)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        # The exception model of msys2-mingw64-gcc is SEH
+        list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${Mingw_Path}/libgcc_s_seh-1.dll)
+    else()
+        # The exception model of msys2-mingw64-gcc is DWARF-2
+        list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${Mingw_Path}/libgcc_s_dw2-1.dll)
+    endif()
+    include(InstallRequiredSystemLibraries)
+    install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION bin COMPONENT System)
+endif()
+
 target_compile_definitions(fafnir_injection PRIVATE FAFNIR_DLL)
 
 install(TARGETS clang RUNTIME DESTINATION bin)

diff --git a/src/custom_api.cpp b/src/custom_api.cpp
@@ -1,3 +1,4 @@
+#include "set_winver.hpp"
 #include <fstream>
 
 #include "fafnir.hpp"
@@ -143,7 +144,7 @@ BOOL WINAPI set_file_information_by_handle(
 ) {
     if (information_class == FileRenameInfo) {
         auto& info = *static_cast<PFILE_RENAME_INFO>(file_information);
-        std::ofstream(info.FileName, std::ios::ate | std::ios::binary);
+        std::ofstream(fs::path(info.FileName).string(), std::ios::ate | std::ios::binary);
     }
     return orig_SetFileInformationByHandle(file, information_class, file_information, size);
 }

diff --git a/src/dll_main.cpp b/src/dll_main.cpp
@@ -1,7 +1,8 @@
+#include "set_winver.hpp"
 #include <cstddef>
 #include <Windows.h>
 #include <TlHelp32.h>
-#include <Dbghelp.h> 
+#include <Dbghelp.h>
 
 #include "custom_api.hpp"
 #include "fafnir.hpp"

diff --git a/src/fafnir.hpp b/src/fafnir.hpp
@@ -1,19 +1,19 @@
 #ifndef FAFNIR_FAFNIR_HPP
 #define FAFNIR_FAFNIR_HPP
 
-#include <filesystem>
+#include "filesystem.hpp"
 #include <memory>
 
 #include <Windows.h>
 
 namespace fafnir {
 
-inline std::experimental::filesystem::path get_bin_path() {
+inline fs::path get_bin_path() {
     auto module = GetModuleHandleW(L"fafnir_injection.dll");
     for(std::vector<wchar_t> buf(256);;buf.resize(buf.size() * 2)) {
         std::size_t size = GetModuleFileNameW(module, buf.data(), buf.size());
         if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-            std::experimental::filesystem::path path{buf.begin(), buf.begin() + size};
+            fs::path path{buf.begin(), buf.begin() + size};
             return path.parent_path();
         }
     }

diff --git a/src/filesystem.hpp b/src/filesystem.hpp
@@ -0,0 +1,10 @@
+#ifndef FAFNIR_FILESYSTEM_HPP
+#define FAFNIR_FILESYSTEM_HPP
+
+#ifdef __GNUC__
+#   include <experimental/filesystem>
+#else
+#   include <filesytsem>
+#endif
+namespace fs = std::experimental::filesystem;
+#endif //FAFNIR_FILESYSTEM_HPP
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,7 @@
+#include "set_winver.hpp"
 #include <string_view>
 #include <iostream>
-#include <filesystem>
+#include "filesystem.hpp"
 #include <fstream>
 #include <vector>
 #include <sstream>
@@ -61,7 +62,7 @@ file_type get_file_type(std::istream& in) noexcept {
 }
 
 template<auto f>
-std::experimental::filesystem::path read_path_impl(std::istream& in) noexcept {
+fs::path read_path_impl(std::istream& in) noexcept {
     std::ostringstream ss;
 
     for (auto ch = f(in); ch != std::char_traits<char32_t>::eof(); ch = f(in)) {
@@ -73,7 +74,7 @@ std::experimental::filesystem::path read_path_impl(std::istream& in) noexcept {
             reinterpret_cast<const wchar_t*>(str.data() + str.size())};
 }
 
-std::experimental::filesystem::path read_path(std::istream& in) noexcept {
+fs::path read_path(std::istream& in) noexcept {
     auto type = get_file_type(in);
     if (type == file_type::utf8_with_bom) {
         in.seekg(3);
@@ -90,14 +91,14 @@ int main() {
     using namespace fafnir;
 
     auto path = get_bin_path() / ".target";
-    if (!std::experimental::filesystem::exists(path)) {
+    if (!fs::exists(path)) {
         std::wcerr << "error: " << path << " doesn't exist." << std::endl;
         return 1;
     }
-    std::ifstream target(path, std::ios::binary);
+    std::ifstream target(path.string(), std::ios::binary);
     auto target_path = read_path(target);
     target.close();
-    if (!std::experimental::filesystem::exists(target_path)) {
+    if (!fs::exists(target_path)) {
         std::wcerr << "error: " << target_path << " doesn't exist." << std::endl;
         return 1;
     }

diff --git a/src/set_winver.hpp b/src/set_winver.hpp
@@ -0,0 +1,11 @@
+#ifndef FAFNIR_SET_WINVER_HPP
+#define FAFNIR_SET_WINVER_HPP
+#ifdef _WIN32_WINNT
+#   if _WIN32_WINNT < 0x0600
+#       error "target OS must be Windows Vista or higher"
+#   endif
+#endif
+#ifdef __GNUC__
+#   define _WIN32_WINNT 0x0600 // Windows Vista
+#endif
+#endif //FAFNIR_SET_WINVER_HPP
diff --git a/submodules/iutest b/submodules/iutest
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,18 @@
+cmake_minimum_required(VERSION 3.10.0)
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD 17) # C++17...
+set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
 
-add_executable(unicode_test unicode_test.cpp)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+if(EXISTS ${CMAKE_SOURCE_DIR}/submodules/iutest/include)
+    set(IUTEST_ROOT_DIR ${CMAKE_SOURCE_DIR}/submodules/iutest)
+endif()
+include(FindIutest)
+find_package(IUTEST)
 
+add_executable(unicode_test unicode_test.cpp)
+include_directories(${IUTEST_INCLUDE_DIR})
+target_link_libraries(unicode_test Ws2_32)
 add_test(
     NAME unicode_test
     COMMAND $<TARGET_FILE:unicode_test>

diff --git a/tests/unicode_test.cpp b/tests/unicode_test.cpp
@@ -1,5 +1,5 @@
 #include "../src/unicode.hpp"
-#include "../submodules/iutest/include/iutest.hpp"
+#include <iutest.hpp>
 #include <sstream>
 #include <string_view>
+2 −1		.gitattributes
+12 −0		CHANGES
+1 −1		README.md
+2 −0		docs/.gitignore
+1 −1		docs/Doxyfile
+1 −1		docs/cover.html
+49 −6		docs/gource/Makefile
+3 −2		docs/wandbox.html
+3 −3		include/gtest/switch/iutest_switch_assert.hpp
+3 −3		include/gtest/switch/iutest_switch_assume.hpp
+3 −3		include/gtest/switch/iutest_switch_expect.hpp
+3 −3		include/gtest/switch/iutest_switch_inform.hpp
+41 −9		include/iutest.hpp
+12 −1		include/iutest_expression_assertion.hpp
+2 −2		include/iutest_matcher.hpp
+7 −2		include/iutest_ver.hpp
+3 −0		test/CommonMakefile.in
+22 −3		test/expression_assertion_tests.cpp
+1 −1		test/unit_tests.cpp