xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011

1 files changed, 51 insertions, 43 deletions

diff --git a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
index ccaaba7e0..90981a939 100644
--- a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
+++ b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh
@@ -1,43 +1,51 @@
-#!/bin/sh

-

-#

-# This script compares the group names which "have to be", according to the descriptions in base.xml -

-# and actually existing in the symbol files. Some differences are ok (like extra double quotes or 

-# extra escaping character) - but all the rest should be in sync.

-#

-

-ROOT="`dirname $0`/.."

-F1=reg2ll.lst

-F2=gn2ll.lst

-

-xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml | sort | uniq > $F1

-

-for i in $ROOT/symbols/*; do

-  if [ -f $i ]; then

-    id="`basename $i`"

-    export id

-    gawk 'BEGIN{

-  FS = "\"";

-  id = ENVIRON["id"];

-  isDefault = 0;

-}

-/.*default.*/{

-  isDefault = 1;

-}

-/xkb_symbols/{

-  variant = $2;

-}/^[[:space:]]*name\[Group1\][[:space:]]*=/{

-  if (isDefault == 1)

-  {

-    printf "%s:\"%s\"\n",id,$2;

-    isDefault=0;

-  } else

-  {

-    name=$2;

-    printf "%s(%s):\"%s\"\n", id, variant, name;

-  }

-}' $i

-  fi

-done | sort | uniq > $F2

-

-diff $F1 $F2

+#!/bin/sh
+
+#
+# This script compares the group names which "have to be", according to the descriptions in base.xml -
+# and actually existing in the symbol files. Some differences are ok (like extra double quotes or 
+# extra escaping character) - but all the rest should be in sync.
+#
+
+ROOT="`dirname $0`/.."
+F1=reg2ll.lst
+F2=gn2ll.lst
+F1b=${F1}base
+F1e=${F1}extras
+
+xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml > $F1b
+xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml > $F1e
+cat $F1b $F1e | sort | uniq > $F1
+rm -f $F1e $F1e
+
+for i in $ROOT/symbols/*; do
+  if [ -f $i ]; then
+    id="`basename $i`"
+    export id
+    gawk 'BEGIN{
+  FS = "\"";
+  id = ENVIRON["id"];
+  isDefault = 0;
+}
+/.*default.*/{
+  isDefault = 1;
+}
+/xkb_symbols/{
+  variant = $2;
+}/^[[:space:]]*name\[Group1\][[:space:]]*=/{
+  if (isDefault == 1)
+  {
+    printf "%s:\"%s\"\n",id,$2;
+    isDefault=0;
+  } else
+  {
+    name=$2;
+    if (variant == "olpc" || variant == "htcdream")
+      printf "%s:\"%s\"\n", id, name;
+    else
+      printf "%s(%s):\"%s\"\n", id, variant, name;
+  }
+}' $i
+  fi
+done | sort | uniq > $F2
+
+diff $F1 $F2