Now the software can be compiled from inside a cygwin terminal

19 files changed, 166 insertions, 61 deletions

diff --git a/xorg-server/hw/xwin/doflexbison.bat b/xorg-server/hw/xwin/doflexbison.bat
index a29508bcb..a29508bcb 100644..100755
--- a/xorg-server/hw/xwin/doflexbison.bat
+++ b/xorg-server/hw/xwin/doflexbison.bat
diff --git a/xorg-server/hw/xwin/glx/buildsimpledib.bat b/xorg-server/hw/xwin/glx/buildsimpledib.bat
index 1e1286bdd..1e1286bdd 100644..100755
--- a/xorg-server/hw/xwin/glx/buildsimpledib.bat
+++ b/xorg-server/hw/xwin/glx/buildsimpledib.bat
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index 720c29893..2195223fe 100644..100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -5,8 +5,14 @@ copy %systemroot%\system32\msvcr100.dll
 copy %systemroot%\system32\msvcp100.dll

 copy %systemroot%\system32\msvcr100d.dll

 copy %systemroot%\system32\msvcp100d.dll

-"C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi

-"C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi

+

+if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (

+  "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi

+  "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi

+) else (

+  "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi

+  "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi

+)

 del msvcr100.dll

 del msvcr100d.dll

 del msvcp100.dll

diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat
new file mode 100755
index 000000000..b09459a5d
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat
@@ -0,0 +1,9 @@
+@echo off
+
+set OUTFILE=base.ml1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   if (index($2, """(""") == 0) {    printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;   } else {    printf """  *		%%s			=	pc+%%s\n""", $1, $2;   }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
index b09459a5d..b2d222432 100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
@@ -1,9 +1,18 @@
-@echo off
+#!/bin/sh
 
-set OUTFILE=base.ml1_s.part
+INDIR=$1
+OUTFILE=base.ml1_s.part
 
-if exist %OUTFILE% del %OUTFILE%
+> $OUTFILE
 
