Skip to content

D
doxverilog
Commit eb3ab245 authored by albert-github's avatar albert-github
Browse files
Options

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.
parent 21178ab4
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
doc/Makefile.in
View file @ eb3ab245
...@@ -17,7 +17,7 @@ all: language config.doc FORCE ...@@ -17,7 +17,7 @@ all: language config.doc FORCE
export DOXYGEN_DOCDIR; \ export DOXYGEN_DOCDIR; \
VERSION=$(VERSION) ; \ VERSION=$(VERSION) ; \
export VERSION; \ export VERSION; \
$(DOXYGEN)/bin/doxygen "$(DOXYGEN)/bin/doxygen"
@rm -f ../latex/refman.tex @rm -f ../latex/refman.tex
@cp doxygen_logo*.gif ../html @cp doxygen_logo*.gif ../html
@cp Makefile.latex ../latex/Makefile @cp Makefile.latex ../latex/Makefile
......
winbuild/Config.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Config" Name="Config"
DisplayName="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" Outputs="$(IntDir)/$(InputName)options.cpp"
FileExtensions="*.xml" FileExtensions="*.xml"
AdditionalDependencies="$(ProjectDir)..\src\configgen.py" AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<CustomBuildRule <CustomBuildRule
Name="Config_dw" Name="Config_dw"
DisplayName="Config" 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" Outputs="$(IntDir)/$(InputName)doc.cpp"
FileExtensions="*.xml" FileExtensions="*.xml"
AdditionalDependencies="$(ProjectDir)..\src\configgen.py" AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
......
winbuild/Doxygen.vcproj
View file @ eb3ab245
...@@ -948,7 +948,7 @@ ...@@ -948,7 +948,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Running bison on constexp.y" 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" Outputs="$(IntDir)\ce_parse.cpp"
/> />
</FileConfiguration> </FileConfiguration>
...@@ -958,7 +958,7 @@ ...@@ -958,7 +958,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Running bison on constexp.y" 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" Outputs="$(IntDir)\ce_parse.cpp"
/> />
</FileConfiguration> </FileConfiguration>
...@@ -968,7 +968,7 @@ ...@@ -968,7 +968,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Running bison on constexp.y" 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" Outputs="$(IntDir)\ce_parse.cpp"
/> />
</FileConfiguration> </FileConfiguration>
...@@ -978,7 +978,7 @@ ...@@ -978,7 +978,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Running bison on constexp.y" 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" Outputs="$(IntDir)\ce_parse.cpp"
/> />
</FileConfiguration> </FileConfiguration>
......
winbuild/Gen_head.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Gen_head" Name="Gen_head"
DisplayName="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" Outputs="$(IntDir)/$(InputName)$(InputExt).h"
FileExtensions=".*" FileExtensions=".*"
AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py" AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py"
......
winbuild/Languages.rules
View file @ eb3ab245
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<Rules> <Rules>
<CustomBuildRule <CustomBuildRule
Name="Languages" Name="Languages"
DisplayName="Settings" DisplayName="Languages"
CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h" CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h"
Outputs="$(IntDir)/$(InputName).h" Outputs="$(IntDir)/$(InputName).h"
FileExtensions="*.py" FileExtensions="*.py"
AdditionalDependencies="" AdditionalDependencies=""
......
winbuild/Lex.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Lex" Name="Lex"
DisplayName="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" Outputs="$(IntDir)/$(InputName).cpp"
FileExtensions="*.l" FileExtensions="*.l"
AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py" AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py"
......
winbuild/Settings.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Settings" Name="Settings"
DisplayName="Settings" DisplayName="Settings"
CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)" CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
Outputs="$(IntDir)/$(InputName).h" Outputs="$(IntDir)/$(InputName).h"
FileExtensions="*.py" FileExtensions="*.py"
AdditionalDependencies="$(ProjectDir)..\configure" AdditionalDependencies="$(ProjectDir)..\configure"
......
winbuild/Unistd.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Unistd" Name="Unistd"
DisplayName="Unistd" DisplayName="Unistd"
CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)" CommandLine="python &quot;$(InputPath)&quot; [AllOptions] [AdditionalOptions] $(IntDir)"
Outputs="$(IntDir)/$(InputName).h" Outputs="$(IntDir)/$(InputName).h"
FileExtensions="*.py" FileExtensions="*.py"
ExecutionDescription="Executing Unistd ..." ExecutionDescription="Executing Unistd ..."
......
winbuild/Version.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Version" Name="Version"
DisplayName="Version" DisplayName="Version"
CommandLine="python $(InputPath) $(IntDir)" CommandLine="python &quot;$(InputPath)&quot; $(IntDir)"
Outputs="$(IntDir)\$(InputName).cpp" Outputs="$(IntDir)\$(InputName).cpp"
FileExtensions="*.py" FileExtensions="*.py"
AdditionalDependencies="$(ProjectDir)..\configure" AdditionalDependencies="$(ProjectDir)..\configure"
......
winbuild/moc.rules
View file @ eb3ab245
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="moc" Name="moc"
DisplayName="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" Outputs="moc_$(InputName).cpp"
AdditionalDependencies="$(QTDIR)/bin/moc.exe" AdditionalDependencies="$(QTDIR)/bin/moc.exe"
FileExtensions="*.h" FileExtensions="*.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment