Skip to content

Commit e95e00e

Browse files
committed
Makefile.in: add extra-install-apport target
1 parent d229451 commit e95e00e

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

Makefile.in

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ install-bin: craftos $(filter fixup-liblua-path,$(MAKECMDGOALS))
192192
echo " [CP] craftos"
193193
cp craftos "$(DESTDIR)$(BINDIR)/craftos"
194194

195+
195196
# craftos2-lua does have a ``make install`` rule, but it installs a lot of
196197
# files that conflict with a standard Lua installation.
197198
install-liblua: craftos2-lua/src/liblua$(LIBEXT)
@@ -219,6 +220,18 @@ extra-install-linux-plugin: linux-plugin fixup-liblua-path
219220
echo " [CP] ccemux$(LIBEXT)"
220221
cp "ccemux$(LIBEXT)" "$(DESTDIR)$(SHAREDIR)/craftos/plugins"
221222

223+
# Not installed by default, since this is not always wanted.
224+
extra-install-apport:
225+
echo " [MKDIR] $(DESTDIR)$(SHAREDIR)/apport/package-hooks"
226+
mkdir -p "$(DESTDIR)$(SHAREDIR)/apport/package-hooks"
227+
echo " [CP] resources/apport/apport_hook.py"
228+
cp resources/apport/apport_hook.py $(DESTDIR)$(SHAREDIR)/apport/package-hooks/craftos-pc.py
229+
cp resources/apport/apport_hook.py $(DESTDIR)$(SHAREDIR)/apport/package-hooks/source_craftos-pc.py
230+
echo " [MKDIR] $(DESTDIR)$(SYSCONFDIR)/apport/crashdb.conf.d"
231+
mkdir -p "$(DESTDIR)$(SYSCONFDIR)/apport/crashdb.conf.d"
232+
echo " [CP] resources/apport/apport_crashdb.conf"
233+
cp resources/apport/apport_crashdb.conf $(DESTDIR)$(SYSCONFDIR)/apport/crashdb.conf.d/craftos_pc-crashdb.conf
234+
222235
uninstall:
223236
echo " [RM] $(DESTDIR)$(BINDIR)/craftos"
224237
rm -f "$(DESTDIR)$(BINDIR)/craftos"
@@ -232,10 +245,15 @@ uninstall:
232245
rm -rf "$(DESTDIR)$(INCLUDEDIR)/CraftOS-PC"
233246
echo ' [RM] $(DESTDIR)$(MACAPPDIR)/CraftOS-PC.app'
234247
rm -rf "$(DESTDIR)$(MACAPPDIR)/CraftOS-PC.app"
235-
248+
echo ' [RM] $(DESTDIR)$(SYSCONFDIR)/apport/crashdb.conf.d/craftos_pc-crashdb.conf'
249+
rm -f "$(DESTDIR)$(SYSCONFDIR)/apport/crashdb.conf.d/craftos_pc-crashdb.conf"
250+
echo ' [RM] $(DESTDIR)$(SHAREDIR)/apport/package-hooks/source_craftos-pc.py'
251+
rm -f "$(DESTDIR)$(SHAREDIR)/apport/package-hooks/source_craftos-pc.py"
252+
echo ' [RM] $(DESTDIR)$(SHAREDIR)/apport/package-hooks/craftos-pc.py'
253+
rm -f "$(DESTDIR)$(SHAREDIR)/apport/package-hooks/craftos-pc.py"
236254

237255
test: craftos
238256
./craftos --headless --script $(shell pwd)/resources/CraftOSTest.lua -d "$(shell mktemp -d)"
239257

240-
.PHONY: all macapp clean rebuild install install-bin install-headers install-liblua install-linux install-darwin extra-install-linux-plugin uninstall test
258+
.PHONY: all macapp clean rebuild install install-bin install-headers install-liblua install-linux install-darwin extra-install-linux-plugin extra-install-apport uninstall test
241259
.SILENT:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-FileCopyrightText: 2019-2024 JackMacWindows
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
craftos_pc = {
6+
'impl': 'launchpad',
7+
'project': 'craftos-pc',
8+
'bug_pattern_base': None,
9+
}

resources/apport/apport_hook.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# SPDX-FileCopyrightText: 2019-2024 JackMacWindows
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
from apport.hookutils import *
6+
import apport.packaging
7+
8+
def add_info(report, ui):
9+
if not apport.packaging.is_distro_package(report['Package'].split()[0]):
10+
report['CrashDB'] = 'craftos_pc'

0 commit comments

Comments
 (0)