Remove submodules, add projects directly

This commit is contained in:
AnErrupTion 2023-06-15 14:02:05 +02:00
parent d3d9aa7b18
commit 0653d710ac
8 changed files with 29 additions and 43 deletions

8
.gitignore vendored
View File

@ -1,6 +1,4 @@
.idea .idea/
bin zig-cache/
obj zig-out/
valgrind.log valgrind.log
zig-cache
zig-out

12
.gitmodules vendored
View File

@ -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

View File

@ -28,11 +28,11 @@ pub fn build(b: *std.Build) void {
exe.linkLibC(); exe.linkLibC();
exe.addIncludePath("src"); exe.addIncludePath("src");
exe.addIncludePath("sub/argoat/src"); exe.addIncludePath("dep/argoat/src");
exe.addIncludePath("sub/argoat/sub/testoasterror/src"); exe.addIncludePath("dep/argoat/dep/testoasterror/src");
exe.addIncludePath("sub/configator/src"); exe.addIncludePath("dep/configator/src");
exe.addIncludePath("sub/dragonfail/src"); exe.addIncludePath("dep/dragonfail/src");
exe.addIncludePath("sub/termbox_next/src"); exe.addIncludePath("dep/termbox_next/src");
exe.addCSourceFile("src/config.c", &c_args); exe.addCSourceFile("src/config.c", &c_args);
exe.addCSourceFile("src/draw.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/login.c", &c_args);
exe.addCSourceFile("src/main.c", &c_args); exe.addCSourceFile("src/main.c", &c_args);
exe.addCSourceFile("src/utils.c", &c_args); exe.addCSourceFile("src/utils.c", &c_args);
exe.addCSourceFile("sub/argoat/src/argoat.c", &c_args); exe.addCSourceFile("dep/argoat/src/argoat.c", &c_args);
exe.addCSourceFile("sub/argoat/sub/testoasterror/src/testoasterror.c", &c_args); exe.addCSourceFile("dep/argoat/dep/testoasterror/src/testoasterror.c", &c_args);
exe.addCSourceFile("sub/configator/src/configator.c", &c_args); exe.addCSourceFile("dep/configator/src/configator.c", &c_args);
exe.addCSourceFile("sub/dragonfail/src/dragonfail.c", &c_args); exe.addCSourceFile("dep/dragonfail/src/dragonfail.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/input.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/input.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/memstream.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/memstream.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/ringbuffer.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/ringbuffer.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/term.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/term.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/termbox.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/termbox.c", &c_args);
exe.addCSourceFile("sub/termbox_next/src/utf8.c", &c_args); exe.addCSourceFile("dep/termbox_next/src/utf8.c", &c_args);
b.installArtifact(exe); b.installArtifact(exe);

View File

@ -5,9 +5,8 @@
Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD. Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD.
## Dependencies ## Dependencies
- a C99 compiler (tested with tcc and gcc) - zig
- a C standard library - a C standard library
- GNU make
- pam - pam
- xcb - xcb
- xorg - xorg
@ -17,7 +16,9 @@ Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD.
- shutdown - shutdown
On Debian-based distros running `apt install build-essential libpam0g-dev libxcb-xkb-dev` as root should install all the dependencies for you. 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 ## Support
The following desktop environments were tested with success The following desktop environments were tested with success
@ -57,7 +58,7 @@ changing the source code won't be necessary :)
## Cloning and Compiling ## Cloning and Compiling
Clone the repository Clone the repository
``` ```
$ git clone --recurse-submodules https://github.com/fairyglade/ly $ git clone https://github.com/fairyglade/ly
``` ```
Change the directory to ly Change the directory to ly
@ -67,18 +68,18 @@ $ cd ly
Compile Compile
``` ```
$ make $ zig build
``` ```
Test in the configured tty (tty2 by default) Test in the configured tty (tty2 by default)
or a terminal emulator (but desktop environments won't start) or a terminal emulator (but desktop environments won't start)
``` ```
# make run # zig build run
``` ```
Install Ly and the provided systemd service file Install Ly and the provided systemd service file
``` ```
# make install installsystemd # zig build installsystemd
``` ```
Enable the service Enable the service
@ -98,7 +99,7 @@ Clone, compile and test.
Install Ly and the provided OpenRC service Install Ly and the provided OpenRC service
``` ```
# make install installopenrc # zig build installopenrc
``` ```
Enable the service 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 ### runit
``` ```
$ make # zig build installrunit
# make install installrunit
# ln -s /etc/sv/ly /var/service/ # ln -s /etc/sv/ly /var/service/
``` ```