8 files changed, 95 insertions, 70 deletions
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
index 7e17d8851..6fc8f4713 100644
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
@@ -1,20 +1,10 @@
-#!/bin/sh
+@echo off
+set variant=%1
 
-variant=$1
+set OUTFILE=base.l%variant%_s.part
 
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}_s.part
+if exist %OUTFILE% del %OUTFILE%
 
-> $OUTFILE
+gawk "{ if (index($2, """(""") == 0) { printf """  %%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;} else { printf """  %%s		=	+%%s:%variant%\n""", $1, $2; } }" layoutRename.lst >> %OUTFILE%
 
-awk '{ 
-  if (index($2, "(") == 0) {
-    printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
-  } else {
-    printf "  %s		=	+%s:'${variant}'\n", $1, $2; 
-  }
-}' < $INDIR/layoutRename.lst >> $OUTFILE
-
-awk '{ 
-  printf "  %s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  %%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
index ae699f95b..a2b828803 100644
--- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
@@ -1,12 +1,8 @@
-#!/bin/sh
+@echo off
+set variant=%1
 
-variant=$1
+set OUTFILE=base.l%variant%v%variant%_s.part
 
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}v${variant}_s.part
+if exist %OUTFILE% del %OUTFILE%
 
-> $OUTFILE
-
-awk '{ 
-  printf "  %s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  %%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile
new file mode 100644
index 000000000..1abfe775f
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/makefile
@@ -0,0 +1,61 @@
+
+TRANSFORM_FILES=layoutRename.lst variantRename.lst
+
+TRANSFORM_SCRIPTS= \
+ln_s.sh \
+lnv_s.sh \
+ml_s.sh \
+mlv_s.sh \
+ml1_s.sh \
+ml1v_s.sh \
+ml1v1_s.sh
+
+SCRIPTS= \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
+base.ml_s.part
+
+SH=cmd /c
+
+%.bat: %.sh
+	copy $< $@
+
+base.l2_s.part: ln_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 2
+
+base.l3_s.part: ln_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 3
+
+base.l4_s.part: ln_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 4
+
+base.l2v2_s.part: lnv_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 2
+
+base.l3v3_s.part: lnv_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 3
+
+base.l4v4_s.part: lnv_s.bat $(TRANSFORM_FILES)
+	$(SH) $< 4
+
+base.ml_s.part: ml_s.bat $(TRANSFORM_FILES)
+	$(SH) $<
+
+base.ml1_s.part: ml1_s.bat $(TRANSFORM_FILES)
+	$(SH) $<
+
+base.mlv_s.part: mlv_s.bat $(TRANSFORM_FILES)
+	$(SH) $<
+
+base.ml1v1_s.part: ml1v1_s.bat $(TRANSFORM_FILES)
+	$(SH) $<
+
+all: $(SCRIPTS)
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
index 327de2d9c..dedccdb45 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
@@ -1,18 +1,9 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.ml1_s.part
+set OUTFILE=base.ml1_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
 
-awk '{ 
-  if (index($2, "(") == 0) {
-    printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
-  } else {
-    printf "  *		%s			=	pc+%s\n", $1, $2; 
-  }
-}' < $INDIR/layoutRename.lst >> $OUTFILE
+gawk "{if (index($2, """(""") == 0) { printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """  *		%%s			=	pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE%
 
-awk '{ 
-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
index 9edcb8e8c..26de0ea38 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
@@ -1,10 +1,7 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.ml1v1_s.part
+set OUTFILE=base.ml1v1_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
 
-awk '{ 
-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
index 02ae5726d..afd7d7b19 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
@@ -1,10 +1,7 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.ml1v_s.part
+set OUTFILE=base.ml1v_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
 
-awk '{ 
-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
index f35087380..c0b945a26 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
@@ -1,14 +1,9 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.ml_s.part
+set OUTFILE=base.ml_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
 
-awk '{ 
-  printf "  *		%s			=	pc+%s\n", $1, $2; 
-}' < $INDIR/layoutRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
 
-awk '{ 
-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
index ea644dcab..4dbe7acb3 100644
--- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
@@ -1,10 +1,8 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.mlv_s.part
+set OUTFILE=base.mlv_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
 
-awk '{ 
-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE