haikuports · jurgenwigg · Jul 31, 2023
diff --git a/haikuporter b/haikuporter
diff --git a/haikuporter b/haikuporter
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013-2014 Oliver Tappe
+# Distributed under the terms of the MIT License.
+import logging
+
+from HaikuPorter.Main import Main
+from HaikuPorter.Options import parseOptions
+
+logger = logging.getLogger("buildLogger")
+logger.setLevel(logging.INFO)
+logger.addHandler(logging.StreamHandler())
+
+Main(*parseOptions())
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,9 +7,12 @@ repository = "https://github.com/haikuports/haikuporter"
 documentation = "https://haikuports.github.io/haikuporter/"
 readme = "README.md"
 packages = [
-  {include = "HaikuPorter"}
+  {include = "HaikuPorter", from = "src"}
 ]
 
+[tool.poetry.scripts]
+haikuporter = "HaikuPorter.haikuporter:main"
+
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
 black = "^23.7.0"
@@ -39,7 +42,7 @@ target-version = ['py37']
 preview = true
 
 [tool.mypy]
-files = ["HaikuPorter"]
+files = ["src/HaikuPorter"]
 disallow_untyped_defs = "True"
 disallow_any_unimported = "True"
 no_implicit_optional = "True"
@@ -99,4 +102,4 @@ skip_empty = true
 
 [tool.coverage.run]
 branch = true
