From 4e976f2061792c294e002dc10249ee8eda9a1981 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sun, 13 Jun 2021 12:04:38 -0500 Subject: [PATCH] languages and tidying --- .efrocachemap | 12 ++++++------ Makefile | 6 +++++- tools/batools/pcommand.py | 18 ++++++++++++++++-- tools/batools/{updateproject.py => project.py} | 15 +-------------- 4 files changed, 28 insertions(+), 23 deletions(-) rename tools/batools/{updateproject.py => project.py} (97%) diff --git a/.efrocachemap b/.efrocachemap index 1f8a8938..75f74c57 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -420,10 +420,10 @@ "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/14/f1/4f2995d78fc20dd79dfb39c5d554", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/57/ac/6ed0caecd25dc23688debed24c45", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/32/08/38dac4a79ab2acee76a75d32a310", - "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/d1/70/6fb5f586794d790395d3797a391c", - "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/4d/1d/113351f74102015ff852ee3e2e2b", + "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/3d/c1/5832d2ba841538ddddab9e8d3b4a", + "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/b1/3d/c68e22dddcb97d029be8aa128dbd", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/49/92/dbd8af6861dd47b8bca51aa9533c", - "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/b0/0c/fd37e0f8449ab00a345ecea7bd4e", + "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/e7/b4/0bbeacb47d314348d4b54edd9bd9", "assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/8d/03/4f4d0d3f6b36e2b8728f13d73050", "assets/build/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/66/bf/6e98398016da261296b8c306560e", "assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/f8/63/106bcd08194d23cd8baa7d8be4fc", @@ -437,14 +437,14 @@ "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/93/36/177284765143e14ee6454a59ec0d", "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/6d/38/ad3e051c2be890d5a01b6eeca52d", "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/de/1b/d9a8e089566aa2951dc34c8c7173", - "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a1/c8/6b8d5a74aa4e69da65ee7ac2ad93", + "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/87/e5/a10ddd73cfb7996bbd576032db6a", "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/bf/d6/4341a67850096fae618968c327ae", "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/51/fc/16596c8d421e4961eab3041303d7", "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/e4/38/446b22f510f74f590cb990394d36", "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/03/08/40f887bb92ddd5c565d879efa279", "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/ce/f8/087671938e6d407d11d95565e67b", - "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/f3/e5/c6d8fab0509451976c776265f0d0", - "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/4e/e1/f66f6fd33be9bcc380eee870eb74", + "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/82/12/57bf144e12be229a9b70da9c45cb", + "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/bb/67/bdf5e720897c0eb966acdbab4274", "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/91/1e/2846b8fab5260d1949562e7979be", "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/02/f9/4a1e4b16c1c0db6e1a88fb7c2b1f", "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/09/b2/83ece6ba1adb6763416c21fa3600", diff --git a/Makefile b/Makefile index b537647e..6480f045 100644 --- a/Makefile +++ b/Makefile @@ -118,12 +118,16 @@ clean-list: ${CHECK_CLEAN_SAFETY} git clean -dnx ${ROOT_CLEAN_IGNORES} +# Force regenerate the dummy module. +dummymodule: + ./tools/pcommand update_dummy_module --force + # Tell make which of these targets don't represent files. .PHONY: help prereqs prereqs-clean assets assets-cmake assets-windows \ assets-windows-Win32 assets-windows-x64 \ assets-mac assets-ios assets-android assets-clean \ resources resources-clean meta meta-clean \ - clean clean-list + clean clean-list dummymodule ################################################################################ diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index fd19962e..587e0bb8 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -742,8 +742,22 @@ def update_assets_makefile() -> None: def update_project() -> None: - """Update project files.""" - from batools.updateproject import Updater + """Update project files. + + This command is in charge of generating Makefiles, IDE project files, + etc. based on the current structure of the project. + It can also perform sanity checks or cleanup tasks. + + Updating should be explicitly run by the user through commands such as + 'make update', 'make check' or 'make preflight'. Other make targets should + avoid running this commnand as it can modify the project structure + arbitrarily which is not a good idea in the middle of a build. + + If this command is invoked with a --check argument, it should not modify + any files but instead fail if any modifications *would* have been made. + (used in CI builds to make sure things are kosher). + """ + from batools.project import Updater check = '--check' in sys.argv fix = '--fix' in sys.argv diff --git a/tools/batools/updateproject.py b/tools/batools/project.py similarity index 97% rename from tools/batools/updateproject.py rename to tools/batools/project.py index 1a8d96b9..ac8110e6 100755 --- a/tools/batools/updateproject.py +++ b/tools/batools/project.py @@ -1,20 +1,7 @@ #!/usr/bin/env python3.8 # Released under the MIT License. See LICENSE for details. # -"""This script acts as a 'meta' Makefile for the project. It is in charge -of generating Makefiles, IDE project files, procedurally generated source -files, etc. based on the current structure of the project. -It can also perform sanity checks or cleanup tasks. - -Updating should be explicitly run by the user through commands such as -'make update', 'make check' or 'make preflight'. Other make targets should -avoid running this script as it can modify the project structure -arbitrarily which is not a good idea in the middle of a build. - -If the script is invoked with a --check argument, it should not modify any -files but instead fail if any modifications *would* have been made. -(used in CI builds to make sure things are kosher). -""" +"""General project related functionality.""" from __future__ import annotations