diff options
| author | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-08-07 20:05:55 +0200 |
|---|---|---|
| committer | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-08-07 20:05:55 +0200 |
| commit | eab32c2529ce53f9e01c12df739257511d58ebfb (patch) | |
| tree | d380d0bc3f200d6f219af924bac33243b8ac1783 /extras | |
| parent | 51668e2c8b7ffba73ec420f9896ea837d58f7c15 (diff) | |
Use the keymap check during “make distcheck” rather than “check”.
Since the check-keymaps.sh script checks for validity the source directory
and the Makefile.am file, instead of running it during user-oriented “make
check”, run it during developed-oriented “make distcheck”.
An invalid keymap will abort the execution which will prevent shipping
an incomplete Makefile.am.
To properly support out-of-source builds, pass as single parameter to the
test the path to the source directory.
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/keymap/check-keymaps.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh index f79c3f5a82..d4e3e91760 100755 --- a/extras/keymap/check-keymaps.sh +++ b/extras/keymap/check-keymaps.sh @@ -1,15 +1,19 @@ #!/bin/bash # check that all key names in keymaps/* are known in <linux/input.h> -KEYLIST=extras/keymap/keys.txt -RULES=extras/keymap/95-keymap.rules +# and that all key maps listed in the rules are valid and present in +# Makefile.am +SRCDIR=$1 +KEYLIST=$SRCDIR/extras/keymap/keys.txt +KEYMAPS_DIR=$SRCDIR/extras/keymap/keymaps #extras/keymap/keymaps +RULES=$SRCDIR/extras/keymap/95-keymap.rules [ -e "$KEYLIST" ] || { echo "need $KEYLIST please build first" >&2 exit 1 } -missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' extras/keymap/keymaps/*|sort -u)) +missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' ${KEYMAPS_DIR}/*|sort -u)) [ -z "$missing" ] || { echo "ERROR: unknown key names in extras/keymap/keymaps/*:" >&2 echo "$missing" >&2 @@ -22,11 +26,11 @@ for m in $maps; do # ignore inline mappings [ "$m" = "${m#0x}" ] || continue - [ -e extras/keymap/keymaps/$m ] || { + [ -e ${KEYMAPS_DIR}/$m ] || { echo "ERROR: unknown map name in $RULES: $m" >&2 exit 1 } - grep -q "extras/keymap/keymaps/$m\>" Makefile.am || { + grep -q "extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || { echo "ERROR: map file $m is not added to Makefile.am" >&2 exit 1 } |