Fixed issue #70: Merge Win32Clipboard library dependency into ShellAnything.

Author: end2endzone

CHANGES

@@ -11,6 +11,7 @@ Changes for 0.5.0
 * Fixed issue #61: Support for WIX installer.
 * Fixed issue #68: INSTALL.md mentions that 'application does not provides pre-build binaries' which is incorrect.
 * Fixed issue #69: Compilation of PACKAGE target fails if Wix Toolset is not installed on system.
+* Fixed issue #70: Merge Win32Clipboard library dependency into ShellAnything.
 
 
 Changes for 0.4.0

INSTALL.md

@@ -40,7 +40,6 @@ The following software must be installed on the system for compiling source code
 * [Google Logging Library v0.4.0](https://github.com/google/glog/tree/v0.4.0)
 * [TinyXML 2 v6.2.0](https://github.com/leethomason/tinyxml2/tree/6.2.0)
 * [RapidAssist v0.8.1](https://github.com/end2endzone/RapidAssist/tree/0.8.1)
-* [win32Clipboard v0.3.0](https://github.com/end2endzone/win32Clipboard/tree/0.3.0)
 * [CMake](http://www.cmake.org/) v3.4.3 (or newer)
 * (optional) [Grip (GitHub Readme Instant Preview)](https://github.com/joeyespo/grip)  v4.5.2 (or newer)
 

appveyor.yml

@@ -64,7 +64,6 @@ before_build:
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_googletest.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_tinyxml2.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_rapidassist.bat
-- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_win32Clipboard.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_glog.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_grip.bat
 

ci/appveyor/build_library.bat

@@ -9,7 +9,6 @@ if "%APPVEYOR_BUILD_FOLDER%"=="" (
 set GTEST_ROOT=%APPVEYOR_BUILD_FOLDER%\third_parties\googletest\install
 set rapidassist_DIR=%APPVEYOR_BUILD_FOLDER%\third_parties\RapidAssist\install
 set tinyxml2_DIR=%APPVEYOR_BUILD_FOLDER%\third_parties\tinyxml2\install
-set win32clipboard_DIR=%APPVEYOR_BUILD_FOLDER%\third_parties\win32Clipboard\install
 set glog_DIR=%APPVEYOR_BUILD_FOLDER%\third_parties\glog\install_dir
 set INSTALL_LOCATION=%APPVEYOR_BUILD_FOLDER%\install
 
@@ -47,7 +46,6 @@ echo.
 set GTEST_ROOT=
 set rapidassist_DIR=
 set tinyxml2_DIR=
-set win32clipboard_DIR=
 set glog_DIR=
 set INSTALL_LOCATION=
 

ci/appveyor/install_win32Clipboard.bat

@@ -24,8 +24,8 @@
 
 #include "shellanything/ActionClipboard.h"
 #include "PropertyManager.h"
+#include "Win32Clipboard.h"
 
-#include "win32clipboard/win32clipboard.h"
 #include "rapidassist/unicode.h"
 
 #pragma warning( push )
@@ -53,7 +53,7 @@ namespace shellanything
     std::wstring value_utf16 = ra::unicode::Utf8ToUnicode(value);
 
     //get clipboard handler
-    win32clipboard::Clipboard & clipboard = win32clipboard::Clipboard::GetInstance();
+    Win32Clipboard::Clipboard & clipboard = Win32Clipboard::Clipboard::GetInstance();
 
     //debug
     LOG(INFO) << "Setting clipboard to '" << value << "'.";

licenses/win32Clipboard LICENSE.txt

@@ -1,6 +1,5 @@
 find_package(rapidassist REQUIRED)
 find_package(tinyxml2 REQUIRED)
-find_package(win32clipboard REQUIRED)
 find_package(glog REQUIRED)
 
 #resource.rc
@@ -75,6 +74,8 @@ add_library(shellanything STATIC
   ErrorManager.cpp
   PropertyManager.h
   PropertyManager.cpp
+  Win32Clipboard.h
+  Win32Clipboard.cpp
 )
 
 add_library(shellext SHARED
@@ -128,7 +129,6 @@ target_include_directories(shellanything
   PRIVATE
     ${GTEST_INCLUDE_DIR}
     rapidassist
-    win32clipboard
     glog::glog
 )
 target_include_directories(shellext
@@ -138,7 +138,7 @@ target_include_directories(shellext
     rapidassist
     glog::glog
 )
-target_link_libraries(shellanything   PRIVATE ${PTHREAD_LIBRARIES} ${GTEST_LIBRARIES} rapidassist win32clipboard glog::glog)
+target_link_libraries(shellanything   PRIVATE ${PTHREAD_LIBRARIES} ${GTEST_LIBRARIES} rapidassist glog::glog)
 target_link_libraries(shellext        PRIVATE shellanything rapidassist glog::glog)
 
 # Also add Tinyxml2 include and libraries.