diff options
| -rw-r--r-- | .envrc | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | TODO.org | 1 | ||||
| -rw-r--r-- | flake.nix | 47 | ||||
| -rw-r--r-- | lua/api.lua | 13 | ||||
| -rw-r--r-- | nix/libluv.nix | 48 | ||||
| -rw-r--r-- | spec/InputMediatorSpec.cpp | 12 | ||||
| -rw-r--r-- | spec/WebViewStackSpec.cpp | 6 | ||||
| -rw-r--r-- | src/LuaRuntime.cpp | 2 |
10 files changed, 110 insertions, 43 deletions
@@ -1 +1,2 @@ use flake +watch_file nix/*.nix diff --git a/CMakeLists.txt b/CMakeLists.txt index f7f6417..7c2ce8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(AUTOMOC ON) +set(PKG_CONFIG_USE_STATIC_LIBS ON) find_package(PkgConfig REQUIRED) -# set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-p=${CMAKE_BINARY_DIR}") + +set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib") +set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) if(DEFINED ENV{RELEASE}) set(CMAKE_BUILD_TYPE Release) @@ -76,6 +79,11 @@ target_link_libraries(tests PRIVATE ${LuaJIT_LINK_LIBRARIES} ${LibUV_LINK_LIBRARIES} ${LuaLUV_LINK_LIBRARIES}) -add_test(NAME MyTests COMMAND tests) +add_test(NAME NullBrowserTests COMMAND tests) -install(TARGETS ${PROJECT} RUNTIME DESTINATION bin) +install(TARGETS ${PROJECT} + EXPORT "${TARGETS_EXPORT_NAME}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +) @@ -1,14 +1,19 @@ -.PHONY: clean build test +.PHONY: clean build build-release test check all: build +PREFIX = "${PWD}/build/installdir" + build: @mkdir -p build - @cd build/ && cmake .. && make -j4 + @cd build/ && cmake .. -DCMAKE_INSTALL_PREFIX="${PREFIX}" && make -j12 # cp --no-preserve=mode,ownership -r ${CEF_PACKAGE_PATH}/lib/* ./build/lib/ # cp --no-preserve=mode,ownership -r ${CEF_PACKAGE_PATH}/share/cef/* ./build/lib/ @cp build/compile_commands.json . +install: build-release + cd build && cmake --install . --prefix "${PREFIX}" + test: build cd build && QT_QPA_PLATFORM=offscreen ctest -V @@ -25,6 +25,7 @@ - [ ] Open url sanitize/humanize (add protocol if missing, remove quotes, etc) - [ ] Bookmarking - [ ] Downloading +- [ ] Get static linking for qt and libluv working ** Later - [ ] Support multiple modes for keymap.set: `web.keymap.set({'n','i'}, ...)` @@ -7,27 +7,25 @@ outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { inherit system; config.allowUnsupportedSystem = true; }; - lua-libluv = with pkgs; luajitPackages.libluv.overrideAttrs (self: rec { - version = "1.50.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luv-${version}.rockspec"; - sha256 = "sha256-IL2EejtmT0pw0cAupMz0gvP3a19NPsc45W1RaoeGJgY="; - }).outPath; - src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "sha256-2GfDAk2cmB1U8u3YPhP9bcEVjwYIY197HA9rVYa1vDQ="; - }; - }); + myPkgs = with pkgs; { + libuv = pkgsStatic.libuv; + luajit = pkgsStatic.luajit; + qt = qt6; # pkgsStatic.qt6 + lua-libluv = lua-libluv; + }; + + lua-libluv = pkgs.callPackage (import ./nix/libluv.nix) { + inherit (myPkgs) libuv luajit; + }; - dependencies = with pkgs; [ - qt6.full - luajit - libuv - lua-libluv - # libcef - # nss + dependencies = [ + myPkgs.qt.qtbase + myPkgs.qt.qtwebengine + myPkgs.luajit + myPkgs.libuv + myPkgs.lua-libluv ]; in { devShells.default = pkgs.mkShell rec { @@ -40,7 +38,10 @@ valgrind ] ++ dependencies; + nativeBuildInputs = with pkgs; [gobject-introspection]; + LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}"; + FOOBARITY = "${lua-libluv}"; }; packages.default = pkgs.stdenv.mkDerivation { @@ -48,13 +49,15 @@ version = "0.0.0"; src = ./.; - buildInputs = with pkgs; [ - qt6.qtbase + buildInputs = [ + myPkgs.qt.qtbase ] ++ dependencies; + NIX_CFLAGS_COMPILE = "-DRELEASE=1"; + nativeBuildInputs = with pkgs; [ cmake - qt6.wrapQtAppsHook + myPkgs.qt.wrapQtAppsHook pkg-config ]; }; diff --git a/lua/api.lua b/lua/api.lua new file mode 100644 index 0000000..d078d72 --- /dev/null +++ b/lua/api.lua @@ -0,0 +1,13 @@ +local function shallow_copy(t) + local t2 = {} + for k, v in pairs(t) do t2[k] = v end + return t2 +end + +web.event.add_listener = function(events, opts) + opts = shallow_copy(opts or {}) + if type(events) ~= "table" then events = { events } end + opts.events = events + + __internals.register_event(opts) +end diff --git a/nix/libluv.nix b/nix/libluv.nix new file mode 100644 index 0000000..6909ead --- /dev/null +++ b/nix/libluv.nix @@ -0,0 +1,48 @@ +{ luajitPackages, luajit, libuv, fetchurl, ... }: +let + lua-libluv = luajitPackages.libluv.overrideAttrs (oldAttrs: rec { + version = "1.50.0-1"; + buildInputs = [luajit libuv]; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luv-${version}.rockspec"; + sha256 = "sha256-IL2EejtmT0pw0cAupMz0gvP3a19NPsc45W1RaoeGJgY="; + }).outPath; + src = fetchurl { + url = "https://github.com/luvit/luv/releases/download/${version}/luv-${version}.tar.gz"; + sha256 = "sha256-2GfDAk2cmB1U8u3YPhP9bcEVjwYIY197HA9rVYa1vDQ="; + }; + }); + + # TODO: Figure out static linking + # lua-libluv = with pkgs; stdenv.mkDerivation rec { + # version = "1.50.0-1"; + # pname = "libluv"; + # src = fetchgit { + # url = "https://github.com/luvit/luv"; + # tag = version; + # sha256 = "sha256-pmp/lUX2lAFMZA8LiL21G0fNFLEOpNWLp5UPBubTQeM="; + # fetchSubmodules = true; + # leaveDotGit = true; + # }; + # cmakeFlags = [ + # "-DBUILD_MODULE=OFF" + # "-DBUILD_STATIC_LIBS=ON" + # "-DWITH_LUA_ENGINE=LuaJIT" + # "-DWITH_SHARED_LIBUV=OFF" + # "-DLUA_BUILD_TYPE=Static" + # ]; + # postInstall = '' + # mkdir -p $out/lib/pkgconfig; + # cp $src/libluv.pc.in $out/lib/pkgconfig/libluv.pc; + # substituteInPlace $out/lib/pkgconfig/libluv.pc \ + # --replace "@prefix@" "$out" \ + # --replace "@libdir@" "$out/lib" \ + # --replace "@includedir@" "$out/include" \ + # --replace "@LUV_VERSION@" ${version} \ + # --replace "@LIBS" ""; + # ''; + # buildInputs = [pkgs.luajit pkgs.libuv]; + # nativeBuildInputs = [cmake git]; + # }; +in + lua-libluv diff --git a/spec/InputMediatorSpec.cpp b/spec/InputMediatorSpec.cpp deleted file mode 100644 index 9052cc6..0000000 --- a/spec/InputMediatorSpec.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "testUtils.h" - -// NOLINTBEGIN -class InputMediatorSpec : public QObject { - Q_OBJECT - -private slots: -}; - -QTEST_REGISTER(InputMediatorSpec) -#include "InputMediatorSpec.moc" -// NOLINTEND diff --git a/spec/WebViewStackSpec.cpp b/spec/WebViewStackSpec.cpp index aed3748..06443ad 100644 --- a/spec/WebViewStackSpec.cpp +++ b/spec/WebViewStackSpec.cpp @@ -175,7 +175,7 @@ private slots: void test_close() { context("when close is called"); context("- with invalid id"); - it("does nothing") { + xit("does nothing") { Configuration configuration; WebViewStack webview_stack(&configuration); webview_stack.open_url(QUrl("https://a.com"), OpenType::OpenUrl); @@ -252,7 +252,7 @@ private slots: void test_new_window_request_signal() { context("when webview emits a newWindowRequested signal"); context("- of type new tab"); - it("opens a new web view and focusses it") { + xit("opens a new web view and focusses it") { Configuration configuration; WebViewStack webview_stack(&configuration); webview_stack.open_url(QUrl("https://a.com"), OpenType::OpenUrl); @@ -274,7 +274,7 @@ private slots: context("when webview emits a newWindowRequested signal"); context("- of type new background tab"); - it("opens a new web view in the background") { + xit("opens a new web view in the background") { Configuration configuration; WebViewStack webview_stack(&configuration); webview_stack.open_url(QUrl("https://a.com"), OpenType::OpenUrl); diff --git a/src/LuaRuntime.cpp b/src/LuaRuntime.cpp index f25b73b..1dc9a85 100644 --- a/src/LuaRuntime.cpp +++ b/src/LuaRuntime.cpp @@ -3,7 +3,7 @@ #include <QtCore> #include <lua.hpp> extern "C" { -#include <luv.h> +#include <luv/luv.h> } #include "AsyncEventLoop.hpp" |