From c062111bf25cd2661436653e26dbfd4470e32f2b Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Fri, 12 Jun 2020 00:09:18 -0700 Subject: [PATCH] More windows unicode path fixes --- .efrocachemap | 24 ++++++++++++------------ .idea/dictionaries/ericf.xml | 2 ++ CHANGELOG.md | 4 ++++ assets/src/ba_data/python/_ba.py | 2 +- config/toolconfigsrc/projectile | 1 + docs/ba_module.md | 2 +- tools/efrotools/code.py | 6 ++++++ 7 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 5974d2e5..65d34a6f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4132,16 +4132,16 @@ "assets/build/windows/x64/python.exe": "https://files.ballistica.net/cache/ba1/25/a7/dc87c1be41605eb6fefd0145144c", "assets/build/windows/x64/python37.dll": "https://files.ballistica.net/cache/ba1/b9/e4/d912f56e42e9991bcbb4c804cfcb", "assets/build/windows/x64/pythonw.exe": "https://files.ballistica.net/cache/ba1/6c/bb/b6f52c306aa4e88061510e96cefe", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/01/1e/68e550d4c35195ec0107eaa7c3cc", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/99/87/6061c0714efc233f3de960432a79", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/57/26/e1302c34ed190fdc459841ac4c0b", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/3d/81/d41441701286993b888d679a6e1f", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4f/0e/4bbbc1fcb601fbe602ef8e823533", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9b/63/69be4efd49f53ba0243804eea2ee", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/00/a7/a83c42934ed3b6264e8ecfada36d", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ad/2e/ec4d892345bbe6bca5da1634650e", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/b9/d2/54ab31ddba6bad9efa448bcf2bbf", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/a6/2a/6dd220288e4c3fd5da7218c74772", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/7e/84/41846d61dddad79eb58a8f1e275b", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/14/a4/54763b4472c289d67f645ad55fc3" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3f/7b/52228a39678578bfbf59708d8781", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c2/e9/448c88572519886ad50346d1e697", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/82/4c/78d3abe7f124ed1eb097d3de1b08", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d8/ae/f0f303927b49b6bf9619431fe52b", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7b/95/ad7aacb2bbc9d81b43712e3c328a", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fa/93/d99a5e660a739a15c8ddd36e23b4", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b3/82/c06b47fd0baa39a844292f0e92fd", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d5/48/66a3b1baf1d4b095b7c204f5fda8", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/47/fe/e6a8591b85e2ab02952920f87f1d", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/6c/60/28ed4dda33d29ef45d14f68b0d97", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/09/81/91fd4c5736515071cb28a3b5f520", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/fc/c1/99b8e7db8426572427d3a901978d" } \ No newline at end of file diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index f2845589..a32f3722 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -1286,6 +1286,7 @@ nodpi nofiles noinspect + nondeterministic noninfringement nonmultipart noone @@ -2055,6 +2056,7 @@ uninited uniquify unixccompiler + unknownlintline unlinkable unlinking unlinks diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d750f61..aa5d6279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.5.4 (20067) +- Should now work properly with non-ascii paths on Windows (for real this time). +- Misc cleanup and minor bug fixes. + ### 1.5.3 (20065) - Improved handling of non-ascii characters in file paths on windows. diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py index bb3bf141..074c725d 100644 --- a/assets/src/ba_data/python/_ba.py +++ b/assets/src/ba_data/python/_ba.py @@ -34,7 +34,7 @@ NOTE: This file was autogenerated by gendummymodule; do not edit by hand. """ # (hash we can use to see if this file is out of date) -# SOURCES_HASH=216354265308537648782207953147562280477 +# SOURCES_HASH=160088015161796037115905411263701036909 # I'm sorry Pylint. I know this file saddens you. Be strong. # pylint: disable=useless-suppression diff --git a/config/toolconfigsrc/projectile b/config/toolconfigsrc/projectile index e7af40de..11766487 100644 --- a/config/toolconfigsrc/projectile +++ b/config/toolconfigsrc/projectile @@ -1,2 +1,3 @@ +/tools +/assets/src/ba_data/python ++/ballisticacore-android/BallisticaCore/src diff --git a/docs/ba_module.md b/docs/ba_module.md index 1424c823..cc475203 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2020-06-11 for Ballistica version 1.5.3 build 20066

+

last updated on 2020-06-11 for Ballistica version 1.5.3 build 20067

This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!

diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index 72c46b63..a7518aa1 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -142,6 +142,12 @@ def cpplint(projroot: Path, full: bool) -> None: codelines[headercheckline] = ( " if False and include and include.group(1) in ('cfenv',") + # Don't complain about unknown NOLINT categories. + # (we use them for clang-tidy) + unknownlintline = codelines.index( + ' elif category not in _LEGACY_ERROR_CATEGORIES:') + codelines[unknownlintline] = ' elif False:' + def lint_file(filename: str) -> None: result = subprocess.call(['cpplint', '--root=src', filename], env=env) if result != 0: