Commit 3d05cb6d authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge pull request #184 from albert-github/feature/bug_589707 

Bug 589707 - Flex .rule file for Visual Studio build can't cope with spaces in filenames
parents 21178ab4 eb3ab245

doc/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

winbuild/Config.rules

+2 −2
Original line number Diff line number Diff line
@@ -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"

winbuild/Doxygen.vcproj

+4 −4
Original line number Diff line number Diff line
@@ -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>

winbuild/Gen_head.rules

+1 −1
Original line number Diff line number Diff line
@@ -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"

winbuild/Languages.rules

+2 −2
Original line number Diff line number Diff line
@@ -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=""