Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Resolve Windows path problems #8860

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

Merged
merged 8 commits into from
Feb 22, 2023
Merged

Resolve Windows path problems #8860

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc1e642
Moved up os.makedirs for core directory.
mhightower83 Feb 16, 2023
338159f
Use default locale encode for writing file names in build.opt
mhightower83 Feb 20, 2023
39bacae
diacritics in paths specified in <Sketch>.ino.globals.h should now work.
mhightower83 Feb 20, 2023
94a8c4e
Fix diacritics in path problem with sizes.py
mhightower83 Feb 21, 2023
287053b
Improve get encoding logic for mkbuildoptglobals.py
mhightower83 Feb 21, 2023
c3360fa
Update tools/mkbuildoptglobals.py
mhightower83 Feb 22, 2023
78d2510
Update tools/mkbuildoptglobals.py
mhightower83 Feb 22, 2023
5c66f9f
update size.py
mhightower83 Feb 22, 2023
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
Prev Previous commit
Next Next commit
Use default locale encode for writing file names in build.opt 
Continue using "utf-8" to read or write "C/C++" source filess.

Tested on Windows 10 (en-US) with Arduino IDE 2.0.3 Under an
account with a diacritic charcter in the user ID path.

Needs testing on Japanese Windows
  • Loading branch information
@mhightower83
mhightower83 committed Feb 20, 2023
commit 338159ffaaf06cb0e6d92999d8bebf8584218f5a
21 changes: 17 additions & 4 deletions tools/mkbuildoptglobals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@
import textwrap
import time

import locale

# Need to work on signature line used for match to avoid conflicts with
# existing embedded documentation methods.
build_opt_signature = "/*@create-file:build.opt@"
Expand Down Expand Up @@ -296,14 +298,22 @@ def copy_create_build_file(source_fqfn, build_target_fqfn):
pass
return True # file changed


def add_include_line(build_opt_fqfn, include_fqfn):
# Given that GCC will insert (or process as if interted) these lines into
# the command line. I assume that the contents of @file need to be encoded
# to match that of the shell running GCC runs. I am not 100% sure this API
# gives me that, but it appears to work.
#
# However, elsewhere when dealing with source code we continue to use 'utf-8',
# ref. https://gcc.gnu.org/onlinedocs/gcc-4.1.2/cpp/Character-sets.html
shell_encoding = locale.getdefaultlocale()[1]
if not os.path.exists(include_fqfn):
# If file is missing, we need an place holder
with open(include_fqfn, 'w', encoding="utf-8"):
with open(include_fqfn, 'w', encoding=shell_encoding):
pass
print("add_include_line: Created " + include_fqfn)
with open(build_opt_fqfn, 'a', encoding="utf-8") as build_opt:
print_msg("add_include_line: Created " + include_fqfn)

with open(build_opt_fqfn, 'a', encoding=shell_encoding) as build_opt:
build_opt.write('-include "' + include_fqfn.replace('\\', '\\\\') + '"\n')

def extract_create_build_opt_file(globals_h_fqfn, file_name, build_opt_fqfn):
Expand Down Expand Up @@ -611,6 +621,9 @@ def main():
global debug_enabled
num_include_lines = 1

def_locale = locale.getdefaultlocale()
print_msg(f'default locale: {def_locale}')

args = parse_args()
debug_enabled = args.debug
runtime_ide_path = os.path.normpath(args.runtime_ide_path)
Expand Down