From eb3ab2452d8a1ef7a85af7a03e1622c12b40400b Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 19 Jun 2014 14:05:42 +0200
Subject: Bug 589707 - Flex .rule file for Visual Studio build can't cope with
 spaces in filenames

Adjusted the rules files and where and the vcproj file so it can handle paths with spaces as well.
When generating the documentation (Cygwin) a small problem appeared in a Makefile when there is a space in the path, this is solved as well.
---
 doc/Makefile.in          | 2 +-
 winbuild/Config.rules    | 4 ++--
 winbuild/Doxygen.vcproj  | 8 ++++----
 winbuild/Gen_head.rules  | 2 +-
 winbuild/Languages.rules | 4 ++--
 winbuild/Lex.rules       | 2 +-
 winbuild/Settings.rules  | 2 +-
 winbuild/Unistd.rules    | 2 +-
 winbuild/Version.rules   | 2 +-
 winbuild/moc.rules       | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1f472e6..f0c3a03 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -17,7 +17,7 @@ all: language config.doc FORCE
 	export DOXYGEN_DOCDIR; \
         VERSION=$(VERSION) ; \
 	export VERSION; \
-	$(DOXYGEN)/bin/doxygen
+	"$(DOXYGEN)/bin/doxygen"
 	@rm -f ../latex/refman.tex
 	@cp doxygen_logo*.gif ../html
 	@cp Makefile.latex ../latex/Makefile
diff --git a/winbuild/Config.rules b/winbuild/Config.rules
index 040fc65..788497d 100644
--- a/winbuild/Config.rules
+++ b/winbuild/Config.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Config"
 			DisplayName="Config"
-			CommandLine="python $(ProjectDir)..\src\configgen.py -cpp [AllOptions] [AdditionalOptions] [inputs] &gt; $(IntDir)/$(InputName)options.cpp"
+			CommandLine="python &quot;$(ProjectDir)..\src\configgen.py&quot; -cpp [AllOptions] [AdditionalOptions] [inputs] &gt; $(IntDir)/$(InputName)options.cpp"
 			Outputs="$(IntDir)/$(InputName)options.cpp"
 			FileExtensions="*.xml"
 			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
@@ -18,7 +18,7 @@
 		<CustomBuildRule
 			Name="Config_dw"
 			DisplayName="Config"
-			CommandLine="python $(ProjectDir)..\src\configgen.py -wiz [AllOptions] [AdditionalOptions] [inputs]  &gt; $(IntDir)/$(InputName)doc.cpp"
+			CommandLine="python &quot;$(ProjectDir)..\src\configgen.py&quot; -wiz [AllOptions] [AdditionalOptions] [inputs]  &gt; $(IntDir)/$(InputName)doc.cpp"
 			Outputs="$(IntDir)/$(InputName)doc.cpp"
 			FileExtensions="*.xml"
 			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj
index 920fa6d..366dfb4 100644
--- a/winbuild/Doxygen.vcproj
+++ b/winbuild/Doxygen.vcproj
@@ -948,7 +948,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
@@ -958,7 +958,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
@@ -968,7 +968,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
@@ -978,7 +978,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						CommandLine="bison -l -d -p ce_parseexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY &quot;$(InputPath)&quot; -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
diff --git a/winbuild/Gen_head.rules b/winbuild/Gen_head.rules
index 9f1e13d..c2e7550 100644
--- a/winbuild/Gen_head.rules
+++ b/winbuild/Gen_head.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Gen_head"
 			DisplayName="Gen_head"
-			CommandLine="python $(ProjectDir)..\src\to_c_cmd.py [AllOptions] [AdditionalOptions] [inputs] &lt; $(InputPath) &gt; $(IntDir)/$(InputName)$(InputExt).h"
+			CommandLine="python &quot;$(ProjectDir)..\src\to_c_cmd.py&quot; [AllOptions] [AdditionalOptions] [inputs] &lt; &quot;$(InputPath)&quot; &gt; $(IntDir)/$(InputName)$(InputExt).h"
 			Outputs="$(IntDir)/$(InputName)$(InputExt).h"
 			FileExtensions=".*"
 			AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py"
diff --git a/winbuild/Languages.rules b/winbuild/Languages.rules
index 0d57a05..8ff018a 100755
--- a/winbuild/Languages.rules
+++ b/winbuild/Languages.rules
@@ -6,8 +6,8 @@
         <Rules>
                 <CustomBuildRule
                         Name="Languages"
-                        DisplayName="Settings"
-                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h"
+                        DisplayName="Languages"
+                        CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h"
                         Outputs="$(IntDir)/$(InputName).h"
                         FileExtensions="*.py"
                         AdditionalDependencies=""
diff --git a/winbuild/Lex.rules b/winbuild/Lex.rules
index 85b5e18..52df322 100644
--- a/winbuild/Lex.rules
+++ b/winbuild/Lex.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Lex"
 			DisplayName="Lex"
-			CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python $(ProjectDir)..\src\increasebuffer.py &gt; $(IntDir)/$(InputName).cpp"
+			CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python &quot;$(ProjectDir)..\src\increasebuffer.py&quot; &gt; $(IntDir)/$(InputName).cpp"
 			Outputs="$(IntDir)/$(InputName).cpp"
 			FileExtensions="*.l"
 			AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py"
diff --git a/winbuild/Settings.rules b/winbuild/Settings.rules
index 283cd49..29e7266 100644
--- a/winbuild/Settings.rules
+++ b/winbuild/Settings.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Settings"
 			DisplayName="Settings"
-			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)"
+			CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
 			Outputs="$(IntDir)/$(InputName).h"
 			FileExtensions="*.py"
 			AdditionalDependencies="$(ProjectDir)..\configure"
diff --git a/winbuild/Unistd.rules b/winbuild/Unistd.rules
index 0f4ce02..bd25661 100755
--- a/winbuild/Unistd.rules
+++ b/winbuild/Unistd.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Unistd"
 			DisplayName="Unistd"
-			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)"
+			CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
 			Outputs="$(IntDir)/$(InputName).h"
 			FileExtensions="*.py"
 			ExecutionDescription="Executing Unistd ..."
diff --git a/winbuild/Version.rules b/winbuild/Version.rules
index 43faeb1..3dfdf04 100644
--- a/winbuild/Version.rules
+++ b/winbuild/Version.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Version"
 			DisplayName="Version"
-			CommandLine="python $(InputPath) $(IntDir)"
+			CommandLine="python &quot;$(InputPath)&quot; $(IntDir)"
 			Outputs="$(IntDir)\$(InputName).cpp"
 			FileExtensions="*.py"
 			AdditionalDependencies="$(ProjectDir)..\configure"
diff --git a/winbuild/moc.rules b/winbuild/moc.rules
index a8242f5..efe0f7f 100644
--- a/winbuild/moc.rules
+++ b/winbuild/moc.rules
@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="moc"
 			DisplayName="Moc"
-			CommandLine="$(QTDIR)/bin/moc.exe $(InputPath) -o moc_$(InputName).cpp"
+			CommandLine="$(QTDIR)/bin/moc.exe &quot;$(InputPath)&quot; -o moc_$(InputName).cpp"
 			Outputs="moc_$(InputName).cpp"
 			AdditionalDependencies="$(QTDIR)/bin/moc.exe"
 			FileExtensions="*.h"
-- 
cgit v0.12