diff --git a/bin/filelist_compile.py b/bin/filelist_compile.py index 5f2d5fd3b822ec6770699957494ec2656bd1fb2f..0aa21c44680c1efdd63aa2e3474f69e890914c14 100755 --- a/bin/filelist_compile.py +++ b/bin/filelist_compile.py @@ -72,11 +72,11 @@ def read_list(filelist): if file.endswith(verilog_extensions): compiled_filelist.append(env_var_substitute(line_list[1])+"/"+str(file)) - elif line_list[0].startswith("-incdir "): + elif line_list[0].startswith("+incdir+"): # Append to filelist - for file in os.listdir(env_var_substitute(line_list[0].lstrip("-incdir "))): + for file in os.listdir(env_var_substitute(line_list[0].lstrip("+incdir+"))): if file.endswith(verilog_extensions): - compiled_filelist.append(env_var_substitute(line_list[0].lstrip("-incdir "))+"/"+str(file)) + compiled_filelist.append(env_var_substitute(line_list[0].lstrip("+incdir+"))+"/"+str(file)) # If file list a verilog file elif line_list[0].endswith(verilog_extensions): diff --git a/bin/htmlgen/v2html/v2html b/bin/htmlgen/v2html/v2html index da1872ed01390bb3325950cd4370c141f21627e7..6e0f8c74c5352f81c1ee177c38dca81046966b58 100755 --- a/bin/htmlgen/v2html/v2html +++ b/bin/htmlgen/v2html/v2html @@ -547,7 +547,7 @@ Verilog like options: +define: Specify a define for use when processing, can be either: +define+NAME or +define+NAME=VALUE - +incdir: Specify a directory to search for includes -incdir DIR_NAME + +incdir: Specify a directory to search for includes +incdir+DIR_NAME -y : Specify a library to search for modules eg: -y DIR_NAME +libext: Specify a the extension for libraries eg: +libext+.v or +libext+.v+.V -v : Specify a library file (same as putting the file without -v) @@ -599,7 +599,7 @@ Ignored options: example: v2html -hc "Our Chip" -o /users/www/p/html -m Joe_Blogs\@jb.com - -incdir /p/includes -y /p/verilog +libext+.v+.V /p/verilog/chip_top.v + +incdir+/p/includes -y /p/verilog +libext+.v+.V /p/verilog/chip_top.v See http://www.burbleland.com/v2html/v2html.html for more details diff --git a/bin/htmlgen/v2html/v2html.1 b/bin/htmlgen/v2html/v2html.1 index d3423a8de59d25e7c12622e1e30c3d9380fa807b..ea1b36051668c6179270cd3293c5f65a7f556772 100644 --- a/bin/htmlgen/v2html/v2html.1 +++ b/bin/htmlgen/v2html/v2html.1 @@ -199,8 +199,8 @@ Pre-define a value. This is just the same as putting: at the top of each of your input files. The rather strange syntax is the same as VerilogXL's. This option is useful for controlling which ifdefs appear true to \fBv2html\fR. -.IP "\fB-incdir DIR\fR" 5 -.IX Item "-incdir DIR" +.IP "\fB+incdir+DIR\fR" 5 +.IX Item "+incdir+DIR" Specify a directory to search for include files (just like VerilogXL). .IP "\fB\-y\fR\ \s-1DIR\s0" 5 .IX Item "-yDIR" diff --git a/bin/htmlgen/v2html/v2html.man.html b/bin/htmlgen/v2html/v2html.man.html index 1a943c7af935d71b6030a8467d311193765c4d70..f50978af0b88a7995106eff72c4e804acc20636f 100644 --- a/bin/htmlgen/v2html/v2html.man.html +++ b/bin/htmlgen/v2html/v2html.man.html @@ -95,7 +95,7 @@ it is doing.</p> same as VerilogXL's. This option is useful for controlling which ifdefs appear true to <strong>v2html</strong>.</p> </dd> -<dt><strong><a name="item__2bincdir_2bdir"><strong>-incdir DIR</strong></a></strong></dt> +<dt><strong><a name="item__2bincdir_2bdir"><strong>+incdir+DIR</strong></a></strong></dt> <dd> <p>Specify a directory to search for include files (just like VerilogXL).</p>