Initial work to support per-application framebuffer

.github/workflows/build.yml

@@ -61,9 +61,21 @@ jobs:
     needs: [build]
     steps:
       - uses: actions/download-artifact@v3
-        id: download
+        id: repo
         with:
           name: repo
+          path: repo
+      - uses: actions/download-artifact@v3
+        id: build
+        with:
+          name: build
+          path: build
+      - name: Copy tests
+        run: |
+          mkdir -p ${{ steps.repo.outputs.download-path }}/tests
+          cp -al \
+            ${{ steps.build.outputs.download-path }}/opt/share/tests/. \
+            ${{ steps.repo.outputs.download-path }}/tests
       - uses: Eeems-Org/run-in-remarkable-action@v1
         with:
           setup: |
@@ -73,12 +85,14 @@ jobs:
             set -ex
             echo Y | toltecctl generate-opkg-conf
             opkg update
-            opkg install oxide
-            # systemctl disable --now xochitl
-            # systemctl enable --now tarnish
-            # TODO install and run tests
-            opkg remove --force-removal-of-dependent-packages liboxide
-          path: ${{ steps.download.outputs.download-path }}
+            opkg install oxide oxide-extra inject_evdev liboxide-dev
+            # TODO test tarnish service
+            find tests -type f -executable -print | while read test; do
+              echo "Running test $test"
+              "$test"
+            done
+            opkg remove --force-removal-of-dependent-packages liboxide libsentry
+          path: ${{ steps.repo.outputs.download-path }}
   release:
     needs: [build,test]
     if: ${{ github.ref == 'refs/heads/master' }}

Makefile

@@ -11,37 +11,67 @@ MAKEFLAGS := --jobs=$(shell nproc)
 DIST=$(CURDIR)/release
 BUILD=$(CURDIR)/.build
 
-
 ifneq ($(filter sentry,$(FEATURES)),)
-OBJ += sentry
-RELOBJ += $(DIST)/opt/lib/libsentry.so
-DEFINES += 'DEFINES+="SENTRY"'
+DEFINES += DEFINES+="SENTRY"
 endif
 
 OBJ += $(BUILD)/oxide/Makefile
 
-clean:
-	rm -rf $(DIST) $(BUILD)
+clean-base:
+	rm -rf $(DIST) $(BUILD)/oxide
 
-release: clean build $(RELOBJ)
-	mkdir -p $(DIST)
+clean: clean-base
+	rm -rf $(BUILD)
+
+release: clean-base build $(DIST)
+	# Force sentry makefile to regenerate so that install targets get when being build in toltecmk
+	cd $(BUILD)/oxide/shared/sentry && make qmake
 	# Force liboxide makefile to regenerate so that install targets get when being build in toltecmk
 	cd $(BUILD)/oxide/shared/liboxide && make qmake
 	INSTALL_ROOT=$(DIST) $(MAKE) --output-sync=target -C $(BUILD)/oxide install
 
-build: $(BUILD) $(OBJ)
+build: $(OBJ)
 	$(MAKE) --output-sync=target -C $(BUILD)/oxide all
 
 package: REV="~r$(shell git rev-list --count HEAD).$(shell git rev-parse --short HEAD)"
