diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index 5b159a4..50a4896 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -117,8 +117,8 @@ function deploy_client() { end_task "${project_name}_package" "Client successfully deployed!" } -#install_npm -#compile_scripts -#compile_native -#package_client +install_npm +compile_scripts +compile_native +package_client deploy_client diff --git a/native/dns/.vs/ProjectSettings.json b/native/dns/.vs/ProjectSettings.json new file mode 100644 index 0000000..0cf5ea5 --- /dev/null +++ b/native/dns/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": "No Configurations" +} \ No newline at end of file diff --git a/native/dns/.vs/VSWorkspaceState.json b/native/dns/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..8ae833a --- /dev/null +++ b/native/dns/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\src" + ], + "SelectedNode": "\\src\\resolver.cpp", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/native/dns/.vs/dns/v16/.suo b/native/dns/.vs/dns/v16/.suo new file mode 100644 index 0000000..8a1e132 Binary files /dev/null and b/native/dns/.vs/dns/v16/.suo differ diff --git a/native/dns/.vs/dns/v16/Browse.VC.db b/native/dns/.vs/dns/v16/Browse.VC.db new file mode 100644 index 0000000..3917f82 Binary files /dev/null and b/native/dns/.vs/dns/v16/Browse.VC.db differ diff --git a/native/dns/.vs/dns/v16/ipch/AutoPCH/1346297ee4e82e6/RESOLVER.ipch b/native/dns/.vs/dns/v16/ipch/AutoPCH/1346297ee4e82e6/RESOLVER.ipch new file mode 100644 index 0000000..cd66f69 Binary files /dev/null and b/native/dns/.vs/dns/v16/ipch/AutoPCH/1346297ee4e82e6/RESOLVER.ipch differ diff --git a/native/dns/.vs/slnx.sqlite b/native/dns/.vs/slnx.sqlite new file mode 100644 index 0000000..a7afa4d Binary files /dev/null and b/native/dns/.vs/slnx.sqlite differ diff --git a/native/serverconnection/CMakeLists.txt b/native/serverconnection/CMakeLists.txt index 32928a3..d979e35 100644 --- a/native/serverconnection/CMakeLists.txt +++ b/native/serverconnection/CMakeLists.txt @@ -124,7 +124,7 @@ set(REQUIRED_LIBRARIES ${ed25519_LIBRARIES_STATIC} - spdlog::spdlog + spdlog::spdlog_header_only Nan::Helpers ) diff --git a/native/serverconnection/src/connection/ft/FileTransferManager.cpp b/native/serverconnection/src/connection/ft/FileTransferManager.cpp index 32dd063..0875aed 100644 --- a/native/serverconnection/src/connection/ft/FileTransferManager.cpp +++ b/native/serverconnection/src/connection/ft/FileTransferManager.cpp @@ -1,5 +1,6 @@ #include "FileTransferManager.h" #include "FileTransferObject.h" +#include #include #include @@ -8,7 +9,6 @@ #ifndef WIN32 #include #include -#include #ifndef IPPROTO_TCP #define IPPROTO_TCP (0) diff --git a/native/serverconnection/src/logger.h b/native/serverconnection/src/logger.h index 83b7720..f6b2c13 100644 --- a/native/serverconnection/src/logger.h +++ b/native/serverconnection/src/logger.h @@ -8,7 +8,7 @@ #include #include -namespace logger { +namespace tc_logger { namespace level = spdlog::level; namespace category { @@ -90,6 +90,7 @@ namespace logger { } } +namespace logger = tc_logger; namespace category = logger::category; #define tr(message) message diff --git a/package.json b/package.json index 4525795..1cb9203 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "electron-navigation": "^1.5.8", "electron-rebuild": "^1.8.6", "electron-winstaller": "^2.7.0", - "electron-wix-msi": "^2.1.1", + "electron-wix-msi": "^2.2.0", "extend": "^3.0.2", "extsprintf": "^1.4.0", "fs-extra": "^8.1.0",