Maintenance scheduled 24th July -- expect downtime along that day

Commit 23be310b authored by Tristan Gingold's avatar Tristan Gingold

Merge branch '90-sufix-command-is-a-typo-rename-to-suffix-for-proper-english' into 'master'

Resolve "--sufix command is a typo => rename to --suffix for proper english"

Closes #90

See merge request !2
parents f9366683 ba0b8136
......@@ -726,7 +726,7 @@ This case was very trivial. Let's try now to complicate the situation a bit. Let
Now we can see that the ``local`` key just has an associated path (i.e. this is a 1-element list), while we have two additional key identifiers: ``svn``, pointing to a list of two remote SVN repositories, and ``git``, pointing to a single remote GIT repository.
Regarding the SVN repositories, ``module2`` is pointing to the ``default/head`` revision while ``module3`` SVN repository is pointing to revision number 25 by appending the ``@25`` sufix to the repository URL..
Regarding the SVN repositories, ``module2`` is pointing to the ``default/head`` revision while ``module3`` SVN repository is pointing to revision number 25 by appending the ``@25`` suffix to the repository URL..
Finally, the Git repository ``module4`` is the only entry for the GIT module list and it is pointing to the ``default/master`` branch, but we can introduce the following extra modifiers to force a specific ``branch``, ``tag`` or ``commit``:
......@@ -939,12 +939,12 @@ The first one is to include this as a new variable in the top Manifest.py, i.e.:
"local" : [ "../../../testbench/counter_tb/verilog" ],
}
But we can also define the variable value by injecting custom prefix or sufix Python code from the command line
But we can also define the variable value by injecting custom prefix or suffix Python code from the command line
when ``hdlmake`` is executed, e.g.:
.. code-block:: bash
hdlmake --sufix "simulate_vhdl = False" makefile
hdlmake --suffix "simulate_vhdl = False" makefile
......@@ -1644,7 +1644,7 @@ As an example, this command will generate the Makefile and will try to print ``H
hdlmake -p "print('Hello hdlmake')" makefile
``-s, --sufix ARBITRARY_CODE``
``-s, --suffix ARBITRARY_CODE``
------------------------------
Add arbitrary Python code from the command line that **will be evaluated after each Manifest.py** parse action across the hierarchy.
......
......@@ -192,8 +192,8 @@ def _get_parser():
default="",
help="Python code executed before every Manifest.py")
parser.add_argument(
"-s", "--sufix",
dest="sufix_code",
"-s", "--suffix",
dest="suffix_code",
default="",
help="Python code executed after every Manifest.py")
parser.add_argument(
......
......@@ -194,7 +194,7 @@ types:[<type 'int'>]
self.description = description
self.options = []
self.prefix_code = ""
self.sufix_code = ""
self.suffix_code = ""
self.config_file = None
def __setitem__(self, name, value):
......@@ -280,9 +280,9 @@ types:[<type 'int'>]
"""Add the arbitrary Python to be executed just before the Manifest"""
self.prefix_code += code + '\n'
def add_sufix_code(self, code):
def add_suffix_code(self, code):
"""Add the arbitrary Python to be executed just after the Manifest"""
self.sufix_code += code + '\n'
self.suffix_code += code + '\n'
def __names(self):
"""A method that returns a list containing the name for every non
......@@ -350,7 +350,7 @@ types:[<type 'int'>]
# Now, grab the options coming from Manifest.py plus arbitrary_code:
# - extra_context as global variables.
# - options as local variables.
content = self.prefix_code + '\n' + content + '\n' + self.sufix_code
content = self.prefix_code + '\n' + content + '\n' + self.suffix_code
options = self.__parser_runner(content, extra_context)
# Check the options that were defined in the local context
ret = {}
......@@ -376,7 +376,7 @@ types:[<type 'int'>]
"Given option (%s) doesn't match specified types: (%s)" %
(str(type(val)), str(opt.types)))
ret[opt_name] = val
# Thi is only for the options of the dictionary class:
# This is only for the options of the dictionary class:
if isinstance(val, type(dict())):
try:
for key in val:
......
......@@ -148,8 +148,8 @@ PARSE START: %s
manifest_parser.add_prefix_code(
self.pool.options.prefix_code)
manifest_parser.add_sufix_code(
self.pool.options.sufix_code)
manifest_parser.add_suffix_code(
self.pool.options.suffix_code)
parser_tmp = manifest_parser.add_manifest(self.path)
......
......@@ -83,13 +83,13 @@ class ToolISim(ToolSim):
else:
os_prefix = 'lin'
if shell.architecture() == 32:
arch_sufix = ''
arch_suffix = ''
else:
arch_sufix = '64'
arch_suffix = '64'
xilinx_ini_path = str(os.path.join(xilinx_dir,
hdl_language,
"hdp",
os_prefix + arch_sufix))
os_prefix + arch_suffix))
# Ensure the path is absolute and normalized
return os.path.abspath(xilinx_ini_path)
self.writeln("""## variables #############################
......
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