kf5 corrections, remote is broken
This commit is contained in:
Levi Neely
parent
8929f10aa8
commit
160cf1a46b
|
|
@ -24,4 +24,4 @@
|
|||
url = ../ollie-dbus.git
|
||||
[submodule "remote"]
|
||||
path = remote
|
||||
url = ssh://lkn@git.lneely.de:44220/lkn/ollie-remote.git
|
||||
url = ../ollie-remote.git
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
[submodule "core"]
|
||||
path = core
|
||||
url = ../ollie-core.git
|
||||
[submodule "9p"]
|
||||
path = 9p
|
||||
url = ../ollie-9p.git
|
||||
[submodule "el"]
|
||||
path = el
|
||||
url = ../ollie-el.git
|
||||
[submodule "httpgw"]
|
||||
path = httpgw
|
||||
url = ../ollie-httpgw.git
|
||||
[submodule "webui"]
|
||||
path = webui
|
||||
url = ../ollie-webui.git
|
||||
[submodule "acme"]
|
||||
path = acme
|
||||
url = ../ollie-acme.git
|
||||
[submodule "kde"]
|
||||
path = kde
|
||||
url = ../ollie-kde.git
|
||||
[submodule "dbus"]
|
||||
path = dbus
|
||||
url = ../ollie-dbus.git
|
||||
[submodule "remote"]
|
||||
path = remote
|
||||
url = ssh://lkn@git.lneely.de:44220/lkn/ollie-remote.git
|
||||
127
justfile
127
justfile
|
|
@ -1,8 +1,12 @@
|
|||
# Ollie monorepo build system
|
||||
#
|
||||
# Two paths:
|
||||
# just (default) 9P frontend: core, 9p, acme, httpgw, webui + install
|
||||
# just dbus D-Bus frontend: core, dbus (ollied), kde, httpgw, webui + install
|
||||
# Two paths (KF6, default):
|
||||
# just 9P frontend: core, 9p, acme, httpgw, webui + install
|
||||
# just dbus D-Bus frontend: core, dbus (ollied), kde, httpgw, webui + install
|
||||
#
|
||||
# KF5 variants (Plasma 5.27):
|
||||
# just ninep-kf5 9P frontend with KF5/Qt5
|
||||
# just dbus-kf5 D-Bus frontend with KF5/Qt5
|
||||
#
|
||||
# Build and install are separate phases. No sudo.
|
||||
|
||||
|
|
@ -18,11 +22,20 @@ default: build-9p install-9p
|
|||
# === D-Bus path ===
|
||||
dbus: build-dbus install-dbus
|
||||
|
||||
# === KF5 variants ===
|
||||
ninep-kf5: build-ninep-kf5 install-ninep-kf5
|
||||
|
||||
dbus-kf5: build-dbus-kf5 install-dbus-kf5
|
||||
|
||||
# === Build targets ===
|
||||
|
||||
build-9p: core ninep ollie-remote acme httpgw webui kde
|
||||
build-9p: core ninep acme httpgw webui kde
|
||||
|
||||
build-dbus: core dbus-bin ollie-remote kde httpgw webui
|
||||
build-dbus: core dbus-bin kde httpgw webui
|
||||
|
||||
build-ninep-kf5: core ninep acme httpgw webui kde-kf5
|
||||
|
||||
build-dbus-kf5: core dbus-bin kde-kf5 httpgw webui
|
||||
|
||||
core:
|
||||
@echo === Building ollie-core ===
|
||||
|
|
@ -62,6 +75,11 @@ kde:
|
|||
cd kde && cmake -B build-cmake -S . -DCMAKE_INSTALL_PREFIX=~/.local
|
||||
cd kde && cmake --build build-cmake -j$(nproc)
|
||||
|
||||
kde-kf5:
|
||||
@echo === Building kde tools \(KF5\) ===
|
||||
cd kde && cmake -B build-kf5 -S . -DOLLIE_KF5=ON -DCMAKE_INSTALL_PREFIX=~/.local
|
||||
cd kde && cmake --build build-kf5 -j$(nproc)
|
||||
|
||||
# === Install targets ===
|
||||
|
||||
install-9p: test install-data install-scripts install-contrib install-kde install-el
|
||||
|
|
@ -78,6 +96,20 @@ install-dbus: test install-data install-scripts install-contrib install-dbus-bin
|
|||
@echo === Install complete \(D-Bus\) ===
|
||||
@echo 'Restart Plasma to pick up KDE plugins.'
|
||||
|
||||
install-ninep-kf5: test install-data install-scripts install-contrib install-kde-kf5 install-el
|
||||
install -m644 prompts/SYSTEM_PROMPT.md {{cfg}}/prompts/SYSTEM_PROMPT.md
|
||||
install -m644 prompts/session-9p.md {{cfg}}/prompts/session.md
|
||||
mkdir -p ~/.config/autostart
|
||||
install -m644 9p/org.ollie.olliesrv.desktop ~/.config/autostart/
|
||||
@echo === Install complete \(9P + KF5\) ===
|
||||
@echo 'Restart Plasma to pick up KDE plugins.'
|
||||
|
||||
install-dbus-kf5: test install-data install-scripts install-contrib install-dbus-bin install-kde-kf5
|
||||
install -m644 prompts/SYSTEM_PROMPT.md {{cfg}}/prompts/SYSTEM_PROMPT.md
|
||||
install -m644 prompts/session-dbus.md {{cfg}}/prompts/session.md
|
||||
@echo === Install complete \(D-Bus + KF5\) ===
|
||||
@echo 'Restart Plasma to pick up KDE plugins.'
|
||||
|
||||
install-dbus-bin:
|
||||
@echo === Installing ollied ===
|
||||
mkdir -p ~/.local/bin
|
||||
|
|
@ -106,6 +138,27 @@ install-kde:
|
|||
kquitapp6 krunner 2>/dev/null; true
|
||||
@echo === KDE install complete. Restart Plasma to pick up plugins. ===
|
||||
|
||||
install-kde-kf5:
|
||||
@echo === Installing ollie-kde \(KF5\) ===
|
||||
cmake --install kde/build-kf5
|
||||
# Desktop file and icon
|
||||
mkdir -p ~/.local/share/applications
|
||||
install -m644 kde/gui/org.ollie.gui.desktop ~/.local/share/applications/
|
||||
mkdir -p ~/.local/share/icons/hicolor/scalable/apps
|
||||
install -m644 kde/gui/ollie.svg ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
|
||||
# Dolphin service menus + helper scripts
|
||||
mkdir -p ~/.local/share/kio/servicemenus
|
||||
install -m755 kde/dolphin/ollie-actions-kf5.desktop ~/.local/share/kio/servicemenus/ollie-actions.desktop
|
||||
install -m755 kde/dolphin/ollie-ask ~/.local/bin/
|
||||
install -m755 kde/dolphin/ollie-session-here ~/.local/bin/
|
||||
# Plasma session environment
|
||||
mkdir -p ~/.config/plasma-workspace/env
|
||||
install -m755 kde/99-ollie-kf5.sh ~/.config/plasma-workspace/env/99-ollie.sh
|
||||
# Finalize
|
||||
kbuildsycoca5 --noincremental 2>/dev/null; true
|
||||
kquitapp5 krunner 2>/dev/null; true
|
||||
@echo === KDE KF5 install complete. Restart Plasma to pick up plugins. ===
|
||||
|
||||
install-el:
|
||||
@echo === Installing ellie.el ===
|
||||
mkdir -p ~/.config/emacs/ellie
|
||||
|
|
@ -275,9 +328,51 @@ uninstall:
|
|||
rm -f ~/.config/plasma-workspace/env/99-ollie.sh
|
||||
@echo === Uninstall complete ===
|
||||
|
||||
uninstall-ninep-kf5:
|
||||
@echo === Uninstalling ollie \(9P + KF5\) ===
|
||||
rm -f {{bin}}/olliesrv {{bin}}/ollie-9p-mount
|
||||
rm -f {{bin}}/ollie-httpgw
|
||||
rm -f {{bin}}/Ollie {{bin}}/Kmpl {{bin}}/Oi {{bin}}/Theo
|
||||
rm -f {{bin}}/ollie-remount {{bin}}/ollie-watchdog
|
||||
rm -rf {{cfg}}
|
||||
rm -f ~/.config/autostart/org.ollie.olliesrv.desktop
|
||||
# KDE (KF5)
|
||||
rm -f ~/.local/bin/ollie-tray ~/.local/bin/ollie-gui
|
||||
rm -f ~/.local/bin/ollie-ask ~/.local/bin/ollie-session-here
|
||||
rm -f ~/.local/share/applications/org.ollie.gui.desktop
|
||||
rm -f ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
|
||||
rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
|
||||
rm -f ~/.local/lib/qt5/plugins/kf5/krunner/krunner_ollie.so
|
||||
rm -f ~/.local/lib/qt5/plugins/ktexteditor/ollie_kate.so
|
||||
rm -rf ~/.local/share/plasma/plasmoids/org.ollie.plasmoid
|
||||
rm -f ~/.local/share/metainfo/org.ollie.plasmoid.appdata.xml
|
||||
rm -rf ~/.local/lib/x86_64-linux-gnu/qml/org/ollie
|
||||
kquitapp5 krunner 2>/dev/null; true
|
||||
# Emacs
|
||||
rm -rf ~/.config/emacs/ellie
|
||||
# Plasma env
|
||||
rm -f ~/.config/plasma-workspace/env/99-ollie.sh
|
||||
@echo === Uninstall complete \(9P + KF5\) ===
|
||||
|
||||
uninstall-kde-kf5:
|
||||
@echo === Uninstalling ollie-kde \(KF5\) ===
|
||||
rm -f ~/.local/bin/ollie-tray ~/.local/bin/ollie-gui
|
||||
rm -f ~/.local/bin/ollie-ask ~/.local/bin/ollie-session-here
|
||||
rm -f ~/.local/share/applications/org.ollie.gui.desktop
|
||||
rm -f ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
|
||||
rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
|
||||
rm -f ~/.local/lib/qt5/plugins/kf5/krunner/krunner_ollie.so
|
||||
rm -f ~/.local/lib/qt5/plugins/ktexteditor/ollie_kate.so
|
||||
rm -rf ~/.local/share/plasma/plasmoids/org.ollie.plasmoid
|
||||
rm -f ~/.local/share/metainfo/org.ollie.plasmoid.appdata.xml
|
||||
rm -rf ~/.local/lib/x86_64-linux-gnu/qml/org/ollie
|
||||
rm -f ~/.config/plasma-workspace/env/99-ollie.sh
|
||||
kquitapp5 krunner 2>/dev/null; true
|
||||
@echo === KF5 uninstall complete ===
|
||||
|
||||
# === Test targets ===
|
||||
|
||||
test: test-core test-9p test-remote
|
||||
test: test-core test-9p
|
||||
|
||||
test-core:
|
||||
@echo === Testing ollie-core ===
|
||||
|
|
@ -300,22 +395,30 @@ clean:
|
|||
rm -f {{bin}}/Ollie {{bin}}/Kmpl {{bin}}/Oi {{bin}}/Theo
|
||||
rm -f dbus/ollied
|
||||
rm -f {{bin}}/ollie-remote
|
||||
rm -rf kde/build-cmake
|
||||
rm -rf kde/build-cmake kde/build-kf5
|
||||
|
||||
# === Help ===
|
||||
|
||||
help:
|
||||
@echo 'Ollie monorepo build targets:'
|
||||
@echo ' just Build 9P path + install (default)'
|
||||
@echo ' just dbus Build D-Bus path + install'
|
||||
@echo ' just build-9p Build only (9P): core, 9p, acme, httpgw, webui'
|
||||
@echo ' just build-dbus Build only (D-Bus): core, ollied, kde, httpgw, webui'
|
||||
@echo ' just Build 9P path + install (default, KF6)'
|
||||
@echo ' just dbus Build D-Bus path + install (KF6)'
|
||||
@echo ' just ninep-kf5 Build 9P path + install (KF5)'
|
||||
@echo ' just dbus-kf5 Build D-Bus path + install (KF5)'
|
||||
@echo ' just build-9p Build only (9P): core, 9p, acme, httpgw, webui, kde'
|
||||
@echo ' just build-dbus Build only (D-Bus): core, ollied, kde, httpgw, webui'
|
||||
@echo ' just build-ninep-kf5 Build only (9P + KF5)'
|
||||
@echo ' just build-dbus-kf5 Build only (D-Bus + KF5)'
|
||||
@echo ' just install-9p Install with 9P prompt'
|
||||
@echo ' just install-dbus Install with D-Bus prompt'
|
||||
@echo ' just kde-kf5 Build KDE tools for KF5/Qt5 (Plasma 5.27)'
|
||||
@echo ' just install-kde-kf5 Install KDE KF5 plugins'
|
||||
@echo ' just uninstall-kde-kf5 Uninstall KDE KF5 plugins'
|
||||
@echo ' just uninstall-ninep-kf5 Uninstall everything (9P + KF5)'
|
||||
@echo ' just test Run all tests (core + 9p)'
|
||||
@echo ' just test-core Run core tests'
|
||||
@echo ' just test-9p Run 9p tests'
|
||||
@echo ' just uninstall Remove all installed files'
|
||||
@echo ' just clean Clean build artifacts'
|
||||
@echo ''
|
||||
@echo 'Individual: just core | ninep | dbus-bin | acme | httpgw | webui | kde'
|
||||
@echo 'Individual: just core | ninep | dbus-bin | acme | httpgw | webui | kde | kde-kf5'
|
||||
|
|
|
|||
2
kde
2
kde
|
|
@ -1 +1 @@
|
|||
Subproject commit cd612d28121dc9bf9fc80d1804895771304dbf44
|
||||
Subproject commit 90fe8e34784c9de0b0ecd3298ba6329ce828436f
|
||||
Loading…
Reference in New Issue