mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-09 00:00:04 +01:00
sai: update to new tuple format
This commit is contained in:
Andy Green
parent
e9b3898c99
commit
e3df1eaa74
2 changed files with 41 additions and 32 deletions
62
.sai.json
62
.sai.json
|
|
@ -5,60 +5,60 @@
|
|||
# has somewhere to go to find its /usr/share content like certs
|
||||
|
||||
"platforms": {
|
||||
"linux-ubuntu-bionic-amd64": {
|
||||
"linux-ubuntu-18.04/x86_64-amd/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
"linux-ubuntu-focal-amd64": {
|
||||
"linux-ubuntu-20.04/x86_64-amd/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
"linux-fedora-32-x86_64": {
|
||||
"linux-fedora-32/x86_64-amd/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G RPM\";cmake .. ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
"gentoo-amd64": {
|
||||
"linux-gentoo/x86_64-amd/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G ZIP\";cmake .. ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
"linux-centos-8-x8664": {
|
||||
"linux-centos-8/x86_64-amd/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G RPM\";cmake .. ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
"ubuntu-focal-aarch64": {
|
||||
"linux-ubuntu-20.04/aarch64-a72-bcm2711-rpi4/gcc": {
|
||||
"build": "mkdir build;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j3 && make -j DESTDIR=../destdir install && ctest -j3 --output-on-failure ${cpack}",
|
||||
"default": false
|
||||
},
|
||||
"android-aarch64": {
|
||||
"linux-android/aarch64/llvm": {
|
||||
"build": "mkdir build;cd build;cmake .. -DCMAKE_TOOLCHAIN_FILE=../libwebsockets/contrib/cross-aarch64-android.cmake ${cmake} && make -j",
|
||||
"default": false
|
||||
},
|
||||
"iOS": {
|
||||
"netbsd-iOS/aarch64/llvm": {
|
||||
"build": "mkdir build destdir; cd build; export SAI_CPACK=\"-G ZIP\";cmake .. -DCMAKE_MAKE_PROGRAM=/usr/bin/make -DCMAKE_IOS_DEVELOPER_ROOT=/opt/Xcode-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer -DCMAKE_TOOLCHAIN_FILE=contrib/iOS.cmake -DIOS_PLATFORM=OS ${cmake} && make -j",
|
||||
"default": false
|
||||
},
|
||||
"OSX-catalina": {
|
||||
"netbsd-OSX-catalina/x86_64-intel-i3/llvm": {
|
||||
"build": "mkdir build destdir; cd build; export SAI_CPACK=\"-G ZIP\";export MACOSX_DEPLOYMENT_TARGET=10.14 ; cmake .. -DCMAKE_MAKE_PROGRAM=/usr/bin/make -DLWS_OPENSSL_INCLUDE_DIRS=/usr/local/opt/openssl@1.1/include -DLWS_OPENSSL_LIBRARIES=\"/usr/local/opt/openssl/lib/libssl.dylib;/usr/local/opt/openssl/lib/libcrypto.dylib\" ${cmake} && make -j && make -j DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}"
|
||||
},
|
||||
|
||||
"linkit-cross": {
|
||||
"freertos-linkit/arm32-m4-mt7697-usi/gcc": {
|
||||
"build": "mkdir build;cd build;export CCACHE_DISABLE=1;cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/tmp -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-linkit.cmake -DLWS_PLAT_FREERTOS=1 -DLWS_WITH_ZLIB=0 -DLWS_WITHOUT_EXTENSIONS=1 -DLWS_WITH_ZIP_FOPS=0 -DLWS_WITH_HTTP_STREAM_COMPRESSION=0 -DLWS_WITH_MBEDTLS=1 -DLWS_WITH_FILE_OPS=0 ${cmake};make -j",
|
||||
"default": false
|
||||
},
|
||||
"windows-10": {
|
||||
"windows-10/x86_64-amd/msvc": {
|
||||
"build": "mkdir build && cd build && set SAI_CPACK=\"-G ZIP\" && cmake .. -DLWS_OPENSSL_LIBRARIES=\"C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib\" -DLWS_OPENSSL_INCLUDE_DIRS=\"C:\\Program Files\\OpenSSL\\include\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake} && cmake --build . --config DEBUG && set CTEST_OUTPUT_ON_FAILURE=1 && ctest . -C DEBUG -j4 --output-on-failure",
|
||||
"default": false
|
||||
},
|
||||
"mingw32": {
|
||||
"windows-10/x86_64-amd/mingw32": {
|
||||
"build": "mkdir build && cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-w32.cmake -DLWS_UNIX_SOCK=0 ${cmake} && cmake --build . --config DEBUG",
|
||||
"default": false
|
||||
},
|
||||
"mingw64": {
|
||||
"windows-10/x86_64-amd/mingw64": {
|
||||
"build": "mkdir build && cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-w64.cmake -DLWS_UNIX_SOCK=0 ${cmake} && cmake --build . --config DEBUG",
|
||||
"default": false
|
||||
},
|
||||
"freertos-esp32": {
|
||||
"freertos-espidf/xl6-esp32/gcc": {
|
||||
# official way to get sdkconfig.h is idf.py menuconfig, but
|
||||
# no obvious way to do that in CI
|
||||
"build": "rm -rf ebuild ; mkdir ebuild; cd ebuild; cp -rp ../minimal-examples/embedded/lws-minimal-esp32 . ; cd lws-minimal-esp32 ; . /opt/esp/esp-idf/export.sh ; ln -sf ../.. libwebsockets ; idf.py set-target esp32 && cp libwebsockets/minimal-examples/embedded/lws-minimal-esp32/sdkconfig . && cp sdkconfig.h build && idf.py build && cd build && /usr/local/bin/sai-device freertos-esp32 ESPPORT=0 ctest --output-on-failure",
|
||||
"default": false
|
||||
},
|
||||
"linux-fedora-32-riscv": {
|
||||
"linux-fedora-32/riscv64-virt/gcc": {
|
||||
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export SAI_CPACK=\"-G RPM\";cmake .. ${cmake} && make -j12 && make -j12 DESTDIR=../destdir install && ctest -j4 --output-on-failure ${cpack}",
|
||||
"default": false
|
||||
}
|
||||
|
|
@ -68,60 +68,60 @@
|
|||
"configurations": {
|
||||
"default": {
|
||||
"cmake": "",
|
||||
"platforms": "windows-10, linkit-cross, ubuntu-focal-aarch64, freertos-esp32, linux-fedora-32-riscv, mingw32, mingw64"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64, freertos-linkit/arm32-m4-mt7697-usi/gcc, linux-ubuntu-20.04/aarch64-a72-bcm2711-rpi4/gcc, freertos-espidf/xl6-esp32/gcc, linux-fedora-32/riscv64-virt/gcc, windows-10/x86_64-amd/mingw32, windows-10/x86_64-amd/mingw64"
|
||||
},
|
||||
"default-examples-openssl-v3": {
|
||||
"cmake": "-DLWS_OPENSSL_LIBRARIES=\"/usr/local/src/openssl/v3/usr/local/lib64/libssl.a;/usr/local/src/openssl/v3/usr/local/lib64/libcrypto.a\" -DLWS_OPENSSL_INCLUDE_DIRS=\"/usr/local/src/openssl/v3/usr/local/include/\" -DLWS_WITH_MINIMAL_EXAMPLES=1",
|
||||
"platforms": "none,linux-fedora-32-x86_64"
|
||||
"platforms": "none,linux-fedora-32/x86_64-amd/gcc"
|
||||
},
|
||||
"default-examples-boringssl": {
|
||||
"cmake": "cmake .. -DLWS_WITH_BORINGSSL=1 -DLWS_OPENSSL_INCLUDE_DIRS=\"/usr/local/src/boringssl/include\" -DLWS_OPENSSL_LIBRARIES=\"/usr/local/src/boringssl/build/ssl/libssl.so;/usr/local/src/boringssl/build/crypto/libcrypto.so\" -DLWS_WITH_MINIMAL_EXAMPLES=1",
|
||||
"platforms": "none,linux-fedora-32-x86_64"
|
||||
"platforms": "none,linux-fedora-32/x86_64-amd/gcc"
|
||||
},
|
||||
"default-examples": {
|
||||
"cmake": "-DLWS_WITH_MINIMAL_EXAMPLES=1",
|
||||
"platforms": "windows-10, ubuntu-focal-aarch64, linux-fedora-32-riscv"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64, linux-ubuntu-20.04/aarch64-a72-bcm2711-rpi4/gcc, linux-fedora-32/riscv64-virt/gcc"
|
||||
},
|
||||
"unix-domain": {
|
||||
"cmake": "-DUNIX_SOCK=1",
|
||||
"platforms": "windows-10"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64"
|
||||
},
|
||||
"lws_system": {
|
||||
"cmake": "-DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=RELEASE -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_NTPCLIENT=1",
|
||||
"platforms": "windows-10"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64"
|
||||
},
|
||||
"secure-streams": {
|
||||
"cmake": "-DLWS_WITH_SECURE_STREAMS=1",
|
||||
"platforms": "windows-10, linux-fedora-32-riscv"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64, linux-fedora-32/riscv64-virt/gcc"
|
||||
},
|
||||
"secure-streams-proxy": {
|
||||
"cmake": "-DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
|
||||
"platforms": "not windows-10"
|
||||
"platforms": "not windows-10/x86_64-amd/mingw64"
|
||||
},
|
||||
"distro_recommended": {
|
||||
"cmake": "-DLWS_WITH_DISTRO_RECOMMENDED=1",
|
||||
"platforms": "not linkit-cross, not windows-10, ubuntu-focal-aarch64, linux-fedora-32-riscv",
|
||||
"platforms": "not linkit-cross, not windows-10/x86_64-amd/mingw64, linux-ubuntu-20.04/aarch64-a72-bcm2711-rpi4/gcc, linux-fedora-32/riscv64-virt/gcc",
|
||||
"cpack": "&& cpack $SAI_CPACK",
|
||||
"artifacts": "build/*.rpm, build/*.deb, build/*.zip"
|
||||
},
|
||||
"lwsws": {
|
||||
"cmake": "-DLWS_WITH_LWSWS=ON -DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_HTTP2=1 -DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_NTPCLIENT=1",
|
||||
# no distro -devel package for libuv
|
||||
"platforms": "not linux-centos-8-x8664"
|
||||
"platforms": "not linux-centos-8/x86_64-amd/gcc"
|
||||
},
|
||||
"lwsws2": {
|
||||
"cmake": "-DLWS_WITH_LWSWS=ON -DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_HTTP2=1 -DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_LWS_DSH=1",
|
||||
# no distro -devel package for libuv
|
||||
"platforms": "not linux-centos-8-x8664"
|
||||
"platforms": "not linux-centos-8/x86_64-amd/gcc"
|
||||
},
|
||||
"justmbedtls": {
|
||||
"cmake": "-DLWS_WITH_MBEDTLS=1 -DLWS_WITHOUT_TESTAPPS=1",
|
||||
"platforms": "none, android-aarch64"
|
||||
"platforms": "none, linux-android/aarch64/llvm"
|
||||
},
|
||||
"mbedtls": {
|
||||
"cmake": "-DLWS_WITH_MBEDTLS=1 -DLWS_WITH_HTTP2=1 -DLWS_WITH_LWSWS=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_WITH_JOSE=1 -DCMAKE_BUILD_TYPE=DEBUG",
|
||||
# no distro -devel package for mbedtls
|
||||
"platforms": "not linux-centos-8-x8664"
|
||||
"platforms": "not linux-centos-8/x86_64-amd/gcc"
|
||||
},
|
||||
"noserver": {
|
||||
"cmake": "-DLWS_WITHOUT_SERVER=ON -DLWS_WITH_MINIMAL_EXAMPLES=1"
|
||||
|
|
@ -146,11 +146,11 @@
|
|||
},
|
||||
"ipv6": {
|
||||
"cmake": "-DLWS_IPV6=ON",
|
||||
"platforms": "windows-10"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64"
|
||||
},
|
||||
"nossl": {
|
||||
"cmake": "-DLWS_WITH_SSL=OFF",
|
||||
"platforms": "iOS"
|
||||
"platforms": "netbsd-iOS/aarch64/llvm"
|
||||
},
|
||||
"daemon": {
|
||||
"cmake": "-DLWS_WITHOUT_DAEMONIZE=OFF"
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
},
|
||||
"threadpool": {
|
||||
"cmake": "-DLWS_WITH_THREADPOOL=1 -DLWS_WITH_MINIMAL_EXAMPLES=1",
|
||||
"platforms": "windows-10"
|
||||
"platforms": "windows-10/x86_64-amd/mingw64"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -537,10 +537,19 @@ lws_struct_sq3_open(struct lws_context *context, const char *sqlite3_path,
|
|||
int
|
||||
lws_struct_sq3_close(sqlite3 **pdb)
|
||||
{
|
||||
int n;
|
||||
|
||||
if (!*pdb)
|
||||
return 0;
|
||||
|
||||
sqlite3_close(*pdb);
|
||||
n = sqlite3_close(*pdb);
|
||||
if (n != SQLITE_OK) {
|
||||
/*
|
||||
* trouble...
|
||||
*/
|
||||
lwsl_err("%s: failed to close: %d\n", __func__, n);
|
||||
return 1;
|
||||
}
|
||||
*pdb = NULL;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue