From 0653d710ac317b560c70e21a24e44e363439e4a7 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Thu, 15 Jun 2023 14:02:05 +0200 Subject: [PATCH] Remove submodules, add projects directly --- .gitignore | 10 ++++------ .gitmodules | 12 ------------ build.zig | 30 +++++++++++++++--------------- {sub => dep}/argoat | 0 {sub => dep}/configator | 0 {sub => dep}/dragonfail | 0 {sub => dep}/termbox_next | 0 readme.md | 20 ++++++++++---------- 8 files changed, 29 insertions(+), 43 deletions(-) delete mode 100644 .gitmodules rename {sub => dep}/argoat (100%) rename {sub => dep}/configator (100%) rename {sub => dep}/dragonfail (100%) rename {sub => dep}/termbox_next (100%) diff --git a/.gitignore b/.gitignore index a0192a0..60f36fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -.idea -bin -obj -valgrind.log -zig-cache -zig-out \ No newline at end of file +.idea/ +zig-cache/ +zig-out/ +valgrind.log \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 250adbe..0000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "sub/argoat"] - path = sub/argoat - url = https://github.com/nullgemm/argoat.git -[submodule "sub/configator"] - path = sub/configator - url = https://github.com/nullgemm/configator.git -[submodule "sub/dragonfail"] - path = sub/dragonfail - url = https://github.com/nullgemm/dragonfail.git -[submodule "sub/termbox_next"] - path = sub/termbox_next - url = https://github.com/nullgemm/termbox_next.git diff --git a/build.zig b/build.zig index c77f70f..38e4172 100644 --- a/build.zig +++ b/build.zig @@ -28,11 +28,11 @@ pub fn build(b: *std.Build) void { exe.linkLibC(); exe.addIncludePath("src"); - exe.addIncludePath("sub/argoat/src"); - exe.addIncludePath("sub/argoat/sub/testoasterror/src"); - exe.addIncludePath("sub/configator/src"); - exe.addIncludePath("sub/dragonfail/src"); - exe.addIncludePath("sub/termbox_next/src"); + exe.addIncludePath("dep/argoat/src"); + exe.addIncludePath("dep/argoat/dep/testoasterror/src"); + exe.addIncludePath("dep/configator/src"); + exe.addIncludePath("dep/dragonfail/src"); + exe.addIncludePath("dep/termbox_next/src"); exe.addCSourceFile("src/config.c", &c_args); exe.addCSourceFile("src/draw.c", &c_args); @@ -40,16 +40,16 @@ pub fn build(b: *std.Build) void { exe.addCSourceFile("src/login.c", &c_args); exe.addCSourceFile("src/main.c", &c_args); exe.addCSourceFile("src/utils.c", &c_args); - exe.addCSourceFile("sub/argoat/src/argoat.c", &c_args); - exe.addCSourceFile("sub/argoat/sub/testoasterror/src/testoasterror.c", &c_args); - exe.addCSourceFile("sub/configator/src/configator.c", &c_args); - exe.addCSourceFile("sub/dragonfail/src/dragonfail.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/input.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/memstream.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/ringbuffer.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/term.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/termbox.c", &c_args); - exe.addCSourceFile("sub/termbox_next/src/utf8.c", &c_args); + exe.addCSourceFile("dep/argoat/src/argoat.c", &c_args); + exe.addCSourceFile("dep/argoat/dep/testoasterror/src/testoasterror.c", &c_args); + exe.addCSourceFile("dep/configator/src/configator.c", &c_args); + exe.addCSourceFile("dep/dragonfail/src/dragonfail.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/input.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/memstream.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/ringbuffer.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/term.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/termbox.c", &c_args); + exe.addCSourceFile("dep/termbox_next/src/utf8.c", &c_args); b.installArtifact(exe); diff --git a/sub/argoat b/dep/argoat similarity index 100% rename from sub/argoat rename to dep/argoat diff --git a/sub/configator b/dep/configator similarity index 100% rename from sub/configator rename to dep/configator diff --git a/sub/dragonfail b/dep/dragonfail similarity index 100% rename from sub/dragonfail rename to dep/dragonfail diff --git a/sub/termbox_next b/dep/termbox_next similarity index 100% rename from sub/termbox_next rename to dep/termbox_next diff --git a/readme.md b/readme.md index 27fdf31..0c79b48 100644 --- a/readme.md +++ b/readme.md @@ -5,9 +5,8 @@ Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD. ## Dependencies - - a C99 compiler (tested with tcc and gcc) + - zig - a C standard library - - GNU make - pam - xcb - xorg @@ -17,7 +16,9 @@ Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD. - shutdown On Debian-based distros running `apt install build-essential libpam0g-dev libxcb-xkb-dev` as root should install all the dependencies for you. -For Fedora try running `dnf install make automake gcc gcc-c++ kernel-devel pam-devel libxcb-devel` +For Fedora try running `dnf install kernel-devel pam-devel libxcb-devel` + +You can download Zig [here](https://ziglang.org/download/). ## Support The following desktop environments were tested with success @@ -57,7 +58,7 @@ changing the source code won't be necessary :) ## Cloning and Compiling Clone the repository ``` -$ git clone --recurse-submodules https://github.com/fairyglade/ly +$ git clone https://github.com/fairyglade/ly ``` Change the directory to ly @@ -67,18 +68,18 @@ $ cd ly Compile ``` -$ make +$ zig build ``` Test in the configured tty (tty2 by default) or a terminal emulator (but desktop environments won't start) ``` -# make run +# zig build run ``` Install Ly and the provided systemd service file ``` -# make install installsystemd +# zig build installsystemd ``` Enable the service @@ -98,7 +99,7 @@ Clone, compile and test. Install Ly and the provided OpenRC service ``` -# make install installopenrc +# zig build installopenrc ``` Enable the service @@ -116,8 +117,7 @@ If you choose a tty that already has a login/getty running (has a basic login pr ### runit ``` -$ make -# make install installrunit +# zig build installrunit # ln -s /etc/sv/ly /var/service/ ```