feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix issue with converting INO to CPP and missing line number

Browse Source
This commit is contained in:
Ivan Kravets
2016-09-01 23:19:46 +03:00
parent 6b63ae2e46
commit b8af2acce5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/projectconf.rst
View File

@ -194,8 +194,8 @@ if :option:`platformio run --environment` option is not specified.
:ref:`projectconf_pio_env_default` allows to define environments which :ref:`projectconf_pio_env_default` allows to define environments which
should be processed by default. should be processed by default.
Multiple environments are allowed if they are separated with ``, `` (comma+space). Multiple environments are allowed if they are separated with ``, ``
For example. (comma+space). For example.
.. code-block:: ini .. code-block:: ini

3
platformio/builder/tools/piomisc.py
View File

@ -90,7 +90,7 @@ class InoToCPPConverter(object):
return isfile(out_file) return isfile(out_file)
def _join_multiline_strings(self, contents): def _join_multiline_strings(self, contents):
if "\\" not in contents: if "\\\n" not in contents:
return contents return contents
newlines = [] newlines = []
linenum = 0 linenum = 0
@ -99,7 +99,6 @@ class InoToCPPConverter(object):
_linenum = self._parse_preproc_line_num(line) _linenum = self._parse_preproc_line_num(line)
if _linenum is not None: if _linenum is not None:
linenum = _linenum linenum = _linenum
continue
else: else:
linenum += 1 linenum += 1