Merge pull request #645 from zapta/develop

Fixed the text coloring on windows and other cleanups.

Author: cavearr

.vscode/settings.json

@@ -35,11 +35,14 @@
         "capsys",
         "cenv",
         "cerror",
+        "cflush",
+        "cmarkdown",
         "colorlight",
         "COMBDLY",
         "cout",
         "cprint",
         "cstyle",
+        "ctable",
         "cunstyle",
         "cwarning",
         "cwidth",
@@ -56,9 +59,11 @@
         "envlist",
         "EXMPLS",
         "FGPA",
+        "fomu",
         "fpgas",
         "ftdi",
         "FTDIUSB",
+        "Fumo",
         "GENCODE",
         "González",
         "gowin",
@@ -91,6 +96,7 @@
         "lsusb",
         "mabc",
         "mengbo",
+        "mkdirs",
         "mkdocs",
         "nextpnr",
         "nofailsafe",
@@ -117,8 +123,10 @@
         "sconstruct",
         "Shwan",
         "sipeed",
+        "spammy",
         "srcs",
         "Sucess",
+        "synthesizable",
         "testbench",
         "testbenches",
         "testpypi",

apio/apio_context.py

@@ -15,6 +15,7 @@
 from typing import Optional, Dict
 from apio.common.apio_console import cout, cerror, cwarning, cstyle
 from apio.common.apio_styles import INFO, EMPH1
+from apio.common.common_util import env_build_path
 from apio.profile import Profile
 from apio.utils import jsonc, util, env_options
 from apio.managers.project import Project, load_project_from_file
@@ -272,18 +273,11 @@ def project(self) -> Project:
         return self._project
 
     @property
-    def build_all_path(self) -> str:
-        """Returns the relative path of the build root directory from the
-        project dir. Should be called only when has_project is True."""
-        assert self.has_project, "project(): project is not loaded"
-        return Path("_build")
-
-    @property
-    def build_env_path(self) -> str:
+    def env_build_path(self) -> str:
         """Returns the relative path of the current env build directory from
         the project dir. Should be called only when has_project is True."""
         assert self.has_project, "project(): project is not loaded"
-        return self.build_all_path / self.project.env_name
+        return env_build_path(self.project.env_name)
 
     def _load_resource(self, name: str, allow_custom: bool = False) -> dict:
         """Load the resources from a given jsonc file

apio/commands/apio.py

@@ -119,6 +119,10 @@ def context_settings():
 [code]apio build -h
 apio drivers ftdi install -h[/code]
 
+To check the apio version type:
+[code]
+apio --version[/code]
+
 For more information about the Apio project, visit the official Apio Wiki \
 https://github.com/FPGAwars/apio/wiki/Apio
 """
@@ -132,9 +136,9 @@ def context_settings():
     short_help="Work with FPGAs with ease",
     context_settings=context_settings(),
 )
-# NOTE: Without the 'version' value, click has difficulty determining the
-# version when running under pyinstaller.
-@click.version_option(version=util.get_apio_version())
+# NOTE: Without this explicit version value, click has difficulty
+# determining the version when running under pyinstaller.
+@click.version_option(util.get_apio_version(), "-v", "--version")
 def cli():
     """The top level command group of apio commands"""