extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-24 17:03:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch to vendored easylogging

Browse Source
This commit is contained in:
Valient Gough 2017-08-05 23:20:33 -07:00
parent 24a8314659
commit d1e14b4ac8
No known key found for this signature in database
GPG Key ID: 33C65E29813C14DF
19 changed files with 53 additions and 7579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -36,10 +36,10 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0)
else () else ()
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
message ("** Assuming that GNU CXX uses -std=c++11 flag for C++11 compatibility.") message ("** Assuming that GNU CXX uses -std=c++11 flag for C++11 compatibility.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message ("** Assuming that Clang uses -std=c++11 flag for C++11 compatibility.") message ("** Assuming that Clang uses -std=c++11 flag for C++11 compatibility.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
else() else()
message ("** No CMAKE C++11 check. If the build breaks, you're on your own.") message ("** No CMAKE C++11 check. If the build breaks, you're on your own.")
endif() endif()
@ -141,22 +141,29 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.5) # Need 3.6 or abo
endif() endif()
if (USE_INTERNAL_TINYXML) if (USE_INTERNAL_TINYXML)
message("-- Using local TinyXML2 copy") message("-- Using vendored TinyXML2")
set(TINYXML_DIR vendor/github.com/leethomason/tinyxml2) set(TINYXML_DIR vendor/github.com/leethomason/tinyxml2)
set(BUILD_STATIC_LIBS ON CACHE BOOL "build static libs") set(BUILD_STATIC_LIBS ON CACHE BOOL "build static libs")
set(BUILD_SHARED_LIBS OFF CACHE BOOL "build shared libs") set(BUILD_SHARED_LIBS OFF CACHE BOOL "build shared libs")
set(BUILD_TESTS OFF CACHE BOOL "build tests") set(BUILD_TESTS OFF CACHE BOOL "build tests")
add_subdirectory(${TINYXML_DIR}) add_subdirectory(${TINYXML_DIR})
include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}/) include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}/) link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})
set(TINYXML_LIBRARIES tinyxml2) set(TINYXML_LIBRARIES tinyxml2)
else () else ()
find_package (TinyXML REQUIRED) find_package (TinyXML REQUIRED)
include_directories (${TINYXML_INCLUDE_DIR}) include_directories (${TINYXML_INCLUDE_DIR})
endif () endif ()
message("-- Using vendored easylogging++")
set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp)
set(build_static_lib ON CACHE BOOL "build static libs")
add_subdirectory(${EASYLOGGING_DIR})
include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR})
set(EASYLOGGING_LIBRARIES easyloggingpp)
set(SOURCE_FILES set(SOURCE_FILES
internal/easylogging++.cc
encfs/autosprintf.cpp encfs/autosprintf.cpp
encfs/base64.cpp encfs/base64.cpp
encfs/BlockFileIO.cpp encfs/BlockFileIO.cpp
@ -194,6 +201,7 @@ target_link_libraries(encfs
${FUSE_LIBRARIES} ${FUSE_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${TINYXML_LIBRARIES} ${TINYXML_LIBRARIES}
${EASYLOGGING_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${Intl_LIBRARIES} ${Intl_LIBRARIES}
) )

2
encfs/BlockNameIO.cpp
View File

@ -30,7 +30,7 @@
#include "Interface.h" #include "Interface.h"
#include "NameIO.h" #include "NameIO.h"
#include "base64.h" #include "base64.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include "intl/gettext.h" #include "intl/gettext.h"
namespace encfs { namespace encfs {

2
encfs/CipherFileIO.cpp
View File

@ -20,7 +20,7 @@
#include "CipherFileIO.h" #include "CipherFileIO.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cerrno> #include <cerrno>
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>

2
encfs/ConfigVar.cpp
View File

@ -20,7 +20,7 @@
#include "ConfigVar.h" #include "ConfigVar.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cstring> #include <cstring>
#include "Error.h" #include "Error.h"

2
encfs/Context.cpp
View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <utility> #include <utility>
#include "Context.h" #include "Context.h"

2
encfs/DirNode.cpp
View File

@ -35,7 +35,7 @@
#include <sys/fsuid.h> #include <sys/fsuid.h>
#endif #endif
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cstring> #include <cstring>
#include <utility> #include <utility>

2
encfs/Error.h
View File

@ -3,7 +3,7 @@
// Provides compatibility with RLog's rAssert, which throws an Error exception. // Provides compatibility with RLog's rAssert, which throws an Error exception.
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <stdexcept> #include <stdexcept>
namespace encfs { namespace encfs {

2
encfs/FileUtils.cpp
View File

@ -25,7 +25,7 @@
#define _BSD_SOURCE // pick up setenv on RH7.3 #define _BSD_SOURCE // pick up setenv on RH7.3
#define _DEFAULT_SOURCE // Replaces _BSD_SOURCE #define _DEFAULT_SOURCE // Replaces _BSD_SOURCE
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cctype> #include <cctype>
#include <cerrno> #include <cerrno>
#include <cstdio> #include <cstdio>

2
encfs/MACFileIO.cpp
View File

@ -20,7 +20,7 @@
#include "MACFileIO.h" #include "MACFileIO.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>
#include <sys/stat.h> #include <sys/stat.h>

2
encfs/NameIO.cpp
View File

@ -20,7 +20,7 @@
#include "NameIO.h" #include "NameIO.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cstring> #include <cstring>
// for static build. Need to reference the modules which are registered at // for static build. Need to reference the modules which are registered at
// run-time, to ensure that the linker doesn't optimize them away. // run-time, to ensure that the linker doesn't optimize them away.

2
encfs/RawFileIO.cpp
View File

@ -21,7 +21,7 @@
#ifdef linux #ifdef linux
#define _XOPEN_SOURCE 500 // pick up pread , pwrite #define _XOPEN_SOURCE 500 // pick up pread , pwrite
#endif #endif
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cerrno> #include <cerrno>
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>

2
encfs/SSL_Cipher.cpp
View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cstring> #include <cstring>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/err.h> #include <openssl/err.h>

2
encfs/StreamNameIO.cpp
View File

@ -20,7 +20,7 @@
#include "StreamNameIO.h" #include "StreamNameIO.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <cstring> #include <cstring>
#include <utility> #include <utility>

2
encfs/encfs.cpp
View File

@ -41,7 +41,7 @@
#include <attr/xattr.h> #include <attr/xattr.h>
#endif #endif
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <functional> #include <functional>
#include <string> #include <string>
#include <vector> #include <vector>

2
encfs/encfs.h
View File

@ -21,7 +21,7 @@
#ifndef _encfs_incl_ #ifndef _encfs_incl_
#define _encfs_incl_ #define _encfs_incl_
#include "internal/easylogging++.h" #include "easylogging++.h"
#include <fuse.h> #include <fuse.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

2
encfs/test.cpp
View File

@ -38,7 +38,7 @@
#include "NameIO.h" #include "NameIO.h"
#include "Range.h" #include "Range.h"
#include "StreamNameIO.h" #include "StreamNameIO.h"
#include "internal/easylogging++.h" #include "easylogging++.h"
#define NO_DES #define NO_DES
#include <openssl/ssl.h> #include <openssl/ssl.h>

2979
internal/easylogging++.cc
View File

File diff suppressed because it is too large Load Diff

4579
internal/easylogging++.h
View File

File diff suppressed because it is too large Load Diff

24
vendor/README.md vendored Normal file
View File

@ -0,0 +1,24 @@
# Vendored Packages
Some external dependencies are vendored here. Use
[git-vendor](https://github.com/brettlangdon/git-vendor) to view,
add, or update vendored packages.
For example:
```sh
$ git-vendor list
easylogging@master:
name: easylogging
dir: vendor/github.com/muflihun/easyloggingpp
repo: https://github.com/muflihun/easyloggingpp
ref: master
commit: e2b86551a5ba1d63b21b57a2bae1ddb0b0e5135e
tinyxml2@master:
name: tinyxml2
dir: vendor/github.com/leethomason/tinyxml2
repo: https://github.com/leethomason/tinyxml2.git
ref: master
commit: 1979f3c87e68f489c7f6d88532aae4d76d9d3a78
```