arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Fix mkbuildoptglobals script not finding preferences.txt (#8812)

Browse Source 
Also fixes os.utime usage on windows, as it does not accept file descriptors instead of file paths
This commit is contained in:
M Hightower 2023-01-18 13:34:14 -08:00 committed by GitHub
parent 39b41379ee
commit 41c2be2068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/mkbuildoptglobals.py
View File

@ -451,19 +451,19 @@ def find_preferences_txt(runtime_ide_path):
# Windows 8 and up option will save "preferences.txt" in one location. # Windows 8 and up option will save "preferences.txt" in one location.
# The downloaded Windows 7 (and up version) will put "preferences.txt" # The downloaded Windows 7 (and up version) will put "preferences.txt"
# in a different location. When both are present due to various possible # in a different location. When both are present due to various possible
# scenarios, use the more modern. # scenarios, give preference to the APP store.
fqfn = os.path.expanduser("~\Documents\ArduinoData\preferences.txt") fqfn = os.path.expanduser("~\Documents\ArduinoData\preferences.txt")
# Path for "Windows app" - verified on Windows 10 with Arduino IDE 1.8.19 from APP store # Path for "Windows app" - verified on Windows 10 with Arduino IDE 1.8.19 from APP store
fqfn2 = os.path.expanduser("~\AppData\local\Arduino15\preferences.txt") fqfn2 = os.path.normpath(os.getenv("LOCALAPPDATA") + "\Arduino15\preferences.txt")
# Path for Windows 7 and up - verified on Windows 10 with Arduino IDE 1.8.19 # Path for Windows 7 and up - verified on Windows 10 with Arduino IDE 1.8.19
if os.path.exists(fqfn): if os.path.exists(fqfn):
if os.path.exists(fqfn2): if os.path.exists(fqfn2):
print_err("Multiple 'preferences.txt' files found:") print_err("Multiple 'preferences.txt' files found:")
print_err(" " + fqfn) print_err(" " + fqfn)
print_err(" " + fqfn2) print_err(" " + fqfn2)
return [fqfn, None]
else:
return [fqfn, fqfn2] return [fqfn, fqfn2]
else:
return [fqfn, None]
elif os.path.exists(fqfn2): elif os.path.exists(fqfn2):
return [fqfn2, None] return [fqfn2, None]
elif "Darwin" == platform_name: elif "Darwin" == platform_name:
@ -529,16 +529,19 @@ def check_preferences_txt(runtime_ide_path, preferences_file):
def touch(fname, times=None): def touch(fname, times=None):
with open(fname, "ab") as file: with open(fname, "ab") as file:
os.utime(file.fileno(), times) file.close();
os.utime(fname, times)
def synchronous_touch(globals_h_fqfn, commonhfile_fqfn): def synchronous_touch(globals_h_fqfn, commonhfile_fqfn):
global debug_enabled global debug_enabled
# touch both files with the same timestamp # touch both files with the same timestamp
touch(globals_h_fqfn) touch(globals_h_fqfn)
with open(globals_h_fqfn, "rb") as file: with open(globals_h_fqfn, "rb") as file:
ts = os.stat(file.fileno()) file.close()
with open(commonhfile_fqfn, "ab") as file2: with open(commonhfile_fqfn, "ab") as file2:
os.utime(file2.fileno(), ns=(ts.st_atime_ns, ts.st_mtime_ns)) file2.close()
ts = os.stat(globals_h_fqfn)
os.utime(commonhfile_fqfn, ns=(ts.st_atime_ns, ts.st_mtime_ns))
if debug_enabled: if debug_enabled:
print_dbg("After synchronous_touch") print_dbg("After synchronous_touch")