Author: Andy Green Date: Fri Jan 29 17:28:47 2021 +0000 server: allow huge platform string diff --git a/.sai.json b/.sai.json index 1b388c7..e04a67e 100644 --- a/.sai.json +++ b/.sai.json @@ -20,7 +20,7 @@ "default": false }, - "windows-10/x86_64-amd/msvc": { + "w10/x86_64-amd/msvc": { "build": "mkdir build && cd build && set SAI_CPACK=\"-G ZIP\" && cmake .. -DSAI_LWS_INC_PATH=\"C:\\Program Files (x86)\\libwebsockets\\include\" -DSAI_LWS_LIB_PATH=\"C:\\Program Files (x86)\\libwebsockets\\lib\\websockets_static.lib\" -DSAI_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DSAI_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" -DLWS_OPENSSL_INCLUDE_DIRS=\"C:\\Program Files\\OpenSSL\\include\" -DSAI_GIT2_INC_PATH=\"C:\\Program Files (x86)\\libgit2\\include\" -DSAI_GIT2_LIB_PATH=\"C:\\Program Files (x86)\\libgit2\\lib\\git2.lib\" -DLWS_OPENSSL_LIBRARIES=\"C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib;C:\\Program Files\\OpenSSL\\lib\\libssl.lib\" ${cmake} && cmake --build . --config DEBUG && set CTEST_OUTPUT_ON_FAILURE=1 && ctest . -C DEBUG -j4 --output-on-failure ${cpack}", "default": false } @@ -34,7 +34,7 @@ }, "builder-only": { "cmake": "-DSAI_SERVER=0 ", - "platforms": "windows-10/x86_64-amd/msvc, netbsd-OSX-bigsur/x86_64-intel-i3/llvm,netbsd/aarch64BE-bcm2837-a53/gcc", + "platforms": "w10/x86_64-amd/msvc, netbsd-OSX-bigsur/x86_64-intel-i3/llvm,netbsd/aarch64BE-bcm2837-a53/gcc", "cpack": "&& cpack -C DEBUG $SAI_CPACK", "artifacts": "build/sai-*.deb, build/sai-*.rpm, build/sai-*.7z" } diff --git a/assets/tc-wmbedtlsmsvc.svg b/assets/tc-wmbedtlsmsvc.svg new file mode 100644 index 0000000..dd47f12 --- /dev/null +++ b/assets/tc-wmbedtlsmsvc.svg @@ -0,0 +1 @@ + diff --git a/assets/w10.svg b/assets/w10.svg new file mode 100644 index 0000000..fbdd1a2 --- /dev/null +++ b/assets/w10.svg @@ -0,0 +1 @@ + diff --git a/assets/windows-10.svg b/assets/windows-10.svg deleted file mode 100644 index fbdd1a2..0000000 --- a/assets/windows-10.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/server/s-notification.c b/src/server/s-notification.c index 45f3d52..ed24838 100644 --- a/src/server/s-notification.c +++ b/src/server/s-notification.c @@ -668,9 +668,11 @@ sai_saifile_lejp_cb(struct lejp_ctx *ctx, char reason) break; case LEJPNSAIF_CONFIGURATIONS_PLATFORMS: - /* the necessary dependent package strings */ - lws_strncpy(sn->explicit_platforms, ctx->buf, - sizeof(sn->explicit_platforms)); + /* the necessary dependent package strings... can be huge */ + n = strlen(sn->explicit_platforms); + if (n < sizeof(sn->explicit_platforms) - 2) + lws_strnncpy(sn->explicit_platforms + n, ctx->buf, ctx->npos, + sizeof(sn->explicit_platforms) - n); break; case LEJPNSAIF_CONFIGURATIONS_ARTIFACTS: diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index ac66c81..25b2b6a 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -126,9 +126,11 @@ if (requirements) ../../assets/tc-mingw32.svg ../../assets/tc-mingw64.svg ../../assets/tc-msvc.svg + ../../assets/tc-wmbedtlsmsvc.svg + ../../assets/tc-noptmsvc.svg ../../assets/ubuntu-focal-aarch64.svg ../../assets/virt-qemu.svg - ../../assets/windows-10.svg + ../../assets/w10.svg DESTINATION "${DATA_DIR}/sai/assets" COMPONENT web)