From e8d548b24ea666ae72ab695994981304eb985e20 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 4 Feb 2025 16:36:12 +0100 Subject: [PATCH] Fix build scripts and add i18n docs --- setup/make_pip.sh | 2 +- setup/make_release.sh | 2 +- utils/assets.py | 13 ++++++------- utils/build_debian.py | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/setup/make_pip.sh b/setup/make_pip.sh index 0521a7ff..eaf03d52 100755 --- a/setup/make_pip.sh +++ b/setup/make_pip.sh @@ -17,7 +17,7 @@ if [ ! -d $ENVPATH ]; then python3 -m venv $ENVPATH fi source $ENVPATH/bin/activate -pip3 install -r docs/requirements.txt +pip3 install -r requirements.txt -r docs/requirements.txt python3 pkgutils.py build-assets deactivate diff --git a/setup/make_release.sh b/setup/make_release.sh index b46ec49e..cbe4ca25 100755 --- a/setup/make_release.sh +++ b/setup/make_release.sh @@ -16,7 +16,7 @@ if [ ! -d $ENVPATH ]; then python3 -m venv $ENVPATH fi source $ENVPATH/bin/activate -pip3 install -r docs/requirements.txt +pip3 install -r requirements.txt -r docs/requirements.txt python3 pkgutils.py build-assets deactivate diff --git a/utils/assets.py b/utils/assets.py index 840160cd..393b3838 100644 --- a/utils/assets.py +++ b/utils/assets.py @@ -28,8 +28,6 @@ import zipfile from pathlib import Path -from PyQt6.QtCore import QLocale - from utils.common import ROOT_DIR, writeFile @@ -289,6 +287,8 @@ def updateDocsTranslationSources(args: argparse.Namespace) -> None: def buildDocsTranslationAssets(args: argparse.Namespace | None = None) -> None: """Build the documentation i18n PDF files.""" + from PyQt6.QtCore import QLocale + print("") print("Building Docs Manuals") print("=====================") @@ -299,7 +299,7 @@ def buildDocsTranslationAssets(args: argparse.Namespace | None = None) -> None: pdfFile = ROOT_DIR / "docs" / "build" / "latex" / "manual.pdf" locsDir.mkdir(exist_ok=True) - lang = args.lang + lang = args.lang if args else ["all"] build = [] if lang == ["all"]: build = [i.stem for i in locsDir.iterdir() if i.is_dir()] @@ -334,10 +334,8 @@ def cleanBuiltAssets(args: argparse.Namespace | None = None) -> None: print("=====================") print("") - assets = [ - ROOT_DIR / "novelwriter" / "assets" / "sample.zip", - ROOT_DIR / "novelwriter" / "assets" / "manual.pdf", - ] + assets = [ROOT_DIR / "novelwriter" / "assets" / "sample.zip"] + assets.extend((ROOT_DIR / "novelwriter" / "assets").glob("manual*.pdf")) assets.extend((ROOT_DIR / "novelwriter" / "assets" / "i18n").glob("*.qm")) for asset in assets: if asset.is_file(): @@ -355,4 +353,5 @@ def buildAllAssets(args: argparse.Namespace) -> None: buildPdfManual() buildSampleZip() buildTranslationAssets() + buildDocsTranslationAssets() return diff --git a/utils/build_debian.py b/utils/build_debian.py index 1f8e26eb..b962e620 100644 --- a/utils/build_debian.py +++ b/utils/build_debian.py @@ -157,7 +157,7 @@ def makeDebianPackage( def debian(args: argparse.Namespace) -> None: """Build a .deb package""" - if sys.platform == "linux": + if sys.platform != "linux": print("ERROR: Command 'build-deb' can only be used on Linux") sys.exit(1) signKey = SIGN_KEY if args.sign else None @@ -167,7 +167,7 @@ def debian(args: argparse.Namespace) -> None: def launchpad(args: argparse.Namespace) -> None: """Wrapper for building Debian packages for Launchpad.""" - if sys.platform == "linux": + if sys.platform != "linux": print("ERROR: Command 'build-ubuntu' can only be used on Linux") sys.exit(1)