Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed windows paths #239

Merged
merged 3 commits into from
Feb 26, 2022
Merged

Fixed windows paths #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d924c92
Fix windows paths by escaping back slashes
DNedic Feb 23, 2022
572a95c
Bump version
DNedic Feb 23, 2022
aaf5dba
Merge branch 'main' into fixed_windows_paths
thirtytwobits Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Partial example: generating a C struct
*
* Auto-generated, do not edit.
*
* Source file: {{T.source_file_path}}
* Source file: {{T.source_file_path | replace("\\", "\\\\")}}
DNedic marked this conversation as resolved.
Show resolved Hide resolved
*/

#ifndef {{T.full_name | ln.c.macrofy}}
Expand Down
2 changes: 1 addition & 1 deletion docs/templates.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ given a template ``common_header.j2``::
*
* Auto-generated, do not edit.
*
* Source file: {{T.source_file_path}}
* Source file: {{T.source_file_path | replace("\\", "\\\\")}}
* Generated at: {{now_utc}}
* Template: {{ self._TemplateReference__context.name }}
* deprecated: {{T.deprecated}}
Expand Down
4 changes: 2 additions & 2 deletions src/nunavut/lang/c/templates/base.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// are named with an underscore at the end, like foo_bar_().
//
// Generator: nunavut-{{ nunavut.version }} (serialization was {{ 'not ' * nunavut.support.omit }}enabled)
// Source file: {{ T.source_file_path }}
// Source file: {{ T.source_file_path | replace("\\", "\\\\") }}
// Generated at: {{ now_utc }} UTC
// Is deprecated: {{ T.deprecated and 'yes' or 'no' }}
// Fixed port-ID: {{ T.fixed_port_id }}
Expand Down Expand Up @@ -54,7 +54,7 @@
{% endfor %}
{% for key, value in options.items() -%}
static_assert( {{ "NUNAVUT_SUPPORT_LANGUAGE_OPTION_{}".format(key) | ln.c.macrofy }} == {{ value | to_static_assertion_value }},
"{{ T.source_file_path }} is trying to use a serialization library that was compiled with "
"{{ T.source_file_path | replace("\\", "\\\\") }} is trying to use a serialization library that was compiled with "
"different language options. This is dangerous and therefore not allowed." );
{% endfor %}
#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions src/nunavut/lang/cpp/templates/base.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// build invocation. TODO: add --reproducible option to prevent any volatile metadata from being generated.
//
// Generator: nunavut-{{ nunavut.version }} (serialization was {{ 'not ' * nunavut.support.omit }}enabled)
// Source file: {{ T.source_file_path }}
// Source file: {{ T.source_file_path | replace("\\", "\\\\") }}
// Generated at: {{ now_utc }} UTC
// Is deprecated: {{ T.deprecated and 'yes' or 'no' }}
// Fixed port-ID: {{ T.fixed_port_id }}
Expand Down Expand Up @@ -73,7 +73,7 @@
// +-------------------------------------------------------------------------------------------------------------------+
{% endif -%}
static_assert( nunavut::support::options::{{ key | id }} == {{ value | ln.c.to_static_assertion_value }},
"{{ T.source_file_path }} "
"{{ T.source_file_path | replace("\\", "\\\\") }} "
"is trying to use a serialization library that was compiled with "
"different language options. This is dangerous and therefore not "
"allowed." );
Expand Down
2 changes: 1 addition & 1 deletion src/nunavut/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.. autodata:: __version__
"""

__version__ = "1.7.0" #: The version number used in the release of nunavut to pypi.
__version__ = "1.7.1" #: The version number used in the release of nunavut to pypi.


__license__ = "MIT"
2 changes: 1 addition & 1 deletion test/gentest_json/templates/StructureType.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"name": "{{ T.short_name }}",
"type": "{{ T | typename }}",
"source" : "{{ T.source_file_path }}",
"source" : "{{ T.source_file_path | replace("\\", "\\\\") }}",
"fixed_port_id": {{ T.fixed_port_id }},
"deprecated": {{ T.deprecated | ln.js.to_true_or_false }},
"version":
Expand Down