-gawk "{   if (index($2, """(""") == 0) {    printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;   } else {    printf """  *		%%s			=	pc+%%s\n""", $1, $2;   }}" < layoutsMapping.lst >> %OUTFILE%
+awk '{ 
+  if (index($2, "(") == 0) {
+    printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
+  } else {
+    printf "  *		%s			=	pc+%s\n", $1, $2; 
+  }
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
 
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat
new file mode 100755
index 000000000..4d492e02b
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.ml1v1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
index 4d492e02b..7c2b1a84c 100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
@@ -1,7 +1,10 @@
-@echo off
+#!/bin/sh
 
-set OUTFILE=base.ml1v1_s.part
+INDIR=$1
+OUTFILE=base.ml1v1_s.part
 
-if exist %OUTFILE% del %OUTFILE%
+> $OUTFILE
 
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat
new file mode 100755
index 000000000..cec1334c0
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.ml1v_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
index cec1334c0..084d4c0be 100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
@@ -1,7 +1,10 @@
-@echo off
+#!/bin/sh
 
-set OUTFILE=base.ml1v_s.part
+INDIR=$1
+OUTFILE=base.ml1v_s.part
 
-if exist %OUTFILE% del %OUTFILE%
+> $OUTFILE
 
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml_s.bat
new file mode 100755
index 000000000..b7f0d9c46
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.bat
@@ -0,0 +1,9 @@
+@echo off
+
+set OUTFILE=base.ml_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
index b7f0d9c46..666ba870f 100755
--- a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
@@ -1,9 +1,14 @@
-@echo off
+#!/bin/sh
 
-set OUTFILE=base.ml_s.part
+INDIR=$1
+OUTFILE=base.ml_s.part
 
-if exist %OUTFILE% del %OUTFILE%
+> $OUTFILE
 
-gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s			=	pc+%s\n", $1, $2; 
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
 
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/mln_s.bat b/xorg-server/xkeyboard-config/rules/bin/mln_s.bat
new file mode 100755
index 000000000..15e0629be
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.bat
@@ -0,0 +1,10 @@
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+echo "{  if (index($2, """(""") == 0) {    printf """  *		%%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;  } else {    printf """  *		%%s		=	+%%s:%variant%\n""", $1, $2;  }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{  printf """  *		%%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
index 15e0629be..67fd8a06e 100755
--- a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh
@@ -1,10 +1,20 @@
-@echo off
-set variant=%1
+#!/bin/sh
 
-set OUTFILE=base.ml%variant%_s.part
+variant=$1
 
-if exist %OUTFILE% del %OUTFILE%
+INDIR=$2
+OUTFILE=base.ml${variant}_s.part
 
-echo "{  if (index($2, """(""") == 0) {    printf """  *		%%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;  } else {    printf """  *		%%s		=	+%%s:%variant%\n""", $1, $2;  }}" < layoutsMapping.lst >> %OUTFILE%
+> $OUTFILE
 
-gawk "{  printf """  *		%%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.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/layoutsMapping.lst >> $OUTFILE
+
+awk '{
+  printf "  *		%s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat
new file mode 100755
index 000000000..78119bcc7
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat
@@ -0,0 +1,8 @@
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%v%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{  printf """  *		%%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
index 78119bcc7..1a5f40f25 100755
--- a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
@@ -1,8 +1,12 @@
-@echo off
-set variant=%1
+#!/bin/sh
 
-set OUTFILE=base.ml%variant%v%variant%_s.part
+variant=$1
 
-if exist %OUTFILE% del %OUTFILE%
+INDIR=$2
+OUTFILE=base.ml${variant}v${variant}_s.part
 
-gawk "{  printf """  *		%%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
+> $OUTFILE
+
+awk '{
+  printf "  *		%s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat b/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat
new file mode 100755
index 000000000..573cb930f
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.mlv_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
index 573cb930f..5b466d59c 100755
--- a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
@@ -1,7 +1,10 @@
-@echo off
+#!/bin/sh
 
-set OUTFILE=base.mlv_s.part
+INDIR=$1
+OUTFILE=base.mlv_s.part
 
-if exist %OUTFILE% del %OUTFILE%
+> $OUTFILE
 
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/xorg-server/xkeyboard-config/rules/compat/makefile b/xorg-server/xkeyboard-config/rules/compat/makefile
index 832ef5f80..e14430c74 100644
--- a/xorg-server/xkeyboard-config/rules/compat/makefile
+++ b/xorg-server/xkeyboard-config/rules/compat/makefile
@@ -14,40 +14,43 @@ base.ml1_s.part \
 base.mlv_s.part \
 base.ml1v1_s.part
 
-
+# Here we make a distinction when compiling from cygwin or from cmd
+ifdef SHLVL
+SH=sh
+SHEXT=.sh
+else
 SH=cmd /c
+SHEXT=.bat
+endif
 
-base.ml2_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 2
-
-base.ml3_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 3
+base.ml2_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 2 .
 
-base.ml4_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 4
+base.ml3_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 3 .
 
-base.ml2v2_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 2
+base.ml4_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 4 .
 
-base.ml3v3_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 3
+base.ml2v2_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 2 .
 
-base.ml4v4_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 4
+base.ml3v3_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 3 .
 
-base.ml_s.part: ml_s.bat $(transform_files)
-	$(SH) $<
+base.ml4v4_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 4 .
 
-base.ml1_s.part: ml1_s.bat $(transform_files)
-	$(SH) $<
+base.ml_s.part: $(scripts_dir)\ml_s$(SHEXT) $(transform_files)
+	$(SH) $< .
 
-base.mlv_s.part: mlv_s.bat $(transform_files)
-	$(SH) $<
+base.ml1_s.part: $(scripts_dir)\ml1_s$(SHEXT) $(transform_files)
+	$(SH) $< .
 
-base.ml1v1_s.part: ml1v1_s.bat $(transform_files)
-	$(SH) $<
+base.mlv_s.part: $(scripts_dir)\mlv_s$(SHEXT) $(transform_files)
+	$(SH) $< .
 
-%.bat: $(scripts_dir)\%.sh
-	copy $< $@
+base.ml1v1_s.part: $(scripts_dir)\ml1v1_s$(SHEXT) $(transform_files)
+	$(SH) $< .
 
 all: $(SCRIPTS)
diff --git a/xorg-server/xkeyboard-config/xkbrules.mak b/xorg-server/xkeyboard-config/xkbrules.mak
index 8c1efbec9..c117b30c5 100644
--- a/xorg-server/xkeyboard-config/xkbrules.mak
+++ b/xorg-server/xkeyboard-config/xkbrules.mak
@@ -18,7 +18,9 @@ ifneq ($(DIRFILE),)
 PATH:=$(relpath $(MHMAKECONF)\libxcb\src\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libX11\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libXau\$(OBJDIR))\;$(PATH)
 export PATH
 
-$(DIRFILE): extrastuff $(DATA_FILES)
+load_makefile ..\..\..\xkbcomp\makefile MAKESERVER=0 DEBUG=0
+
+$(DIRFILE): extrastuff $(DATA_FILES) ..\..\..\xkbcomp\obj\release\xkbcomp.exe
 	-del -e $@
-	cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *
+	cd $(DESTDIR) & ..\..\..\xkbcomp\obj\release\xkbcomp.exe -lfhlpR -o $(relpath $@) *
 endif