Update build scripts for i18n docs (#2227)

vkbo · Feb 4, 2025 · 67a2f63 · 67a2f63
2 parents 99db1a1 + ceec883
commit 67a2f63
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
@@ -47,9 +47,9 @@
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "[email protected]"
-__version__    = "2.7a2"
-__hexversion__ = "0x020700a2"
-__date__       = "2025-01-20"
+__version__    = "2.7a3"
+__hexversion__ = "0x020700a3"
+__date__       = "2025-02-04"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 

diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.7a2" hexVersion="0x020700a2" fileVersion="1.5" fileRevision="4" timeStamp="2025-01-18 15:16:45">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2153" autoCount="281" editTime="95823">
+<novelWriterXML appVersion="2.7a3" hexVersion="0x020700a3" fileVersion="1.5" fileRevision="4" timeStamp="2025-02-04 13:53:28">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2156" autoCount="281" editTime="95855">
     <name>Sample Project</name>
     <author>Jane Smith</author>
   </project>

diff --git 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
@@ -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
@@ -28,8 +28,6 @@
 
 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
@@ -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)