From 8da49b73e82800a65544467264336b27dd22b4a2 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Tue, 4 Feb 2020 12:21:44 -0800 Subject: [PATCH] minor build fixes --- assets/.asset_manifest_2.json | 4 ---- assets/Makefile | 14 -------------- tools/efrotools/pybuild.py | 21 ++++++++++++++++++--- tools/stage_assets | 2 +- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/assets/.asset_manifest_2.json b/assets/.asset_manifest_2.json index ab431ddb..46145c45 100644 --- a/assets/.asset_manifest_2.json +++ b/assets/.asset_manifest_2.json @@ -2552,7 +2552,6 @@ "pylib-android/__pycache__/_pyio.cpython-37.opt-1.pyc", "pylib-android/__pycache__/_sitebuiltins.cpython-37.opt-1.pyc", "pylib-android/__pycache__/_strptime.cpython-37.opt-1.pyc", - "pylib-android/__pycache__/_sysconfigdata_m_linux_.cpython-37.opt-1.pyc", "pylib-android/__pycache__/_threading_local.cpython-37.opt-1.pyc", "pylib-android/__pycache__/_weakrefset.cpython-37.opt-1.pyc", "pylib-android/__pycache__/abc.cpython-37.opt-1.pyc", @@ -2720,7 +2719,6 @@ "pylib-android/_pyio.py", "pylib-android/_sitebuiltins.py", "pylib-android/_strptime.py", - "pylib-android/_sysconfigdata_m_linux_.py", "pylib-android/_threading_local.py", "pylib-android/_weakrefset.py", "pylib-android/abc.py", @@ -3406,7 +3404,6 @@ "pylib-apple/__pycache__/_pyio.cpython-37.opt-1.pyc", "pylib-apple/__pycache__/_sitebuiltins.cpython-37.opt-1.pyc", "pylib-apple/__pycache__/_strptime.cpython-37.opt-1.pyc", - "pylib-apple/__pycache__/_sysconfigdata_m_darwin_darwin.cpython-37.opt-1.pyc", "pylib-apple/__pycache__/_threading_local.cpython-37.opt-1.pyc", "pylib-apple/__pycache__/_weakrefset.cpython-37.opt-1.pyc", "pylib-apple/__pycache__/abc.cpython-37.opt-1.pyc", @@ -3574,7 +3571,6 @@ "pylib-apple/_pyio.py", "pylib-apple/_sitebuiltins.py", "pylib-apple/_strptime.py", - "pylib-apple/_sysconfigdata_m_darwin_darwin.py", "pylib-apple/_threading_local.py", "pylib-apple/_weakrefset.py", "pylib-apple/abc.py", diff --git a/assets/Makefile b/assets/Makefile index 02423b14..2eb32386 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -1806,7 +1806,6 @@ SCRIPT_TARGETS_PY_2_APPLE = \ build/pylib-apple/tempfile.py \ build/pylib-apple/queue.py \ build/pylib-apple/macpath.py \ - build/pylib-apple/_sysconfigdata_m_darwin_darwin.py \ build/pylib-apple/_pyio.py \ build/pylib-apple/crypt.py \ build/pylib-apple/pkgutil.py \ @@ -2235,7 +2234,6 @@ SCRIPT_TARGETS_PYC_2_APPLE = \ build/pylib-apple/__pycache__/tempfile.cpython-37.opt-1.pyc \ build/pylib-apple/__pycache__/queue.cpython-37.opt-1.pyc \ build/pylib-apple/__pycache__/macpath.cpython-37.opt-1.pyc \ - build/pylib-apple/__pycache__/_sysconfigdata_m_darwin_darwin.cpython-37.opt-1.pyc \ build/pylib-apple/__pycache__/_pyio.cpython-37.opt-1.pyc \ build/pylib-apple/__pycache__/crypt.cpython-37.opt-1.pyc \ build/pylib-apple/__pycache__/pkgutil.cpython-37.opt-1.pyc \ @@ -2692,11 +2690,6 @@ build/pylib-apple/__pycache__/macpath.cpython-37.opt-1.pyc: \ @echo Compiling script: $^ @rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@ -build/pylib-apple/__pycache__/_sysconfigdata_m_darwin_darwin.cpython-37.opt-1.pyc: \ - build/pylib-apple/_sysconfigdata_m_darwin_darwin.py - @echo Compiling script: $^ - @rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@ - build/pylib-apple/__pycache__/_pyio.cpython-37.opt-1.pyc: \ build/pylib-apple/_pyio.py @echo Compiling script: $^ @@ -4826,7 +4819,6 @@ SCRIPT_TARGETS_PY_2_ANDROID = \ build/pylib-android/webbrowser.py \ build/pylib-android/nntplib.py \ build/pylib-android/_compat_pickle.py \ - build/pylib-android/_sysconfigdata_m_linux_.py \ build/pylib-android/dis.py \ build/pylib-android/formatter.py \ build/pylib-android/bdb.py \ @@ -5255,7 +5247,6 @@ SCRIPT_TARGETS_PYC_2_ANDROID = \ build/pylib-android/__pycache__/webbrowser.cpython-37.opt-1.pyc \ build/pylib-android/__pycache__/nntplib.cpython-37.opt-1.pyc \ build/pylib-android/__pycache__/_compat_pickle.cpython-37.opt-1.pyc \ - build/pylib-android/__pycache__/_sysconfigdata_m_linux_.cpython-37.opt-1.pyc \ build/pylib-android/__pycache__/dis.cpython-37.opt-1.pyc \ build/pylib-android/__pycache__/formatter.cpython-37.opt-1.pyc \ build/pylib-android/__pycache__/bdb.cpython-37.opt-1.pyc \ @@ -5780,11 +5771,6 @@ build/pylib-android/__pycache__/_compat_pickle.cpython-37.opt-1.pyc: \ @echo Compiling script: $^ @rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@ -build/pylib-android/__pycache__/_sysconfigdata_m_linux_.cpython-37.opt-1.pyc: \ - build/pylib-android/_sysconfigdata_m_linux_.py - @echo Compiling script: $^ - @rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@ - build/pylib-android/__pycache__/dis.cpython-37.opt-1.pyc: \ build/pylib-android/dis.py @echo Compiling script: $^ diff --git a/tools/efrotools/pybuild.py b/tools/efrotools/pybuild.py index 18649004..23381a21 100644 --- a/tools/efrotools/pybuild.py +++ b/tools/efrotools/pybuild.py @@ -578,10 +578,10 @@ def gather() -> None: efrotools.run('mkdir -p "' + builddir + '"') efrotools.run('mkdir -p "' + lib_dst + '"') - # Only pull modules into game assets on release pass + # Only pull modules into game assets on release pass. if not debug: # Copy system modules into the src assets - # dir for this group + # dir for this group. efrotools.run('mkdir -p "' + assets_src_dst + '"') efrotools.run( 'rsync --recursive --include "*.py"' @@ -595,11 +595,26 @@ def gather() -> None: 'multiprocessing', 'pydoc_data', 'site-packages', 'ensurepip', 'tkinter', 'wsgiref', 'distutils', 'turtle.py', 'turtledemo', 'test', 'sqlite3/test', - 'unittest', 'dbm', 'venv', 'ctypes/test', 'imaplib.py' + 'unittest', 'dbm', 'venv', 'ctypes/test', 'imaplib.py', + '_sysconfigdata_*' ] efrotools.run('cd "' + assets_src_dst + '" && rm -rf ' + ' '.join(prune)) + # Some minor filtering to system scripts: + # on iOS/tvOS, addusersitepackages() leads to a crash + # due to _sysconfigdata_dm_ios_darwin module not existing, + # so let's skip that. + fname = f'{assets_src_dst}/site.py' + txt = efrotools.readfile(fname) + txt = efrotools.replace_one( + txt, + ' known_paths = addusersitepackages(known_paths)', + ' # efro tweak: this craps out on ios/tvos.\n' + ' # (and we don\'t use it anyway)\n' + ' # known_paths = addusersitepackages(known_paths)') + efrotools.writefile(fname, txt) + # Copy in a base set of headers (everything in a group should # be using the same headers) efrotools.run(f'cp -r "{build["headers"]}" "{header_dst}"') diff --git a/tools/stage_assets b/tools/stage_assets index 8b7b9b49..6dd4a61b 100755 --- a/tools/stage_assets +++ b/tools/stage_assets @@ -312,7 +312,7 @@ def main() -> None: # Now standard common game data. assert cfg.dst is not None - _run('mkdir -p "' + cfg.dst + '/data"') + _run('mkdir -p "' + cfg.dst + '/ba_data"') cmd = ("rsync --recursive --update --delete --delete-excluded" " --prune-empty-dirs")