mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

Move libx52 to top level

reverse-scroll
nirenjan 2021-07-29 21:36:54 -07:00
parent 0eeab91a8d
commit e3bccd3ac3
28 changed files with 110 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -10,7 +10,7 @@ if USE_NLS
po_SUBDIRS = po
endif
SUBDIRS = $(po_SUBDIRS) lib utils daemon tests udev
SUBDIRS = $(po_SUBDIRS) libx52 lib utils daemon tests udev
# Extra files that need to be in the distribution
EXTRA_DIST = \

5
configure.ac
View File

@ -60,7 +60,6 @@ AC_SUBST([INIH_LIBS])
# Pinelog configuration
AC_SUBST([PINELOG_CFLAGS], ["-DPINELOG_SHOW_DATE=1 -DPINELOG_SHOW_LEVEL=1 -DPINELOG_SHOW_BACKTRACE=1"])
AC_SUBST([X52_INCLUDE], ["-I \$(top_srcdir)/lib/libx52"])
# Check for hidapi. This uses a different pkg-config file on Linux vs other
# hosts, so check accordingly
@ -125,8 +124,8 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([ po/Makefile.in
Makefile
lib/Makefile
lib/libx52/Makefile
lib/libx52/libx52.pc
libx52/Makefile
libx52/libx52.pc
lib/libusbx52/Makefile
lib/libx52util/Makefile
lib/libx52io/Makefile

4
daemon/Makefile.am
View File

@ -16,7 +16,7 @@ x52d_SOURCES = \
x52d_CFLAGS = \
-I $(top_srcdir) \
-I $(top_srcdir)/lib/libx52io \
-I $(top_srcdir)/lib/libx52 \
-I $(top_srcdir)/libx52 \
-I $(top_srcdir)/lib/libx52util \
-I $(top_srcdir)/lib/pinelog \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@ -28,7 +28,7 @@ x52d_CFLAGS = \
x52d_LDFLAGS = @INIH_LIBS@ @PTHREAD_LIBS@ $(WARN_LDFLAGS)
x52d_LDADD = \
../lib/pinelog/libpinelog.la \
../lib/libx52/libx52.la \
../libx52/libx52.la \
@LTLIBINTL@
x52dconfdir = @sysconfdir@/x52d

2
lib/Makefile.am
View File

@ -4,5 +4,5 @@
#
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
SUBDIRS = libx52 libx52util libusbx52 libx52io pinelog
SUBDIRS = libx52util libusbx52 libx52io pinelog

2
lib/libusbx52/Makefile.am
View File

@ -26,7 +26,7 @@ x52test_create_device_list_CFLAGS = @LIBUSB_CFLAGS@ $(WARN_CFLAGS)
x52test_create_device_list_LDFLAGS = $(WARN_LDFLAGS)
x52test_log_actions_SOURCES = util/log_actions.c $(libusbx52_la_SOURCES)
x52test_log_actions_CFLAGS = @X52_INCLUDE@ @LIBUSB_CFLAGS@ $(WARN_CFLAGS)
x52test_log_actions_CFLAGS = -I $(top_srcdir)/libx52 @LIBUSB_CFLAGS@ $(WARN_CFLAGS)
x52test_log_actions_LDFLAGS = $(WARN_LDFLAGS)
EXTRA_DIST = README.md libusbx52.h

2
lib/libx52util/Makefile.am
View File

@ -12,7 +12,7 @@ lib_LTLIBRARIES = libx52util.la
# This library provides extra utilities for ease of use
nodist_libx52util_la_SOURCES = util_char_map.c
libx52util_la_SOURCES = x52_char_map_lookup.c
libx52util_la_CFLAGS = -I $(top_srcdir)/lib/libx52 $(WARN_CFLAGS)
libx52util_la_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS)
libx52util_la_LDFLAGS = -version-info 1:0:0 $(WARN_LDFLAGS)
# Header files that need to be copied

0
lib/libx52/Makefile.am → libx52/Makefile.am
View File

0
lib/libx52/README.md → libx52/README.md
View File

0
lib/libx52/doc/caveats.dox → libx52/doc/caveats.dox
View File

0
lib/libx52/doc/integration.dox → libx52/doc/integration.dox
View File

0
lib/libx52/doc/main.dox → libx52/doc/main.dox
View File

0
lib/libx52/libx52.h → libx52/libx52.h
View File

0
lib/libx52/libx52.pc.in → libx52/libx52.pc.in
View File

0
lib/libx52/x52_commands.h → libx52/x52_commands.h
View File

0
lib/libx52/x52_common.h → libx52/x52_common.h
View File

0
lib/libx52/x52_control.c → libx52/x52_control.c
View File

0
lib/libx52/x52_core.c → libx52/x52_core.c
View File

0
lib/libx52/x52_date_time.c → libx52/x52_date_time.c
View File

0
lib/libx52/x52_mfd_led.c → libx52/x52_mfd_led.c
View File

0
lib/libx52/x52_strerror.c → libx52/x52_strerror.c
View File

0
lib/libx52/x52_stringify.c → libx52/x52_stringify.c
View File

0
lib/libx52/x52_test_gen.py → libx52/x52_test_gen.py
View File

0
lib/libx52/x52_tests.json → libx52/x52_tests.json
View File

4
po/POTFILES.in
View File

@ -1,6 +1,6 @@
# List of source files which contain translatable strings.
lib/libx52/x52_strerror.c
lib/libx52/x52_stringify.c
libx52/x52_strerror.c
libx52/x52_stringify.c
lib/libx52io/io_strings.c

96
po/x52pro-linux.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: x52pro-linux 0.2.2\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
"POT-Creation-Date: 2021-07-27 09:34-0700\n"
"POT-Creation-Date: 2021-07-29 21:40-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,196 +17,196 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: lib/libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101
#: libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101
msgid "Success"
msgstr ""
#: lib/libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102
#: libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102
msgid "Initialization failure"
msgstr ""
#: lib/libx52/x52_strerror.c:25
#: libx52/x52_strerror.c:25
msgid "Insufficient memory"
msgstr ""
#: lib/libx52/x52_strerror.c:26
#: libx52/x52_strerror.c:26
msgid "Invalid parameter"
msgstr ""
#: lib/libx52/x52_strerror.c:27
#: libx52/x52_strerror.c:27
msgid "Operation not supported"
msgstr ""
#: lib/libx52/x52_strerror.c:28
#: libx52/x52_strerror.c:28
msgid "Try again"
msgstr ""
#: lib/libx52/x52_strerror.c:29
#: libx52/x52_strerror.c:29
msgid "Input parameter out of range"
msgstr ""
#: lib/libx52/x52_strerror.c:30
#: libx52/x52_strerror.c:30
msgid "USB transaction failure"
msgstr ""
#: lib/libx52/x52_strerror.c:31
#: libx52/x52_strerror.c:31
msgid "USB input/output error"
msgstr ""
#: lib/libx52/x52_strerror.c:32
#: libx52/x52_strerror.c:32
msgid "Access denied"
msgstr ""
#: lib/libx52/x52_strerror.c:33
#: libx52/x52_strerror.c:33
msgid "No such device"
msgstr ""
#: lib/libx52/x52_strerror.c:34
#: libx52/x52_strerror.c:34
msgid "Entity not found"
msgstr ""
#: lib/libx52/x52_strerror.c:35
#: libx52/x52_strerror.c:35
msgid "Resource busy"
msgstr ""
#: lib/libx52/x52_strerror.c:36
#: libx52/x52_strerror.c:36
msgid "Operation timeout"
msgstr ""
#: lib/libx52/x52_strerror.c:37
#: libx52/x52_strerror.c:37
msgid "Overflow"
msgstr ""
#: lib/libx52/x52_strerror.c:38
#: libx52/x52_strerror.c:38
msgid "Pipe error"
msgstr ""
#: lib/libx52/x52_strerror.c:39
#: libx52/x52_strerror.c:39
msgid "System call interrupted"
msgstr ""
#: lib/libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125
#: libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125
#, c-format
msgid "Unknown error %d"
msgstr ""
#: lib/libx52/x52_stringify.c:29
#: libx52/x52_stringify.c:29
#, c-format
msgid "Unknown clock ID %d"
msgstr ""
#: lib/libx52/x52_stringify.c:30
#: libx52/x52_stringify.c:30
msgid "primary"
msgstr ""
#: lib/libx52/x52_stringify.c:31
#: libx52/x52_stringify.c:31
msgid "secondary"
msgstr ""
#: lib/libx52/x52_stringify.c:32
#: libx52/x52_stringify.c:32
msgid "tertiary"
msgstr ""
#: lib/libx52/x52_stringify.c:35
#: libx52/x52_stringify.c:35
#, c-format
msgid "Unknown clock format %d"
msgstr ""
#: lib/libx52/x52_stringify.c:36
#: libx52/x52_stringify.c:36
msgid "12 hour"
msgstr ""
#: lib/libx52/x52_stringify.c:37
#: libx52/x52_stringify.c:37
msgid "24 hour"
msgstr ""
#: lib/libx52/x52_stringify.c:40
#: libx52/x52_stringify.c:40
#, c-format
msgid "Unknown date format %d"
msgstr ""
#: lib/libx52/x52_stringify.c:41
#: libx52/x52_stringify.c:41
msgid "DD-MM-YY"
msgstr ""
#: lib/libx52/x52_stringify.c:42
#: libx52/x52_stringify.c:42
msgid "MM-DD-YY"
msgstr ""
#: lib/libx52/x52_stringify.c:43
#: libx52/x52_stringify.c:43
msgid "YY-MM-DD"
msgstr ""
#: lib/libx52/x52_stringify.c:46
#: libx52/x52_stringify.c:46
#, c-format
msgid "Unknown LED state %d"
msgstr ""
#: lib/libx52/x52_stringify.c:47 daemon/x52d_clock.c:28
#: libx52/x52_stringify.c:47 daemon/x52d_clock.c:28
msgid "off"
msgstr ""
#: lib/libx52/x52_stringify.c:48 daemon/x52d_clock.c:28
#: libx52/x52_stringify.c:48 daemon/x52d_clock.c:28
msgid "on"
msgstr ""
#: lib/libx52/x52_stringify.c:49
#: libx52/x52_stringify.c:49
msgid "red"
msgstr ""
#: lib/libx52/x52_stringify.c:50
#: libx52/x52_stringify.c:50
msgid "amber"
msgstr ""
#: lib/libx52/x52_stringify.c:51
#: libx52/x52_stringify.c:51
msgid "green"
msgstr ""
#: lib/libx52/x52_stringify.c:60
#: libx52/x52_stringify.c:60
msgid "Fire"
msgstr ""
#: lib/libx52/x52_stringify.c:63
#: libx52/x52_stringify.c:63
msgid "A"
msgstr ""
#: lib/libx52/x52_stringify.c:66
#: libx52/x52_stringify.c:66
msgid "B"
msgstr ""
#: lib/libx52/x52_stringify.c:69
#: libx52/x52_stringify.c:69
msgid "D"
msgstr ""
#: lib/libx52/x52_stringify.c:72
#: libx52/x52_stringify.c:72
msgid "E"
msgstr ""
#: lib/libx52/x52_stringify.c:75
#: libx52/x52_stringify.c:75
msgid "T1"
msgstr ""
#: lib/libx52/x52_stringify.c:78
#: libx52/x52_stringify.c:78
msgid "T2"
msgstr ""
#: lib/libx52/x52_stringify.c:81
#: libx52/x52_stringify.c:81
msgid "T3"
msgstr ""
#: lib/libx52/x52_stringify.c:84
#: libx52/x52_stringify.c:84
msgid "POV"
msgstr ""
#: lib/libx52/x52_stringify.c:87
#: libx52/x52_stringify.c:87
msgid "Clutch"
msgstr ""
#: lib/libx52/x52_stringify.c:90
#: libx52/x52_stringify.c:90
msgid "Throttle"
msgstr ""
#: lib/libx52/x52_stringify.c:93
#: libx52/x52_stringify.c:93
#, c-format
msgid "Unknown LED ID %d"
msgstr ""

96
po/xx_PL.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: x52pro-linux 0.2.1\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
"POT-Creation-Date: 2021-07-27 09:34-0700\n"
"POT-Creation-Date: 2021-07-29 21:40-0700\n"
"PO-Revision-Date: 2021-07-27 02:08-0700\n"
"Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
"Language-Team: Dummy Language for testing i18n\n"
@ -17,196 +17,196 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 3.0\n"
#: lib/libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101
#: libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101
msgid "Success"
msgstr "Uccesssay"
#: lib/libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102
#: libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102
msgid "Initialization failure"
msgstr "Initializationay ailurefay"
#: lib/libx52/x52_strerror.c:25
#: libx52/x52_strerror.c:25
msgid "Insufficient memory"
msgstr "Insufficientay emorymay"
#: lib/libx52/x52_strerror.c:26
#: libx52/x52_strerror.c:26
msgid "Invalid parameter"
msgstr "Invaliday arameterpay"
#: lib/libx52/x52_strerror.c:27
#: libx52/x52_strerror.c:27
msgid "Operation not supported"
msgstr "Operationay otnay upportedsay"
#: lib/libx52/x52_strerror.c:28
#: libx52/x52_strerror.c:28
msgid "Try again"
msgstr "Ytray againay"
#: lib/libx52/x52_strerror.c:29
#: libx52/x52_strerror.c:29
msgid "Input parameter out of range"
msgstr "Inputay arameterpay outay ofay angeray"
#: lib/libx52/x52_strerror.c:30
#: libx52/x52_strerror.c:30
msgid "USB transaction failure"
msgstr "USBay ansactiontray ailurefay"
#: lib/libx52/x52_strerror.c:31
#: libx52/x52_strerror.c:31
msgid "USB input/output error"
msgstr "USBay inputay/outputay erroray"
#: lib/libx52/x52_strerror.c:32
#: libx52/x52_strerror.c:32
msgid "Access denied"
msgstr "Accessay eniedday"
#: lib/libx52/x52_strerror.c:33
#: libx52/x52_strerror.c:33
msgid "No such device"
msgstr "Onay uchsay eviceday"
#: lib/libx52/x52_strerror.c:34
#: libx52/x52_strerror.c:34
msgid "Entity not found"
msgstr "Entityay otnay oundfay"
#: lib/libx52/x52_strerror.c:35
#: libx52/x52_strerror.c:35
msgid "Resource busy"
msgstr "Esourceray usybay"
#: lib/libx52/x52_strerror.c:36
#: libx52/x52_strerror.c:36
msgid "Operation timeout"
msgstr "Operationay imeouttay"
#: lib/libx52/x52_strerror.c:37
#: libx52/x52_strerror.c:37
msgid "Overflow"
msgstr "Overfloway"
#: lib/libx52/x52_strerror.c:38
#: libx52/x52_strerror.c:38
msgid "Pipe error"
msgstr "Ipepay erroray"
#: lib/libx52/x52_strerror.c:39
#: libx52/x52_strerror.c:39
msgid "System call interrupted"
msgstr "Ystemsay allcay interrupteday"
#: lib/libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125
#: libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125
#, c-format
msgid "Unknown error %d"
msgstr "Unknownay erroray %d"
#: lib/libx52/x52_stringify.c:29
#: libx52/x52_stringify.c:29
#, c-format
msgid "Unknown clock ID %d"
msgstr "Unknownay ockclay IDay %d"
#: lib/libx52/x52_stringify.c:30
#: libx52/x52_stringify.c:30
msgid "primary"
msgstr "imarypray"
#: lib/libx52/x52_stringify.c:31
#: libx52/x52_stringify.c:31
msgid "secondary"
msgstr "econdarysay"
#: lib/libx52/x52_stringify.c:32
#: libx52/x52_stringify.c:32
msgid "tertiary"
msgstr "ertiarytay"
#: lib/libx52/x52_stringify.c:35
#: libx52/x52_stringify.c:35
#, c-format
msgid "Unknown clock format %d"
msgstr "Unknownay ockclay ormatfay %d"
#: lib/libx52/x52_stringify.c:36
#: libx52/x52_stringify.c:36
msgid "12 hour"
msgstr "12 ourhay"
#: lib/libx52/x52_stringify.c:37
#: libx52/x52_stringify.c:37
msgid "24 hour"
msgstr "24 ourhay"
#: lib/libx52/x52_stringify.c:40
#: libx52/x52_stringify.c:40
#, c-format
msgid "Unknown date format %d"
msgstr "Unknownay ateday ormatfay %d"
#: lib/libx52/x52_stringify.c:41
#: libx52/x52_stringify.c:41
msgid "DD-MM-YY"
msgstr "DDay-MMay-YYay"
#: lib/libx52/x52_stringify.c:42
#: libx52/x52_stringify.c:42
msgid "MM-DD-YY"
msgstr "MMay-DDay-YYay"
#: lib/libx52/x52_stringify.c:43
#: libx52/x52_stringify.c:43
msgid "YY-MM-DD"
msgstr "YYay-MMay-DDay"
#: lib/libx52/x52_stringify.c:46
#: libx52/x52_stringify.c:46
#, c-format
msgid "Unknown LED state %d"
msgstr "Unknownay EDLay atestay %d"
#: lib/libx52/x52_stringify.c:47 daemon/x52d_clock.c:28
#: libx52/x52_stringify.c:47 daemon/x52d_clock.c:28
msgid "off"
msgstr "offay"
#: lib/libx52/x52_stringify.c:48 daemon/x52d_clock.c:28
#: libx52/x52_stringify.c:48 daemon/x52d_clock.c:28
msgid "on"
msgstr "onay"
#: lib/libx52/x52_stringify.c:49
#: libx52/x52_stringify.c:49
msgid "red"
msgstr "edray"
#: lib/libx52/x52_stringify.c:50
#: libx52/x52_stringify.c:50
msgid "amber"
msgstr "amberay"
#: lib/libx52/x52_stringify.c:51
#: libx52/x52_stringify.c:51
msgid "green"
msgstr "eengray"
#: lib/libx52/x52_stringify.c:60
#: libx52/x52_stringify.c:60
msgid "Fire"
msgstr "Irefay"
#: lib/libx52/x52_stringify.c:63
#: libx52/x52_stringify.c:63
msgid "A"
msgstr "Ay"
#: lib/libx52/x52_stringify.c:66
#: libx52/x52_stringify.c:66
msgid "B"
msgstr "Bay"
#: lib/libx52/x52_stringify.c:69
#: libx52/x52_stringify.c:69
msgid "D"
msgstr "Day"
#: lib/libx52/x52_stringify.c:72
#: libx52/x52_stringify.c:72
msgid "E"
msgstr "Eay"
#: lib/libx52/x52_stringify.c:75
#: libx52/x52_stringify.c:75
msgid "T1"
msgstr "Tay1"
#: lib/libx52/x52_stringify.c:78
#: libx52/x52_stringify.c:78
msgid "T2"
msgstr "Tay2"
#: lib/libx52/x52_stringify.c:81
#: libx52/x52_stringify.c:81
msgid "T3"
msgstr "Tay3"
#: lib/libx52/x52_stringify.c:84
#: libx52/x52_stringify.c:84
msgid "POV"
msgstr "OVPay"
#: lib/libx52/x52_stringify.c:87
#: libx52/x52_stringify.c:87
msgid "Clutch"
msgstr "Utchclay"
#: lib/libx52/x52_stringify.c:90
#: libx52/x52_stringify.c:90
msgid "Throttle"
msgstr "Ottlethray"
#: lib/libx52/x52_stringify.c:93
#: libx52/x52_stringify.c:93
#, c-format
msgid "Unknown LED ID %d"
msgstr "Unknownay EDLay IDay %d"

4
utils/cli/Makefile.am
View File

@ -10,6 +10,6 @@ bin_PROGRAMS = x52cli
# Command line utility that front ends the core library
x52cli_SOURCES = x52_cli.c
x52cli_CFLAGS = @X52_INCLUDE@ $(WARN_CFLAGS)
x52cli_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS)
x52cli_LDFLAGS = $(WARN_LDFLAGS)
x52cli_LDADD = ../../lib/libx52/libx52.la
x52cli_LDADD = ../../libx52/libx52.la

4
utils/test/Makefile.am
View File

@ -10,9 +10,9 @@ bin_PROGRAMS = x52test
# Test utility that exercises all the library functions
x52test_SOURCES = x52_test.c x52_test_mfd.c x52_test_led.c x52_test_clock.c
x52test_CFLAGS = @X52_INCLUDE@ -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
x52test_CFLAGS = -I $(top_srcdir)/libx52 -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
x52test_LDFLAGS = $(WARN_LDFLAGS)
x52test_LDADD = ../../lib/libx52/libx52.la
x52test_LDADD = ../../libx52/libx52.la
# Extra files that need to be in the distribution
EXTRA_DIST = x52_test_common.h