Some cleanup (#338)

* Upgrade sentry to 0.7.0 and do some cleanup

* Fix install and crash

Makefile

@@ -11,37 +11,76 @@ 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
+
+PKG_OBJ = oxide.pro Makefile
+PKG_OBJ += $(wildcard applications/**)
+PKG_OBJ += $(wildcard assets/**)
+PKG_OBJ += $(wildcard interfaces/**)
+PKG_OBJ += $(wildcard qmake/**)
+PKG_OBJ += $(wildcard shared/**)
+PKG_OBJ += $(wildcard tests/**)
+
+$(BUILD)/package/oxide.tar.gz: $(BUILD)/package/package $(PKG_OBJ)
+	rm -f $(BUILD)/package/oxide.tar.gz
 	tar \
 		--exclude='$(CURDIR)/.git' \
 		--exclude='$(BUILD)' \
@@ -53,43 +92,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/

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

@@ -20,4 +20,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

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

@@ -20,4 +20,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

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

@@ -18,4 +18,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/gio/gio.pro

@@ -29,4 +29,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/inject_evdev/inject_evdev.pro

@@ -18,4 +18,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/launcher/launcher.pro

@@ -50,4 +50,3 @@ PRECOMPILED_HEADER = \
     oxide_stable.h
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/lockscreen/lockscreen.pro

@@ -28,4 +28,3 @@ RESOURCES += \
     qml.qrc
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/notify-send/notify-send.pro

@@ -18,4 +18,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/process-manager/process-manager.pro

@@ -41,4 +41,3 @@ PRECOMPILED_HEADER = \
 LIBS += -lsystemd
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/screenshot-tool/screenshot-tool.pro

@@ -20,4 +20,3 @@ applications.path = /opt/usr/share/applications/
 INSTALLS += applications
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/screenshot-viewer/controller.h

@@ -5,8 +5,7 @@
 #include <QImage>
 #include <QQuickItem>
 #include <liboxide.h>
-
-#include "epframebuffer.h"
+#include <epframebuffer.h>
 
 #include "screenshotlist.h"
 

applications/screenshot-viewer/screenshot-viewer.pro

@@ -41,4 +41,3 @@ PRECOMPILED_HEADER = \
     anxiety_stable.h
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/settings-manager/settings-manager.pro

@@ -18,4 +18,3 @@ target.path = /opt/bin
 INSTALLS += target
 
 include(../../qmake/liboxide.pri)
-include(../../qmake/sentry.pri)

applications/system-service/apibase.cpp

@@ -21,4 +21,12 @@ int APIBase::hasPermission(QString permission, const char* sender){
     return true;
 }
 
+int APIBase::getSenderPid() {
+    if (!calledFromDBus()) {
+        return getpid();
+    }
+    return connection().interface()->servicePid(message().service());
+}
+int APIBase::getSenderPgid() { return getpgid(getSenderPid()); }
+
 #include "moc_apibase.cpp"

applications/system-service/apibase.h

@@ -19,14 +19,9 @@ class APIBase : public QObject, protected QDBusContext {
     virtual void setEnabled(bool enabled) = 0;
     int hasPermission(QString permission, const char* sender = __builtin_FUNCTION());
 
-protected:
-    int getSenderPid(){
-        if(!calledFromDBus()){
-            return getpid();
-        }
-        return connection().interface()->servicePid(message().service());
-    }
-    int getSenderPgid(){ return getpgid(getSenderPid()); }
+  protected:
+    int getSenderPid();
+    int getSenderPgid();
 };
 
 #endif // APIBASE_H