Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve libsyncthing 

* Update Syncthing version
* Use utilities from https://github.com/syncthing/syncthing/pull/5871
* Remove useless use_standard_filesystem()
This commit is contained in:
Martchus 2019-08-03 16:31:23 +02:00
parent 4e60153070
commit 0a2eae6542
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsyncthing/CMakeLists.txt
View File

@ -6,7 +6,7 @@ set(META_PROJECT_TYPE library)
set(META_APP_NAME "Syncthing library")
set(META_APP_DESCRIPTION "Syncthing itself, built as a shared or static library")
set(META_PROJECT_VARNAME_UPPER LIB_SYNCTHING)
set(META_SYNCTHING_VERSION "v1.2.1-rc.4-710f5c19")
set(META_SYNCTHING_VERSION "v1.2.1-rc.4-61b9f7b")
# add project files
set(HEADER_FILES interface.h)
@ -155,6 +155,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsyncthinginternal.a"
# do not use this library directly but depend on it
list(APPEND PRIVATE_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/libsyncthinginternal.a")
# add additional libraries (not sure if go build could provide this list somehow to make this more generic)
if (WIN32)
list(APPEND PRIVATE_LIBRARIES -lws2_32 -lwinmm)
@ -175,9 +176,6 @@ else ()
list(APPEND PRIVATE_INCLUDE_DIRS ${CPP_UTILITIES_INCLUDE_DIRS})
endif ()
# use std::filesystem
use_standard_filesystem()
# include modules to apply configuration
include(BasicConfig)
include(WindowsResources)

2
libsyncthing/go/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 32301c2e266a636acd6a25d5f25a7a971e43a7ca
Subproject commit a46b0ec8f7d4ee74adf5ca8350a864b9f00ec4c7

3
libsyncthing/interface.cpp
View File

@ -140,7 +140,8 @@ std::int64_t runSyncthing(const RuntimeOptions &options)
if (!runningState) {
return -1;
}
return ::libst_run_syncthing(gostr(options.configDir), gostr(options.guiAddress), gostr(options.guiApiKey), options.verbose);
return ::libst_run_syncthing(gostr(options.configDir), gostr(options.guiAddress), gostr(options.guiApiKey), options.verbose,
options.allowNewerConfig, options.noDefaultConfig);
}
/*!

2
libsyncthing/interface.h
View File

@ -15,6 +15,8 @@ struct RuntimeOptions {
std::string guiAddress;
std::string guiApiKey;
bool verbose = false;
bool allowNewerConfig = true;
bool noDefaultConfig = false;
};
enum class LogLevel : int {