-package:
+package: version.txt $(DIST) $(BUILD)/package/oxide.tar.gz
+	toltecmk \
+		--verbose \
+		-w $(BUILD)/package/build \
+		-d $(BUILD)/package/dist \
+		$(BUILD)/package
+	cp -a $(BUILD)/package/dist/rmall/*.ipk $(DIST)
+
+version.txt:
 	if [ -d .git ];then \
 		echo $(REV) > version.txt; \
 	else \
 		echo "~manual" > version.txt; \
 	fi;
+
+$(DIST):
+	mkdir -p $(DIST)
+
+$(BUILD):
+	mkdir -p $(BUILD)
+
+$(BUILD)/.nobackup: $(BUILD)
+	touch $(BUILD)/.nobackup
+
+$(BUILD)/oxide: $(BUILD)/.nobackup
+	mkdir -p $(BUILD)/oxide
+
+$(BUILD)/oxide/Makefile: $(BUILD)/oxide
+	cd $(BUILD)/oxide && qmake -r $(DEFINES) $(CURDIR)
+
+$(BUILD)/package:
 	mkdir -p $(BUILD)/package
 	rm -rf $(BUILD)/package/build
+
+$(BUILD)/package/package: $(BUILD)/package
 	sed "s/~VERSION~/`cat version.txt`/" ./package > $(BUILD)/package/package
+
+$(BUILD)/package/oxide.tar.gz: $(BUILD)/package/package
 	tar \
 		--exclude='$(CURDIR)/.git' \
 		--exclude='$(BUILD)' \
@@ -53,43 +83,6 @@ package:
 		interfaces \
 		qmake \
 		shared \
+		tests \
 		oxide.pro \
 		Makefile
-	toltecmk \
-		--verbose \
-		-w $(BUILD)/package/build \
-		-d $(BUILD)/package/dist \
-		$(BUILD)/package
-	mkdir -p $(DIST)
-	cp -a $(BUILD)/package/dist/rmall/*.ipk $(DIST)
-
-sentry: $(BUILD)/sentry/libsentry.so
-
-$(BUILD):
-	mkdir -p $(BUILD)
-
-$(BUILD)/.nobackup: $(BUILD)
-	touch $(BUILD)/.nobackup
-
-$(BUILD)/oxide: $(BUILD)/.nobackup
-	mkdir -p $(BUILD)/oxide
-
-$(BUILD)/oxide/Makefile: $(BUILD)/oxide
-	cd $(BUILD)/oxide && qmake -r $(DEFINES) $(CURDIR)/oxide.pro
-
-$(BUILD)/sentry/libsentry.so: $(BUILD)/.nobackup
-	cd shared/sentry && cmake -B $(BUILD)/sentry/src \
-		-DBUILD_SHARED_LIBS=ON \
-		-DSENTRY_INTEGRATION_QT=ON \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DSENTRY_PIC=OFF \
-		-DSENTRY_BACKEND=breakpad \
-		-DSENTRY_BREAKPAD_SYSTEM=OFF \
-		-DSENTRY_EXPORT_SYMBOLS=ON \
-		-DSENTRY_PTHREAD=ON
-	cd shared/sentry && cmake --build $(BUILD)/sentry/src --parallel
-	cd shared/sentry && cmake --install $(BUILD)/sentry/src --prefix $(BUILD)/sentry --config RelWithDebInfo
-
-$(DIST)/opt/lib/libsentry.so: sentry
-	mkdir -p $(DIST)/opt/lib
-	cp -a $(BUILD)/sentry/lib/libsentry.so $(DIST)/opt/lib/

README.md

@@ -30,10 +30,3 @@ You can find other (likely outdated) [videos here](https://github.com/Eeems/oxid
  1. Install [toltecmk](https://pypi.org/project/toltecmk/)
  2. Run `make package`
  3. The ipk files can be found in the `dist/` folder
-
-### Nix
-Works on x86_64-linux or macOS via [nix-docker](https://github.com/LnL7/nix-docker).
-
-```ShellSession
-$ nix-build --argstr system 'x86_64-linux'
-```

applications/applications.pro

@@ -20,7 +20,9 @@ SUBDIRS = \
     xdg-desktop-menu \
     xdg-icon-resource \
     xdg-open \
-    xdg-settings
+    xdg-settings \
+    fbinfo \
+    xclip
 
 launcher.depends = system-service update-desktop-database
 lockscreen.depends = system-service
@@ -41,5 +43,7 @@ xdg-icon-resource.depends = system-service
 desktop-file-edit.depends =
 desktop-file-install.depends =
 inject_evdev.depends =
+fbinfo.depends = 
+xclip.depends = system-service
 
 INSTALLS += $$SUBDIRS

applications/desktop-file-edit/desktop-file-edit.pro

@@ -1,5 +1,4 @@
 QT -= gui
-QT += dbus
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
@@ -20,4 +19,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/desktop-file-install/desktop-file-install.pro

@@ -1,5 +1,4 @@
 QT -= gui
-QT += dbus
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
@@ -20,4 +19,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/desktop-file-validate/desktop-file-validate.pro

@@ -1,5 +1,4 @@
 QT -= gui
-QT += dbus
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
@@ -18,4 +17,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/fbinfo/.gitignore

@@ -0,0 +1,73 @@
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*.so.*
+*_pch.h.cpp
+*_resource.rc
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+.directory
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.res
+*.rc
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.sdf
+*.opensdf
+*.vcxproj
+*vcxproj.*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Python byte code
+*.pyc
+
+# Binaries
+# --------
+*.dll
+*.exe
+

applications/fbinfo/fbinfo.pro

@@ -0,0 +1,22 @@
+QT -= gui
+
+CONFIG += c++11
+CONFIG += console
+CONFIG -= app_bundle
+
+DEFINES += QT_DEPRECATED_WARNINGS
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+        main.cpp
+
+HEADERS +=
+
+TARGET = fbinfo
+include(../../qmake/common.pri)
+target.path = /opt/bin
+INSTALLS += target
+
+INCLUDEPATH += ../../shared/mxcfb
+
+include(../../qmake/liboxide.pri)