-source = ["HaikuPorter"]
+source = ["src/HaikuPorter"]
diff --git a/HaikuPorter/BuildMaster.py → src/HaikuPorter/BuildMaster.py b/HaikuPorter/BuildMaster.py → src/HaikuPorter/BuildMaster.py
diff --git a/HaikuPorter/BuildPlatform.py → src/HaikuPorter/BuildPlatform.py b/HaikuPorter/BuildPlatform.py → src/HaikuPorter/BuildPlatform.py
diff --git a/HaikuPorter/Builders/Builder.py → src/HaikuPorter/Builders/Builder.py b/HaikuPorter/Builders/Builder.py → src/HaikuPorter/Builders/Builder.py
diff --git a/HaikuPorter/Builders/LocalBuilder.py → src/HaikuPorter/Builders/LocalBuilder.py b/HaikuPorter/Builders/LocalBuilder.py → src/HaikuPorter/Builders/LocalBuilder.py
diff --git a/HaikuPorter/Builders/MockBuilder.py → src/HaikuPorter/Builders/MockBuilder.py b/HaikuPorter/Builders/MockBuilder.py → src/HaikuPorter/Builders/MockBuilder.py
diff --git a/HaikuPorter/Builders/RemoteBuilderSSH.py → src/HaikuPorter/Builders/RemoteBuilderSSH.py b/HaikuPorter/Builders/RemoteBuilderSSH.py → src/HaikuPorter/Builders/RemoteBuilderSSH.py
diff --git a/HaikuPorter/ConfigParser.py → src/HaikuPorter/ConfigParser.py b/HaikuPorter/ConfigParser.py → src/HaikuPorter/ConfigParser.py
diff --git a/HaikuPorter/Configuration.py → src/HaikuPorter/Configuration.py b/HaikuPorter/Configuration.py → src/HaikuPorter/Configuration.py
diff --git a/HaikuPorter/DependencyAnalyzer.py → src/HaikuPorter/DependencyAnalyzer.py b/HaikuPorter/DependencyAnalyzer.py → src/HaikuPorter/DependencyAnalyzer.py
diff --git a/HaikuPorter/DependencyResolver.py → src/HaikuPorter/DependencyResolver.py b/HaikuPorter/DependencyResolver.py → src/HaikuPorter/DependencyResolver.py
diff --git a/HaikuPorter/Display.py → src/HaikuPorter/Display.py b/HaikuPorter/Display.py → src/HaikuPorter/Display.py
diff --git a/HaikuPorter/Main.py → src/HaikuPorter/Main.py b/HaikuPorter/Main.py → src/HaikuPorter/Main.py
diff --git a/HaikuPorter/Options.py → src/HaikuPorter/Options.py b/HaikuPorter/Options.py → src/HaikuPorter/Options.py
diff --git a/HaikuPorter/Package.py → src/HaikuPorter/Package.py b/HaikuPorter/Package.py → src/HaikuPorter/Package.py
diff --git a/HaikuPorter/PackageInfo.py → src/HaikuPorter/PackageInfo.py b/HaikuPorter/PackageInfo.py → src/HaikuPorter/PackageInfo.py
diff --git a/HaikuPorter/PackageRepository.py → src/HaikuPorter/PackageRepository.py b/HaikuPorter/PackageRepository.py → src/HaikuPorter/PackageRepository.py
diff --git a/HaikuPorter/Policy.py → src/HaikuPorter/Policy.py b/HaikuPorter/Policy.py → src/HaikuPorter/Policy.py
diff --git a/HaikuPorter/Port.py → src/HaikuPorter/Port.py b/HaikuPorter/Port.py → src/HaikuPorter/Port.py
diff --git a/HaikuPorter/ProvidesManager.py → src/HaikuPorter/ProvidesManager.py b/HaikuPorter/ProvidesManager.py → src/HaikuPorter/ProvidesManager.py
diff --git a/HaikuPorter/RecipeAttributes.py → src/HaikuPorter/RecipeAttributes.py b/HaikuPorter/RecipeAttributes.py → src/HaikuPorter/RecipeAttributes.py
diff --git a/HaikuPorter/RecipeTypes.py → src/HaikuPorter/RecipeTypes.py b/HaikuPorter/RecipeTypes.py → src/HaikuPorter/RecipeTypes.py
diff --git a/HaikuPorter/ReleaseChecker.py → src/HaikuPorter/ReleaseChecker.py b/HaikuPorter/ReleaseChecker.py → src/HaikuPorter/ReleaseChecker.py
diff --git a/HaikuPorter/ReporterJson.py → src/HaikuPorter/ReporterJson.py b/HaikuPorter/ReporterJson.py → src/HaikuPorter/ReporterJson.py
diff --git a/HaikuPorter/ReporterMongo.py → src/HaikuPorter/ReporterMongo.py b/HaikuPorter/ReporterMongo.py → src/HaikuPorter/ReporterMongo.py
diff --git a/HaikuPorter/Repository.py → src/HaikuPorter/Repository.py b/HaikuPorter/Repository.py → src/HaikuPorter/Repository.py
diff --git a/HaikuPorter/RequiresUpdater.py → src/HaikuPorter/RequiresUpdater.py b/HaikuPorter/RequiresUpdater.py → src/HaikuPorter/RequiresUpdater.py
diff --git a/HaikuPorter/ShellScriptlets.py → src/HaikuPorter/ShellScriptlets.py b/HaikuPorter/ShellScriptlets.py → src/HaikuPorter/ShellScriptlets.py
diff --git a/HaikuPorter/Source.py → src/HaikuPorter/Source.py b/HaikuPorter/Source.py → src/HaikuPorter/Source.py
diff --git a/HaikuPorter/SourceFetcher.py → src/HaikuPorter/SourceFetcher.py b/HaikuPorter/SourceFetcher.py → src/HaikuPorter/SourceFetcher.py
diff --git a/HaikuPorter/Utils.py → src/HaikuPorter/Utils.py b/HaikuPorter/Utils.py → src/HaikuPorter/Utils.py
diff --git a/HaikuPorter/__init__.py → src/HaikuPorter/__init__.py b/HaikuPorter/__init__.py → src/HaikuPorter/__init__.py
diff --git a/HaikuPorter/__version__.py → src/HaikuPorter/__version__.py b/HaikuPorter/__version__.py → src/HaikuPorter/__version__.py
diff --git a/haikuporter.py → src/HaikuPorter/haikuporter.py b/haikuporter.py → src/HaikuPorter/haikuporter.py
@@ -8,8 +8,14 @@
 from HaikuPorter.Main import Main
 from HaikuPorter.Options import parseOptions
 
-logger = logging.getLogger("buildLogger")
-logger.setLevel(logging.INFO)
-logger.addHandler(logging.StreamHandler())
 
-Main(*parseOptions())
+def main():
+    logger = logging.getLogger("buildLogger")
+    logger.setLevel(logging.INFO)
+    logger.addHandler(logging.StreamHandler())
+
+    Main(*parseOptions())
+
+
+if __name__ == "__main__":
+    main()