Mediacore/mediacore-hid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version bump and script tweak

Browse Source
This commit is contained in:
P.M. Kuipers 2023-01-09 22:07:54 +01:00
parent 6645929bd0
commit 0357e05623
5 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Makefile
View File

@ -104,7 +104,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.hpp CONFIG_HEADER = config.hpp
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(init_d_dirdir)" \ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemddir)" \
"$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)"
PROGRAMS = $(sbin_PROGRAMS) PROGRAMS = $(sbin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp am__dirstamp = $(am__leading_dot)dirstamp
@ -148,7 +148,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
SCRIPTS = $(init_d_dir_SCRIPTS) SCRIPTS = $(systemd_SCRIPTS)
AM_V_P = $(am__v_P_$(V)) AM_V_P = $(am__v_P_$(V))
am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
am__v_P_0 = false am__v_P_0 = false
@ -295,10 +295,10 @@ OBJEXT = o
PACKAGE = mediacore-hid PACKAGE = mediacore-hid
PACKAGE_BUGREPORT = bugs@miqra.nl PACKAGE_BUGREPORT = bugs@miqra.nl
PACKAGE_NAME = MediaCore HID Server PACKAGE_NAME = MediaCore HID Server
PACKAGE_STRING = MediaCore HID Server 4.1.0 PACKAGE_STRING = MediaCore HID Server 4.1.1
PACKAGE_TARNAME = mediacore-hid PACKAGE_TARNAME = mediacore-hid
PACKAGE_URL = http://www.miqra.nl/ PACKAGE_URL = http://www.miqra.nl/
PACKAGE_VERSION = 4.1.0 PACKAGE_VERSION = 4.1.1
PATH_SEPARATOR = : PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR = PKG_CONFIG_LIBDIR =
@ -306,7 +306,7 @@ PKG_CONFIG_PATH =
SET_MAKE = SET_MAKE =
SHELL = /bin/bash SHELL = /bin/bash
STRIP = STRIP =
VERSION = 4.1.0 VERSION = 4.1.1
abs_builddir = /home/pi/mediacore-hid abs_builddir = /home/pi/mediacore-hid
abs_srcdir = /home/pi/mediacore-hid abs_srcdir = /home/pi/mediacore-hid
abs_top_builddir = /home/pi/mediacore-hid abs_top_builddir = /home/pi/mediacore-hid
@ -379,12 +379,12 @@ SUPPORT_SRC = src/log/log.hpp \
src/gpio/mailbox.c src/gpio/mailbox.c
EXTRA_DIST = cfg/dbus/nl.miqra.MediaCore.Hid.conf \ EXTRA_DIST = cfg/dbus/nl.miqra.MediaCore.Hid.conf \
cfg/init.d/mediacore-hid.in \ lib/systemd/system/mediacore-hid.service.in \
cfg/rsyslog/syslog.MediaCore.Hid.conf \ cfg/rsyslog/syslog.MediaCore.Hid.conf \
src/mc-hid-introspect.xml src/mc-hid-introspect.xml
init_d_dirdir = $(sysconfdir)/init.d systemddir = /lib/systemd/system/mediacore-hid.service
init_d_dir_SCRIPTS = cfg/init.d/mediacore-hid systemd_SCRIPTS = lib/systemd/system/mediacore-hid.service
dbus_confdir = $(sysconfdir)/dbus-1/system.d dbus_confdir = $(sysconfdir)/dbus-1/system.d
dbus_conf_DATA = cfg/dbus/nl.miqra.MediaCore.Hid.conf dbus_conf_DATA = cfg/dbus/nl.miqra.MediaCore.Hid.conf
rsyslog_confdir = $(sysconfdir)/rsyslog.d rsyslog_confdir = $(sysconfdir)/rsyslog.d
@ -553,12 +553,12 @@ src/gpio/mediacore_hid_server-mailbox.$(OBJEXT): \
mediacore-hid-server$(EXEEXT): $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_DEPENDENCIES) $(EXTRA_mediacore_hid_server_DEPENDENCIES) mediacore-hid-server$(EXEEXT): $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_DEPENDENCIES) $(EXTRA_mediacore_hid_server_DEPENDENCIES)
@rm -f mediacore-hid-server$(EXEEXT) @rm -f mediacore-hid-server$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_LDADD) $(LIBS)
install-init_d_dirSCRIPTS: $(init_d_dir_SCRIPTS) install-systemdSCRIPTS: $(systemd_SCRIPTS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(init_d_dir_SCRIPTS)'; test -n "$(init_d_dirdir)" || list=; \ @list='$(systemd_SCRIPTS)'; test -n "$(systemddir)" || list=; \
if test -n "$$list"; then \ if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(init_d_dirdir)'"; \ echo " $(MKDIR_P) '$(DESTDIR)$(systemddir)'"; \
$(MKDIR_P) "$(DESTDIR)$(init_d_dirdir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(systemddir)" || exit 1; \
fi; \ fi; \
for p in $$list; do \ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@ -577,17 +577,17 @@ install-init_d_dirSCRIPTS: $(init_d_dir_SCRIPTS)
while read type dir files; do \ while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \ test -z "$$files" || { \
echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(init_d_dirdir)$$dir'"; \ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(systemddir)$$dir'"; \
$(INSTALL_SCRIPT) $$files "$(DESTDIR)$(init_d_dirdir)$$dir" || exit $$?; \ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(systemddir)$$dir" || exit $$?; \
} \ } \
; done ; done
uninstall-init_d_dirSCRIPTS: uninstall-systemdSCRIPTS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(init_d_dir_SCRIPTS)'; test -n "$(init_d_dirdir)" || exit 0; \ @list='$(systemd_SCRIPTS)'; test -n "$(systemddir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \ files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \ sed -e 's,.*/,,;$(transform)'`; \
dir='$(DESTDIR)$(init_d_dirdir)'; $(am__uninstall_files_from_dir) dir='$(DESTDIR)$(systemddir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -1032,7 +1032,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.hpp all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.hpp
installdirs: installdirs:
for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(init_d_dirdir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)"; do \ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemddir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: $(BUILT_SOURCES) install: $(BUILT_SOURCES)
@ -1110,8 +1110,8 @@ info: info-am
info-am: info-am:
install-data-am: install-dbus_confDATA install-init_d_dirSCRIPTS \ install-data-am: install-dbus_confDATA install-rsyslog_confDATA \
install-rsyslog_confDATA install-systemdSCRIPTS
install-dvi: install-dvi-am install-dvi: install-dvi-am
@ -1165,8 +1165,8 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \ uninstall-am: uninstall-dbus_confDATA uninstall-rsyslog_confDATA \
uninstall-rsyslog_confDATA uninstall-sbinPROGRAMS uninstall-sbinPROGRAMS uninstall-systemdSCRIPTS
.MAKE: all check install install-am install-strip .MAKE: all check install install-am install-strip
@ -1180,15 +1180,15 @@ uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \
install install-am install-data install-data-am \ install install-am install-data install-data-am \
install-dbus_confDATA install-dvi install-dvi-am install-exec \ install-dbus_confDATA install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \ install-exec-am install-html install-html-am install-info \
install-info-am install-init_d_dirSCRIPTS install-man \ install-info-am install-man install-pdf install-pdf-am \
install-pdf install-pdf-am install-ps install-ps-am \ install-ps install-ps-am install-rsyslog_confDATA \
install-rsyslog_confDATA install-sbinPROGRAMS install-strip \ install-sbinPROGRAMS install-strip install-systemdSCRIPTS \
installcheck installcheck-am installdirs maintainer-clean \ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-dbus_confDATA \ uninstall-am uninstall-dbus_confDATA \
uninstall-init_d_dirSCRIPTS uninstall-rsyslog_confDATA \ uninstall-rsyslog_confDATA uninstall-sbinPROGRAMS \
uninstall-sbinPROGRAMS uninstall-systemdSCRIPTS
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -1196,7 +1196,7 @@ uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \
src/mc-hid-server-glue.hpp: src/mc-hid-introspect.xml src/mc-hid-server-glue.hpp: src/mc-hid-introspect.xml
dbusxx-xml2cpp $^ --adaptor=$@ dbusxx-xml2cpp $^ --adaptor=$@
cfg/init.d/mediacore-hid: cfg/init.d/mediacore-hid.in lib/systemd/system/mediacore-hid.service: lib/systemd/system/mediacore-hid.service.in
cat $^ > $@ cat $^ > $@
sed -i "s#@BIN_DIR@#$(bindir)#" $@ sed -i "s#@BIN_DIR@#$(bindir)#" $@
sed -i "s#@ETC_DIR@#$(sysconfdir)#" $@ sed -i "s#@ETC_DIR@#$(sysconfdir)#" $@

4
config.hpp
View File

@ -11,7 +11,7 @@
#define PACKAGE_NAME "MediaCore HID Server" #define PACKAGE_NAME "MediaCore HID Server"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "MediaCore HID Server 4.1.0" #define PACKAGE_STRING "MediaCore HID Server 4.1.1"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mediacore-hid" #define PACKAGE_TARNAME "mediacore-hid"
@ -20,4 +20,4 @@
#define PACKAGE_URL "http://www.miqra.nl/" #define PACKAGE_URL "http://www.miqra.nl/"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "4.1.0" #define PACKAGE_VERSION "4.1.1"

2
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([MediaCore HID Server], [4.1.0], [bugs@miqra.nl], [mediacore-hid], [http://www.miqra.nl/]) AC_INIT([MediaCore HID Server], [4.1.1], [bugs@miqra.nl], [mediacore-hid], [http://www.miqra.nl/])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.11 no-define foreign subdir-objects]) AM_INIT_AUTOMAKE([1.11 no-define foreign subdir-objects])
AC_CONFIG_HEADERS([config.hpp]) AC_CONFIG_HEADERS([config.hpp])

1
debpackager.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
rm -r deb_dist
rm version.py rm version.py
make version.py make version.py
python debpackager.py python debpackager.py

2
version.py
View File

@ -1,2 +1,2 @@
PACKAGE="mediacore-hid" PACKAGE="mediacore-hid"
VERSION="4.1.0" VERSION="4.1.1"