portal_tool 0.0.20.dev2__tar.gz → 0.0.20.dev7__tar.gz

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: portal_tool
-Version: 0.0.20.dev2
+Version: 0.0.20.dev7
 Summary: Assortment of tools for the Portal project
 Author: Jonatan Nevo
 Author-email: Jonatan Nevo <jonatannevo-git@proton.me>
 License-File: LICENSE
 Requires-Dist: appdirs>=1.4.4
+Requires-Dist: cookiecutter>=2.6.0
 Requires-Dist: jinja2>=3.1.6,<4
 Requires-Dist: pathlib>=1.0.1
 Requires-Dist: pydantic>=2.11.4,<3

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "portal_tool"
-version = "0.0.20.dev2"
+version = "0.0.20.dev7"
 description = "Assortment of tools for the Portal project"
 authors = [{ name = "Jonatan Nevo", email = "jonatannevo-git@proton.me" }]
 requires-python = ">=3.12,<3.15"
@@ -9,6 +9,7 @@ license-files = ["LICENSE"]
 homepage = "https://github.com/JonatanNevo/portal-tools"
 dependencies = [
     "appdirs>=1.4.4",
+    "cookiecutter>=2.6.0",
     "jinja2>=3.1.6,<4",
     "pathlib>=1.0.1",
     "pydantic>=2.11.4,<3",
@@ -40,7 +41,7 @@ lint = [
 include = ["portal_tool"]
 
 [tool.hatch.build.targets.sdist.force-include]
-"portal_tool/templates/*.j2" = "portal_tool/templates/*.j2"
+"portal_tool/templates/*" = "portal_tool/templates/*"
 
 [tool.hatch.build.targets.wheel]
 include = ["portal_tool"]

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/src/portal_tool/installer/configurators/configurator.py

@@ -26,7 +26,7 @@ class Configurator(metaclass=abc.ABCMeta):
             if (
                 installed_vcpkg.exists()
                 and (
-                    installed_vcpkg / f"vcpkg{self._get_executable_extension()}"
+                    installed_vcpkg / f"vcpkg{self.get_executable_extension()}"
                 ).exists()
             ):
                 return installed_vcpkg, False
@@ -37,7 +37,6 @@ class Configurator(metaclass=abc.ABCMeta):
         self._validate_compilers()
         self._validate_cmake()
         self._validate_dependencies()
-        self._validate_uv()
 
     def _try_install_vcpkg(self) -> None:
         install_vcpkg = typer.confirm("Would you like to install vcpkg?")
@@ -68,7 +67,7 @@ class Configurator(metaclass=abc.ABCMeta):
         typer.echo("Bootstrap vcpkg...")
         subprocess.check_output(
             shlex.split(
-                f"{installation_directory}/bootstrap-vcpkg.{self._get_script_extension()}"
+                f"{installation_directory}/bootstrap-vcpkg.{self.get_script_extension()}"
             )
         )
         typer.echo(f"Vcpkg installed successfully to: {installation_directory}")
@@ -85,11 +84,11 @@ class Configurator(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    def _get_script_extension(self) -> str:
+    def get_script_extension(self) -> str:
         pass
 
     @abc.abstractmethod
-    def _get_executable_extension(self) -> str:
+    def get_executable_extension(self) -> str:
         pass
 
     @abc.abstractmethod
@@ -99,7 +98,3 @@ class Configurator(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def _validate_compilers(self) -> None:
         pass
-
-    @abc.abstractmethod
-    def _validate_uv(self) -> None:
-        pass

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/src/portal_tool/installer/configurators/linux_configurator.py

@@ -112,43 +112,43 @@ class LinuxConfigurator(Configurator):
         except (subprocess.SubprocessError, FileNotFoundError):
             typer.echo("Clang not found")
 
-        # Check for gcc 15+
-        try:
-            result = subprocess.run(
-                ["gcc", "--version"], capture_output=True, text=True, timeout=5
-            )
-            if result.returncode == 0:
-                # Parse version from output like "gcc (GCC) X.Y.Z" or "gcc version X.Y.Z"
-                match = re.search(r"gcc.*?(\d+)\.(\d+)", result.stdout, re.IGNORECASE)
-                if match:
-                    major = int(match.group(1))
-                    if major >= 15:
-                        # Try to get installation path
-                        path_result = subprocess.run(
-                            ["which", "gcc"], capture_output=True, text=True, timeout=5
-                        )
-                        install_path = (
-                            path_result.stdout.strip()
-                            if path_result.returncode == 0
-                            else "unknown"
-                        )
-                        typer.echo(
-                            f"gcc {major}.{match.group(2)} found ({install_path})"
-                        )
-                        gcc_valid = True
-                    else:
-                        typer.echo(
-                            f"gcc {major}.{match.group(2)} found, but version 15+ is required"
-                        )
-        except (subprocess.SubprocessError, FileNotFoundError):
-            typer.echo("gcc not found")
+        # # Check for gcc 15+
+        # try:
+        #     result = subprocess.run(
+        #         ["gcc", "--version"], capture_output=True, text=True, timeout=5
+        #     )
+        #     if result.returncode == 0:
+        #         # Parse version from output like "gcc (GCC) X.Y.Z" or "gcc version X.Y.Z"
+        #         match = re.search(r"gcc.*?(\d+)\.(\d+)", result.stdout, re.IGNORECASE)
+        #         if match:
+        #             major = int(match.group(1))
+        #             if major >= 15:
+        #                 # Try to get installation path
+        #                 path_result = subprocess.run(
+        #                     ["which", "gcc"], capture_output=True, text=True, timeout=5
+        #                 )
+        #                 install_path = (
+        #                     path_result.stdout.strip()
+        #                     if path_result.returncode == 0
+        #                     else "unknown"
+        #                 )
+        #                 typer.echo(
+        #                     f"gcc {major}.{match.group(2)} found ({install_path})"
+        #                 )
+        #                 gcc_valid = True
+        #             else:
+        #                 typer.echo(
+        #                     f"gcc {major}.{match.group(2)} found, but version 15+ is required"
+        #                 )
+        # except (subprocess.SubprocessError, FileNotFoundError):
+        #     typer.echo("gcc not found")
 
         # Require at least one valid compiler
         if not clang_valid and not gcc_valid:
             typer.echo("\nNo valid compiler found!")
             typer.echo("Please install at least one of the following:")
             typer.echo("  - Clang 19 or later")
-            typer.echo("  - gcc 15 or later")
+            # typer.echo("  - gcc 15 or later")
             raise typer.Abort("Compiler validation failed")
 
         typer.echo("Compiler validation successful!")
@@ -195,27 +195,8 @@ class LinuxConfigurator(Configurator):
                 "Please install them manually before building, exit now if some of them are missing"
             )
 
-    def _validate_uv(self) -> None:
-        proceed = False
-        try:
-            subprocess.check_output(["uv", "--version"])
-            typer.echo("UV found, skipping installation")
-            proceed = False
-        except (subprocess.SubprocessError, FileNotFoundError):
-            proceed = typer.confirm(
-                "UV not found, would you like to install it?", abort=True
-            )
-
-        if proceed:
-            typer.echo("Installing UV...")
-            subprocess.check_output(
-                "curl -LsSf https://astral.sh/uv/install.sh | sh",
-                shell=True,
-            )
-            typer.echo("UV installation successful")
-
-    def _get_script_extension(self) -> str:
+    def get_script_extension(self) -> str:
         return "sh"
 
-    def _get_executable_extension(self) -> str:
+    def get_executable_extension(self) -> str:
         return ""

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/src/portal_tool/installer/configurators/mac_configurator.py

@@ -18,10 +18,10 @@ class MacConfigurator(Configurator):
     def _validate_compilers(self) -> None:
         typer.echo("Missing compiler validation, skipping...")
 
-    def _get_script_extension(self) -> str:
+    def get_script_extension(self) -> str:
         return "sh"
 
-    def _get_executable_extension(self) -> str:
+    def get_executable_extension(self) -> str:
         return ""
 
     def _validate_dependencies(self) -> None:

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/src/portal_tool/installer/configurators/windows_configurator.py

@@ -94,36 +94,10 @@ class WindowsConfigurator(Configurator):
 
         typer.echo("Compiler validation successful!")
 
-    def _validate_uv(self) -> None:
-        # Check for a valid uv version
-        proceed = False
-        try:
-            subprocess.check_output(["uv", "--version"])
-            typer.echo("UV found, skipping installation")
-            proceed = False
-        except (subprocess.SubprocessError, FileNotFoundError):
-            proceed = typer.confirm(
-                "UV not found, would you like to install it?", abort=True
-            )
-
-        if proceed:
-            typer.echo("Installing UV...")
-            subprocess.run(
-                [
-                    "powershell",
-                    "-ExecutionPolicy",
-                    "ByPass",
-                    "-c",
-                    "irm https://astral.sh/uv/install.ps1 | iex",
-                ],
-                check=True,
-            )
-            typer.echo("UV installation successful")
-
-    def _get_script_extension(self) -> str:
+    def get_script_extension(self) -> str:
         return "bat"
 
-    def _get_executable_extension(self) -> str:
+    def get_executable_extension(self) -> str:
         return ".exe"
 
     def _validate_dependencies(self) -> None:

portal_tool-0.0.20.dev7/src/portal_tool/installer/repo/repo_maker.py

@@ -0,0 +1,209 @@
+import importlib
+import importlib.util
+import json
+import os
+import pathlib
+import platform
+import shlex
+import shutil
+import subprocess
+import zipimport
+
+import typer
+from cookiecutter.main import cookiecutter
+
+from portal_tool.installer.configurator_factory import ConfiguratorFactory
+from portal_tool.installer.repo.build_models import (
+    CMakePresets,
+    ConfigurePreset,
+    BuildPreset,
+)
+
+
+class RepoMaker:
+    """
+    A repo consists of:
+    - vcpkg (either submodule or globally installed)
+    - src
+    - resources
+    - vcpkg configuration
+    - cmake configuration
+    """
+
+    def __init__(self, path: pathlib.Path):
+        self.configurator = ConfiguratorFactory().create(False)
+        self.presets = CMakePresets()
+
+        self.name = typer.prompt("Project Name")
+        self.base_path = pathlib.Path(
+            typer.prompt(f"Base Location (will create a folder named {self.name.lower().replace(' ', '_')})",
+                         default=path))
+        self.project_path = self.base_path / self.name.lower().replace(' ', '_')
+
+        self.vcpkg_toolchain_location = "{}/scripts/buildsystems/vcpkg.cmake"
+        self.use_global = False
+        self.vcpkg_exec_location = pathlib.Path("")
+
+        self._create_repo_from_template()
+        self._configure_git()
+        self._setup_vcpkg()
+        self._configure_build_system()
+
+    def _find_pacakge_path(self) -> pathlib.Path:
+        source_path = "templates/repo/bootstrap"
+        spec = importlib.util.find_spec("portal_tool")
+        assert spec is not None, "An import spec was not found for the package."
+        loader = spec.loader
+        assert loader is not None, "A loader was not found for the package."
+
+        if isinstance(loader, zipimport.zipimporter):
+            self._archive = loader.archive
+            pkgdir = next(iter(spec.submodule_search_locations))  # type: ignore
+            template_root = os.path.join(pkgdir, source_path).rstrip(os.path.sep)
+        else:
+            roots: list[str] = []
+
+            # One element for regular packages, multiple for namespace
+            # packages, or None for single module file.
+            if spec.submodule_search_locations:
+                roots.extend(spec.submodule_search_locations)
+            # A single module file, use the parent directory instead.
+            elif spec.origin is not None:
+                roots.append(os.path.dirname(spec.origin))
+
+            if not roots:
+                raise ValueError(
+                    f"The portal_tool package was not installed in a"
+                    " way that PackageLoader understands."
+                )
+
+            for root in roots:
+                root = os.path.join(root, source_path)
+
+                if os.path.isdir(root):
+                    template_root = root
+                    break
+            else:
+                raise ValueError(
+                    f"PackageLoader could not find a {source_path!r} directory"
+                    f" in the portal_tool package."
+                )
+        return pathlib.Path(template_root)
+
+    def _create_repo_from_template(self) -> None:
+        if self.project_path.exists():
+            proceed = typer.confirm(
+                "Found existing project, would you like to continue? (delete folder)"
+            )
+            if not proceed:
+                raise typer.Abort("Aborting repo creation.")
+            return
+
+        cookiecutter(
+            self._find_pacakge_path().as_posix(),
+            no_input=True,
+            extra_context={"project_name": self.name},
+            output_dir=self.base_path.as_posix(),
+        )
+
+    def _configure_git(self) -> None:
+        typer.echo(f"Initializing git repo in: {self.project_path}")
+        subprocess.check_output(shlex.split(f'git -C "{self.project_path}" init'))
+
+    def _setup_vcpkg(self) -> None:
+        vcpkg_root, found_using_env = self.configurator.find_vcpkg_root()
+
+        self.use_global = False
+        if vcpkg_root:
+            self.use_global = typer.confirm(
+                f"Found global vcpkg, [{vcpkg_root}] would you like to use? (if not, a local submodule will be created)"
+            )
+
+        if not self.use_global:
+            typer.echo(f"Creating vcpkg submodule in: {self.project_path / 'vcpkg'}")
+            try:
+                subprocess.check_output(
+                    shlex.split(
+                        f'git -C "{self.project_path}" submodule add https://github.com/microsoft/vcpkg "{"vcpkg"}"'
+                    )
+                )
+                subprocess.check_output(f'{self.project_path.as_posix()}/vcpkg/bootstrap-vcpkg.{self.configurator.get_script_extension()}', shell=True)
+                self.vcpkg_exec_location = self.project_path / "vcpkg" / f"vcpkg{self.configurator.get_executable_extension()}"
+            except subprocess.CalledProcessError:
+                typer.echo("Failed to add submodule, please add it manually.")
+        else:
+            self.vcpkg_exec_location = vcpkg_root / f"vcpkg{self.configurator.get_executable_extension()}"
+
+        self.vcpkg_toolchain_location = self.vcpkg_toolchain_location.format(
+            (
+                "$env{VCPKG_ROOT}"
+                if found_using_env
+                else (pathlib.Path(os.path.expanduser("~")) / ".vcpkg").as_posix()
+            )
+            if self.use_global
+            else "${sourceDir}/vcpkg"
+        )
+
+    def _configure_build_system(self) -> None:
+        base = ConfigurePreset(
+            name="base",
+            hidden=True,
+            binaryDir="${sourceDir}/build/${presetName}",
+            cacheVariables={
+                "CMAKE_TOOLCHAIN_FILE": self.vcpkg_toolchain_location,
+                "CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Release",
+            },
+        )
+
+        # TODO: determine generator (ninja-multi, xcode, vs)
+        ninja_multi = ConfigurePreset(
+            name="ninja-multi", inherits=[base.name], generator="Ninja Multi-Config"
+        )
+
+        # TODO: support clang
+        if platform.system() == "Linux":
+            ninja_multi.environment = {
+                "CC": "clang",
+                "CXX": "clang++",
+                "VCPKG_KEEP_ENV_VARS": "CC;CXX",
+                **(ninja_multi.environment if ninja_multi.environment else {}),
+            }
+
+        self.presets.configure_presets = [base, ninja_multi]
+
+        self.presets.build_presets = [
+            BuildPreset(
+                name="debug", configurePreset=ninja_multi.name, configuration="Debug"
+            ),
+            BuildPreset(
+                name="development",
+                configurePreset=ninja_multi.name,
+                configuration="RelWithDebInfo",
+            ),
+            BuildPreset(
+                name="release",
+                configurePreset=ninja_multi.name,
+                configuration="Release",
+            ),
+        ]
+
+        (self.project_path / "CMakePresets.json").write_text(
+            self.presets.model_dump_json(indent=4, exclude_none=True)
+        )
+
+        vcpkg_config = {
+            "registries": [
+                {
+                    "kind": "git",
+                    "repository": "https://github.com/JonatanNevo/portal-vcpkg-registry",
+                    "reference": "main",
+                    "baseline": "07f01155c58797765efee4f55a4acaf621cee5da",
+                    "packages": ["portal-core", "portal-application", "portal-input", "portal-networking",
+                                 "portal-serialization", "portal-engine", "enchantum", "spdlog", "glaze", "llvm-adt"]
+                }
+            ]
+        }
+
+        (self.project_path / "vcpkg_configuration.json").write_text(json.dumps(vcpkg_config, indent=4))
+
+        subprocess.check_output(shlex.split(f"{self.vcpkg_exec_location.as_posix()} x-update-baseline"))

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/cookiecutter.json

@@ -0,0 +1,4 @@
+{
+  "project_name": "Portal Bootstrap Game",
+  "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}"
+}

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/{{ cookiecutter.project_slug }}/.clang-format

@@ -0,0 +1,56 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: false
+AlignTrailingComments: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+PackConstructorInitializers: NextLineOnly
+BraceWrapping: 
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: true
+  BeforeWhile: true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBraces: Custom
+BreakConstructorInitializers: AfterColon
+ColumnLimit: 150
+IncludeCategories:
+  - Regex: '^<.*'
+    Priority: 1
+  - Regex: '^".*'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseBlocks: true
+IndentWidth: 4
+InsertNewlineAtEOF: true
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: Inner
+PointerAlignment: Left
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInConditionalStatement: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+TabWidth: 4
+...

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/{{ cookiecutter.project_slug }}/.gitignore

@@ -0,0 +1,134 @@
+### C++ template
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+### vcpkg template
+# Vcpkg
+
+vcpkg-manifest-install.log
+
+## Manifest Mode
+vcpkg_installed/
+
+### CLion template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+build*/

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/{{ cookiecutter.project_slug }}/CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.30)
+project({{ cookiecutter.project_name }})
+
+#find_package(portal-engine CONFIG REQUIRED)
+
+set(CMAKE_CXX_STANDARD 20)
+
+file(GLOB_RECURSE SOURCES source/*.cpp)
+
+portal_add_game({{ cookiecutter.project_slug }}
+        SOURCES ${SOURCES}
+)

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/{{ cookiecutter.project_slug }}/settings.json

@@ -0,0 +1,23 @@
+{
+    "name": "{{ cookiecutter.project_name }}",
+
+    "application": {
+        "fullscreen": false,
+        "scheduler-threads": 0,
+        "window": {
+            "height": 900,
+            "width": 1600
+        }
+    },
+
+    "engine": {
+        "include_engine_resources": true,
+        "resources": [
+            {
+                "path": "resources",
+                "type": "Folder"
+            }
+        ]
+    },
+    "log-level": "Debug"
+}

portal_tool-0.0.20.dev7/src/portal_tool/templates/repo/bootstrap/{{ cookiecutter.project_slug }}/source/main.cpp

@@ -0,0 +1,56 @@
+//
+// Copyright © 2025 Jonatan Nevo.
+// Distributed under the MIT license (see LICENSE file).
+//
+
+#include <portal/engine/settings.h>
+#include <portal/engine/engine.h>
+
+#include <portal/application/application.h>
+#include <portal/application/entry_point.h>
+
+using namespace portal;
+
+constexpr auto LOG_LEVEL_ENTRY = "log-level";
+
+void initialize_settings()
+{
+    Settings::init(SettingsArchiveType::Json, "settings.json");
+}
+
+void initialize_logger()
+{
+    auto log_level_string = Settings::get().get_setting<std::string>(LOG_LEVEL_ENTRY);
+    if (log_level_string)
+    {
+        const auto log_level = portal::from_string<Log::LogLevel>(*log_level_string);
+        Log::set_default_log_level(log_level);
+    }
+    Settings::get().debug_print();
+}
+
+ApplicationProperties make_application_properties()
+{
+    auto& settings = Settings::get();
+
+    const auto name = settings.get_setting<std::string>("name");
+    const auto width = settings.get_setting<size_t>("application.window.width");
+    const auto height = settings.get_setting<size_t>("application.window.height");
+
+    return ApplicationProperties{
+        .name = STRING_ID(name.value()),
+        .width = width.value(),
+        .height = height.value()
+    };
+}
+
+std::unique_ptr<Application> portal::create_application(int, char**)
+{
+    initialize_settings();
+    initialize_logger();
+
+    const auto prop = make_application_properties();
+    auto engine = std::make_unique<Engine>(prop);
+
+    return engine;
+}

{portal_tool-0.0.20.dev2 → portal_tool-0.0.20.dev7}/src/portal_tool/tool.py

@@ -1,11 +1,13 @@
 import logging
 import pathlib
 from typing import Annotated
+from importlib.metadata import version as meta_version
 
 import appdirs
 import typer
 from pydantic_settings import BaseSettings
 
+from installer.configurator_factory import ConfiguratorFactory
 from portal_tool.installer.repo.repo_maker import RepoMaker
 from portal_tool.installer.installer import Installer
 from portal_tool.git_manager import GitManager
@@ -20,6 +22,12 @@ global_working_directory = pathlib.Path.cwd()
 framework: PortalFramework
 
 
+def version_callback(value: bool):
+    if value:
+        typer.echo(f"Portal Tool version: {meta_version('portal_tool')}")
+        raise typer.Exit()
+
+
 class Settings(BaseSettings):
     registry_url: str = "github.com:JonatanNevo/portal-vcpkg-registry"
     examples_url: str = "github.com:JonatanNevo/portal-examples"
@@ -134,7 +142,18 @@ def init(
 
 
 @app.callback()
-def main():
+def main(
+    version: Annotated[
+        bool | None,
+        typer.Option(
+            "--version",
+            "-v",
+            callback=version_callback,
+            is_eager=True,
+            help="Show the version and exit.",
+        ),
+    ] = None,
+):
     logging.basicConfig(level=logging.INFO)
 
 

portal_tool-0.0.20.dev2/src/portal_tool/installer/repo/repo_maker.py

@@ -1,130 +0,0 @@
-import os
-import pathlib
-import platform
-import shlex
-import subprocess
-
-import typer
-
-from portal_tool.installer.configurator_factory import ConfiguratorFactory
-from portal_tool.installer.repo.build_models import (
-    CMakePresets,
-    ConfigurePreset,
-    BuildPreset,
-)
-
-
-class RepoMaker:
-    """
-    A repo consists of:
-    - vcpkg (either submodule or globally installed)
-    - src
-    - resources
-    - vcpkg configuration
-    - cmake configuration
-    """
-
-    def __init__(self, path: pathlib.Path):
-        self.configurator = ConfiguratorFactory().create(False)
-        self.presets = CMakePresets()
-
-        self.name = typer.prompt("Project Name")
-        self.base_path = pathlib.Path(typer.prompt("Project Location", default=path))
-
-        self.vcpkg_toolchain_location = "{}/scripts/buildsystems/vcpkg.cmake"
-
-        self._configure_git()
-        self._setup_vcpkg()
-        self._create_repo_from_template()
-        self._configure_build_system()
-
-    def _configure_git(self) -> None:
-        if (self.base_path / ".git").exists():
-            proceed = typer.confirm(
-                "Found existing git repo, would you like to continue?"
-            )
-            if not proceed:
-                raise typer.Abort("Aborting repo creation.")
-            return
-
-        typer.echo(f"Initializing git repo in: {self.base_path}")
-        subprocess.check_output(shlex.split(f'git -C "{self.base_path}" init'))
-
-    def _setup_vcpkg(self) -> None:
-        vcpkg_root, found_using_env = self.configurator.find_vcpkg_root()
-
-        use_global = False
-        if vcpkg_root:
-            use_global = typer.confirm(
-                f"Found global vcpkg, [{vcpkg_root}] would you like to use? (if not, a local submodule will be created)"
-            )
-
-        if not use_global:
-            typer.echo(f"Creating vcpkg submodule in: {self.base_path / 'vcpkg'}")
-            try:
-                subprocess.check_output(
-                    shlex.split(
-                        f'git -C "{self.base_path}" submodule add https://github.com/microsoft/vcpkg "{"vcpkg"}"'
-                    )
-                )
-            except subprocess.CalledProcessError:
-                typer.echo("Failed to add submodule, please add it manually.")
-
-        self.vcpkg_toolchain_location = self.vcpkg_toolchain_location.format(
-            (
-                "$env{VCPKG_ROOT}"
-                if found_using_env
-                else (pathlib.Path(os.path.expanduser("~")) / ".vcpkg").as_posix()
-            )
-            if use_global
-            else "${sourceDir}/vcpkg"
-        )
-
-    def _create_repo_from_template(self) -> None:
-        base = ConfigurePreset(
-            name="base",
-            hidden=True,
-            binary_dir="${sourceDir}/build/${presetName}",
-            cache_variables={
-                "CMAKE_TOOLCHAIN_FILE": self.vcpkg_toolchain_location,
-                "CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Release",
-            },
-        )
-
-        # TODO: determine generator (ninja-multi, xcode, vs)
-        ninja_multi = ConfigurePreset(
-            name="ninja-multi", inherits=[base.name], generator="Ninja Multi-Config"
-        )
-
-        if platform.system() == "Linux":
-            ninja_multi.environment = {
-                "CC": "clang",
-                "CXX": "clang++",
-                "VCPKG_KEEP_ENV_VARS": "CC;CXX",
-                **(ninja_multi.environment if ninja_multi.environment else {}),
-            }
-
-        self.presets.configure_presets = [base, ninja_multi]
-
-        self.presets.build_presets = [
-            BuildPreset(
-                name="debug", configurePreset=ninja_multi.name, configuration="Debug"
-            ),
-            BuildPreset(
-                name="development",
-                configurePreset=ninja_multi.name,
-                configuration="RelWithDebInfo",
-            ),
-            BuildPreset(
-                name="release",
-                configurePreset=ninja_multi.name,
-                configuration="Release",
-            ),
-        ]
-
-        (self.base_path / "CMakePresets.json").write_text(
-            self.presets.model_dump_json(indent=4, exclude_none=True)
-        )
-
-    def _configure_build_system(self) -> None:
-        pass