From 3af2c7421c17d0220bbdd3ca341dbaa0383bcff1 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 8 Apr 2021 19:42:56 +0200 Subject: [PATCH] Dependency fixes --- dotherside | 2 +- qml.core.scm | 2 +- qml.egg | 7 +++++-- qml.lowlevel.scm | 16 +--------------- scripts/salmonella-run.sh | 5 +++++ 5 files changed, 13 insertions(+), 19 deletions(-) create mode 100755 scripts/salmonella-run.sh diff --git a/dotherside b/dotherside index f357c6e..f03ede8 160000 --- a/dotherside +++ b/dotherside @@ -1 +1 @@ -Subproject commit f357c6edd9b07c769af2a54e1f85d4908b0a08d4 +Subproject commit f03ede889d68f87f37693394bfdc98dd486dda4f diff --git a/qml.core.scm b/qml.core.scm index 33435ed..5c89555 100644 --- a/qml.core.scm +++ b/qml.core.scm @@ -1,7 +1,7 @@ ;; -*- geiser-scheme: chicken -*- (module (qml core) * - (import (scheme base)) + (import scheme) (import (chicken gc)) (import (chicken string)) (import (chicken base)) diff --git a/qml.egg b/qml.egg index ca1d2c3..cbb2de4 100644 --- a/qml.egg +++ b/qml.egg @@ -3,7 +3,11 @@ (synopsis "A Chicken wrapper for DOtherSide") (category ui) (license "LGPLv3") - (dependencies coops coops-utils foreigners utf8 srfi-69) + (dependencies coops + coops-utils + foreigners + utf8 + srfi-69) (foreign-dependencies Qt5Core Qt5Widgets Qt5Gui @@ -60,4 +64,3 @@ "-L" "-lOpenGL")) (extension qml.core (component-dependencies qml.lowlevel)))) - diff --git a/qml.lowlevel.scm b/qml.lowlevel.scm index ccb3927..bda6a3e 100644 --- a/qml.lowlevel.scm +++ b/qml.lowlevel.scm @@ -1,7 +1,7 @@ ;; -*- geiser-scheme: chicken -*- (module (qml lowlevel) * - (import (scheme base)) + (import scheme) (import (chicken foreign)) (import foreigners) (begin @@ -614,19 +614,6 @@ (define dos_qobject_signal_emit (foreign-lambda void "dos_qobject_signal_emit" (c-pointer DosQObject) c-string int (c-pointer c-pointer))) - (define dos_qobject_signal_connect - (foreign-lambda bool "dos_qobject_signal_connect" - (c-pointer DosQObject) ;; senderVPtr - c-string ;; signal - (c-pointer DosQObject) ;; receiverVPtr - c-string ;; method - int)) ;; type - (define dos_qobject_signal_disconnect - (foreign-lambda bool "dos_qobject_signal_disconnect" - (c-pointer DosQObject) ;; senderVPtr - c-string ;; signal - (c-pointer DosQObject) ;; receiverVPtr - c-string)) ;; method (define dos_qobject_objectName (foreign-lambda c-string "dos_qobject_objectName" (c-pointer DosQObject))) @@ -785,4 +772,3 @@ (define dos_qpointer_data (foreign-lambda (c-pointer DosQObject) "dos_qpointer_data" (c-pointer DosQPointer))))) - diff --git a/scripts/salmonella-run.sh b/scripts/salmonella-run.sh new file mode 100755 index 0000000..d4ffbce --- /dev/null +++ b/scripts/salmonella-run.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +rm -rf report +salmonella --keep-repo --repo-dir=./petri-dish +salmonella-html-report ./salmonella.log report