From 8416b44c53d800fe566d6e90b97c47de75a44564 Mon Sep 17 00:00:00 2001 From: Ciro Date: Tue, 1 Nov 2022 17:09:56 -0300 Subject: [PATCH] new Makefile for shared libraries --- .gitignore | 2 - setup.py | 3 +- src/socketify/native/Makefile | 80 +++++++++++++++++++++++++++++------ src/socketify/socketify.py | 4 +- src/socketify/uv.py | 3 +- 5 files changed, 75 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index d733439..f50c89f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,4 @@ __pycache__ /src/socketify.egg-info /build /dist -/src/socketify/*.so -*.so *.o \ No newline at end of file diff --git a/setup.py b/setup.py index 7e233fe..4230235 100644 --- a/setup.py +++ b/setup.py @@ -81,6 +81,7 @@ setuptools.setup( python_requires=">=3.7", install_requires=["cffi>=1.0.0", "setuptools>=60.0.0"], has_ext_modules=lambda: True, - cmdclass={'sdist': Prepare, 'build_ext': Makefile}, + cmdclass={'sdist': Prepare}, #cmdclass={'sdist': Prepare, 'build_ext': Makefile}, + include_package_data=True ) \ No newline at end of file diff --git a/src/socketify/native/Makefile b/src/socketify/native/Makefile index 055e4b6..eba2606 100644 --- a/src/socketify/native/Makefile +++ b/src/socketify/native/Makefile @@ -1,22 +1,78 @@ LIBRARY_NAME := libsocketify UWS_LIBRARY_NAME := libuwebsockets +CC := clang +CXX := clang++ + +ARCH := amd64 +ifeq ($(PLATFORM), arm64) + ARCH := arm64 +endif +ifeq ($(PLATFORM), arm) + ARCH := arm64 +endif clean: - cd ../uWebSockets/uSockets && rm -f *.o $(LIBRARY_NAME).a $(LIBRARY_NAME).so $(UWS_LIBRARY_NAME).a $(UWS_LIBRARY_NAME).so - cd ../uWebSockets/ && rm -f *.o $(LIBRARY_NAME).a $(LIBRARY_NAME).so $(UWS_LIBRARY_NAME).a $(UWS_LIBRARY_NAME).so - rm -f *.o $(LIBRARY_NAME).a $(LIBRARY_NAME).so $(UWS_LIBRARY_NAME).a $(UWS_LIBRARY_NAME).so - -shared: + cd ../uWebSockets/uSockets && rm -f *.o *.a *.so + cd ../uWebSockets/ && rm -f *.o *.a *.so + rm -f *.o *.a *.so *.dll +# rm -rf ../uWebSockets/uSockets/boringssl/amd64 +# rm -rf ../uWebSockets/uSockets/boringssl/arm64 +windows: $(MAKE) clean - + # build boringssl + cd ../uWebSockets/uSockets/boringssl && mkdir -p amd64 && cd amd64 && cmake -DCMAKE_BUILD_TYPE=Release -GNinja .. && ninja crypto ssl + + # build lsquic + cd ../uWebSockets/uSockets/lsquic && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && msbuild ALL_BUILD.vcxproj + + # build windows + cl /MD /W3 /D WIN32_LEAN_AND_MEAN /D \"UWS_WITH_PROXY\" /D \"LIBUS_USE_LIBUV\" /D \"LIBUS_USE_QUIC\" /I ../uWebSockets/uSockets/lsquic/include /I ../uWebSockets/uSockets/lsquic/wincompat /I ../uWebSockets/uSockets/boringssl/include /D \"LIBUS_USE_OPENSSL\" /std:c++17 /I ../uWebSockets/uSockets/src ../uWebSockets/uSockets/src/*.c ../uWebSockets/uSockets/src/crypto/sni_tree.cpp ../uWebSockets/uSockets/src/eventing/*.c ../uWebSockets/uSockets/src/crypto/*.c /I ../uWebSockets/src /EHsc /Ox /LD /Fe$(LIBRARY_NAME)_windows_amd64.so ./src/$(LIBRARY_NAME).cpp advapi32.lib ../uWebSockets/uSockets/boringssl/amd64/ssl/ssl.lib ../uWebSockets/uSockets/boringssl/amd64/crypto/crypto.lib ../uWebSockets/uSockets/lsquic/src/liblsquic/Debug/lsquic.lib + +macos: + $(MAKE) clean + + # build boringssl + cd ../uWebSockets/uSockets/boringssl && mkdir -p amd64 && cd amd64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 .. && make crypto ssl + + # build boringssl for arm64 (cross compile) + cd ../uWebSockets/uSockets/boringssl && mkdir -p arm64 && cd arm64 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 .. && make crypto ssl + + # build lsquic + cd ../uWebSockets/uSockets/lsquic && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && make lsquic + # build uWebSockets - cd ../uWebSockets/uSockets && $(CC) -pthread -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -std=c11 -Isrc -flto -fPIC -O3 -c src/*.c src/eventing/*.c src/crypto/*.c - cd ../uWebSockets/uSockets && $(CXX) -std=c++17 -flto -fPIC -O3 -c src/crypto/*.cpp - cd ../uWebSockets/uSockets && $(AR) rvs uSockets.a *.o + cd ../uWebSockets/uSockets && $(CC) -mmacosx-version-min=10.14 -I src -I lsquic/include -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c11 -O3 -c src/*.c src/eventing/*.c src/crypto/*.c + cd ../uWebSockets/uSockets && $(CXX) -stdlib=libc++ -mmacosx-version-min=10.14 -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c++17 -O3 -c src/crypto/*.cpp + cd ../uWebSockets/uSockets && $(AR) rvs uSockets_darwin_amd64.a *.o + + # build uWebSockets for arm64 (cross compile) + cd ../uWebSockets/uSockets && $(CC) -target arm64-apple-macos11 -I src -I lsquic/include -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c11 -O3 -c src/*.c src/eventing/*.c src/crypto/*.c + cd ../uWebSockets/uSockets && $(CXX) -stdlib=libc++ -target arm64-apple-macos11 -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c++17 -O3 -c src/crypto/*.cpp + cd ../uWebSockets/uSockets && $(AR) rvs uSockets_darwin_arm64.a *.o # build CAPI + libsocketify - $(CXX) -c -O1 -std=c++17 -lz -luv -flto -fPIC -I ./src -I ../uWebSockets/src -I ../uWebSockets/uSockets/src -I ../uWebSockets/capi ./src/$(LIBRARY_NAME).cpp - $(CXX) -shared -o ../$(LIBRARY_NAME).so $(LIBRARY_NAME).o ../uWebSockets/uSockets/uSockets.a -fPIC -lz -luv -lssl -lcrypto + $(CXX) -stdlib=libc++ -mmacosx-version-min=10.14 -I ./src -I ../uWebSockets/src -I ../uWebSockets/uSockets/src -I ../uWebSockets/capi -I ../uWebSockets/uSockets/lsquic/include -I ../uWebSockets/uSockets/boringssl/include -pthread -fPIC -std=c++17 -c -O3 ./src/$(LIBRARY_NAME).cpp + $(CXX) -stdlib=libc++ -mmacosx-version-min=10.14 -shared -undefined dynamic_lookup -o ../$(LIBRARY_NAME)_darwin_amd64.so $(LIBRARY_NAME).o ../uWebSockets/uSockets/uSockets_darwin_amd64.a ../uWebSockets/uSockets/boringssl/amd64/ssl/libssl.a ../uWebSockets/uSockets/boringssl/amd64/crypto/libcrypto.a ../uWebSockets/uSockets/lsquic/src/liblsquic/liblsquic.a -flto -fPIC -lz -luv - rm -f *.o \ No newline at end of file + # build CAPI + libsocketify for arm64 (cross compile) + $(CXX) -stdlib=libc++ -target arm64-apple-macos11 -I ./src -I ../uWebSockets/src -I ../uWebSockets/uSockets/src -I ../uWebSockets/capi -I ../uWebSockets/uSockets/lsquic/include -I ../uWebSockets/uSockets/boringssl/include -pthread -fPIC -std=c++17 -c -O3 ./src/$(LIBRARY_NAME).cpp + $(CXX) -stdlib=libc++ -target arm64-apple-macos11 -shared -undefined dynamic_lookup -o ../$(LIBRARY_NAME)_darwin_arm64.so $(LIBRARY_NAME).o ../uWebSockets/uSockets/uSockets_darwin_amd64.a ../uWebSockets/uSockets/boringssl/amd64/ssl/libssl.a ../uWebSockets/uSockets/boringssl/amd64/crypto/libcrypto.a ../uWebSockets/uSockets/lsquic/src/liblsquic/liblsquic.a -flto -fPIC -lz -luv + +linux: + $(MAKE) clean + + # build boringssl + cd ../uWebSockets/uSockets/boringssl && mkdir -p ${ARCH} && cd ${ARCH} && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release .. && make crypto ssl + + # build lsquic + cd ../uWebSockets/uSockets/lsquic && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBORINGSSL_DIR=../boringssl -DCMAKE_BUILD_TYPE=Release -DLSQUIC_BIN=Off . && make lsquic + + # build uWebSockets + cd ../uWebSockets/uSockets && $(CC) -I src -I lsquic/include -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c11 -O3 -c src/*.c src/eventing/*.c src/crypto/*.c + cd ../uWebSockets/uSockets && $(CXX) -I boringssl/include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -DLIBUS_USE_QUIC -pthread -fPIC -std=c++17 -O3 -c src/crypto/*.cpp + cd ../uWebSockets/uSockets && $(AR) rvs uSockets_linux_$(ARCH).a *.o + + # build CAPI + libsocketify + $(CXX) -I ./src -I ../uWebSockets/src -I ../uWebSockets/uSockets/src -I ../uWebSockets/capi -I ../uWebSockets/uSockets/lsquic/include -I ../uWebSockets/uSockets/boringssl/include -pthread -fPIC -std=c++17 -c -O3 ./src/$(LIBRARY_NAME).cpp + $(CXX) -shared -static-libstdc++ -static-libgcc -s -o ../$(LIBRARY_NAME)_linux_amd64.so $(LIBRARY_NAME).o ../uWebSockets/uSockets/uSockets_linux_$(ARCH).a ../uWebSockets/uSockets/boringssl/$(ARCH)/ssl/libssl.a ../uWebSockets/uSockets/boringssl/$(ARCH)/crypto/libcrypto.a ../uWebSockets/uSockets/lsquic/src/liblsquic/liblsquic.a -flto -fPIC -lz -luv \ No newline at end of file diff --git a/src/socketify/socketify.py b/src/socketify/socketify.py index 01e6e41..a0dc5fe 100644 --- a/src/socketify/socketify.py +++ b/src/socketify/socketify.py @@ -227,7 +227,9 @@ void uws_req_for_each_header(uws_req_t *res, uws_get_headers_server_handler hand """) -library_path = os.path.join(os.path.dirname(__file__), "libsocketify.so") +library_path = os.path.join(os.path.dirname(__file__), "libsocketify_%s_%s.so" % (platform.system().lower(), "arm64" if "arm" in platform.processor().lower() else "amd64")) + + lib = ffi.dlopen(library_path) @ffi.callback("void(const char *, size_t, const char *, size_t, void *)") diff --git a/src/socketify/uv.py b/src/socketify/uv.py index 7b8f29c..0d2552c 100644 --- a/src/socketify/uv.py +++ b/src/socketify/uv.py @@ -1,6 +1,7 @@ import cffi import os +import platform ffi = cffi.FFI() ffi.cdef(""" @@ -54,7 +55,7 @@ void socketify_timer_set_repeat(socketify_timer* timer, uint64_t repeat); socketify_timer* socketify_create_check(socketify_loop* loop, socketify_timer_handler handler, void* user_data); void socketify_check_destroy(socketify_timer* timer); """) -library_path = os.path.join(os.path.dirname(__file__), "libsocketify.so") +library_path = os.path.join(os.path.dirname(__file__), "libsocketify_%s_%s.so" % (platform.system().lower(), "arm64" if "arm" in platform.processor().lower() else "amd64")) lib = ffi.dlopen(library_path)