diff --git a/src/__init__.py b/src/hdlbuild/__init__.py similarity index 100% rename from src/__init__.py rename to src/hdlbuild/__init__.py diff --git a/src/cli.py b/src/hdlbuild/cli.py similarity index 85% rename from src/cli.py rename to src/hdlbuild/cli.py index 762c9b3..a7c6130 100644 --- a/src/cli.py +++ b/src/hdlbuild/cli.py @@ -1,11 +1,11 @@ import argparse import sys -from dependencies.resolver import DependencyResolver -from tools.xilinx_ise.main import xilinx_ise_all, xilinx_ise_synth -from utils.console_utils import ConsoleUtils -from utils.directory_manager import clear_build_directories, clear_directories, ensure_directories_exist -from utils.project_loader import load_project_config +from hdlbuild.dependencies.resolver import DependencyResolver +from hdlbuild.tools.xilinx_ise.main import xilinx_ise_all, xilinx_ise_synth +from hdlbuild.utils.console_utils import ConsoleUtils +from hdlbuild.utils.directory_manager import clear_build_directories, clear_directories, ensure_directories_exist +from hdlbuild.utils.project_loader import load_project_config project = load_project_config() console_utils = ConsoleUtils("hdlbuild") diff --git a/src/dependencies/resolver.py b/src/hdlbuild/dependencies/resolver.py similarity index 93% rename from src/dependencies/resolver.py rename to src/hdlbuild/dependencies/resolver.py index 1bd2e34..9242bdb 100644 --- a/src/dependencies/resolver.py +++ b/src/hdlbuild/dependencies/resolver.py @@ -3,13 +3,13 @@ from typing import List, Set from git import Repo -from models.config import DIRECTORIES, GIT -from models.project import ProjectConfig -from models.dependency import ResolvedDependency +from hdlbuild.models.config import DIRECTORIES, GIT +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.dependency import ResolvedDependency import os -from utils.console_utils import ConsoleUtils -from utils.project_loader import load_project_config +from hdlbuild.utils.console_utils import ConsoleUtils +from hdlbuild.utils.project_loader import load_project_config class DependencyResolver: def __init__(self, root_project: ProjectConfig, offline_mode: bool = False): diff --git a/src/models/config.py b/src/hdlbuild/models/config.py similarity index 100% rename from src/models/config.py rename to src/hdlbuild/models/config.py diff --git a/src/models/dependency.py b/src/hdlbuild/models/dependency.py similarity index 73% rename from src/models/dependency.py rename to src/hdlbuild/models/dependency.py index dc9792d..f69fd85 100644 --- a/src/models/dependency.py +++ b/src/hdlbuild/models/dependency.py @@ -1,7 +1,7 @@ # models/dependency.py from pydantic import BaseModel -from models.project import ProjectConfig +from hdlbuild.models.project import ProjectConfig class ResolvedDependency(BaseModel): project: ProjectConfig diff --git a/src/models/project.py b/src/hdlbuild/models/project.py similarity index 100% rename from src/models/project.py rename to src/hdlbuild/models/project.py diff --git a/src/tools/xilinx_ise/bitgen.py b/src/hdlbuild/tools/xilinx_ise/bitgen.py similarity index 80% rename from src/tools/xilinx_ise/bitgen.py rename to src/hdlbuild/tools/xilinx_ise/bitgen.py index 05ddefd..3eab141 100644 --- a/src/tools/xilinx_ise/bitgen.py +++ b/src/hdlbuild/tools/xilinx_ise/bitgen.py @@ -2,9 +2,9 @@ import subprocess import os import shutil from typing import Optional -from models.project import ProjectConfig -from models.config import DIRECTORIES -from tools.xilinx_ise.common import copy_file, run_tool +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import copy_file, run_tool def run_bitgen(project: ProjectConfig): run_tool( diff --git a/src/tools/xilinx_ise/common.py b/src/hdlbuild/tools/xilinx_ise/common.py similarity index 93% rename from src/tools/xilinx_ise/common.py rename to src/hdlbuild/tools/xilinx_ise/common.py index 273e8f8..2f83958 100644 --- a/src/tools/xilinx_ise/common.py +++ b/src/hdlbuild/tools/xilinx_ise/common.py @@ -1,9 +1,9 @@ import shutil import os from typing import Optional, List -from models.project import ProjectConfig -from models.config import DIRECTORIES -from utils.console_utils import ConsoleTask, ConsoleUtils +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.utils.console_utils import ConsoleTask, ConsoleUtils from rich.console import Console def run_tool( diff --git a/src/tools/xilinx_ise/main.py b/src/hdlbuild/tools/xilinx_ise/main.py similarity index 51% rename from src/tools/xilinx_ise/main.py rename to src/hdlbuild/tools/xilinx_ise/main.py index c6c8b11..2442843 100644 --- a/src/tools/xilinx_ise/main.py +++ b/src/hdlbuild/tools/xilinx_ise/main.py @@ -1,11 +1,11 @@ -from models.config import DIRECTORIES -from models.project import ProjectConfig -from tools.xilinx_ise.bitgen import copy_bitstream_file, run_bitgen -from tools.xilinx_ise.map import copy_map_report, run_map -from tools.xilinx_ise.ngdbuild import run_ngdbuild -from tools.xilinx_ise.par import copy_par_report, copy_pinout_report, run_par -from tools.xilinx_ise.trace import copy_trace_report, run_trace -from tools.xilinx_ise.xst import copy_synthesis_report, generate_xst_project_file, generate_xst_script_file, run_xst +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.models.project import ProjectConfig +from hdlbuild.tools.xilinx_ise.bitgen import copy_bitstream_file, run_bitgen +from hdlbuild.tools.xilinx_ise.map import copy_map_report, run_map +from hdlbuild.tools.xilinx_ise.ngdbuild import run_ngdbuild +from hdlbuild.tools.xilinx_ise.par import copy_par_report, copy_pinout_report, run_par +from hdlbuild.tools.xilinx_ise.trace import copy_trace_report, run_trace +from hdlbuild.tools.xilinx_ise.xst import copy_synthesis_report, generate_xst_project_file, generate_xst_script_file, run_xst def xilinx_ise_synth(project: ProjectConfig): diff --git a/src/tools/xilinx_ise/map.py b/src/hdlbuild/tools/xilinx_ise/map.py similarity index 82% rename from src/tools/xilinx_ise/map.py rename to src/hdlbuild/tools/xilinx_ise/map.py index 2b7a970..2b45169 100644 --- a/src/tools/xilinx_ise/map.py +++ b/src/hdlbuild/tools/xilinx_ise/map.py @@ -2,9 +2,9 @@ import subprocess import os import shutil from typing import Optional -from models.project import ProjectConfig -from models.config import DIRECTORIES -from tools.xilinx_ise.common import copy_file, run_tool +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import copy_file, run_tool def run_map(project: ProjectConfig): run_tool( diff --git a/src/tools/xilinx_ise/ngdbuild.py b/src/hdlbuild/tools/xilinx_ise/ngdbuild.py similarity index 76% rename from src/tools/xilinx_ise/ngdbuild.py rename to src/hdlbuild/tools/xilinx_ise/ngdbuild.py index 2bc3a46..d86162f 100644 --- a/src/tools/xilinx_ise/ngdbuild.py +++ b/src/hdlbuild/tools/xilinx_ise/ngdbuild.py @@ -1,9 +1,9 @@ import subprocess import os from typing import Optional -from models.project import ProjectConfig -from models.config import DIRECTORIES -from tools.xilinx_ise.common import run_tool +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import run_tool def run_ngdbuild(project: ProjectConfig): run_tool( diff --git a/src/tools/xilinx_ise/par.py b/src/hdlbuild/tools/xilinx_ise/par.py similarity index 85% rename from src/tools/xilinx_ise/par.py rename to src/hdlbuild/tools/xilinx_ise/par.py index 14b15ad..71d186b 100644 --- a/src/tools/xilinx_ise/par.py +++ b/src/hdlbuild/tools/xilinx_ise/par.py @@ -2,9 +2,9 @@ import subprocess import shutil import os from typing import Optional -from models.project import ProjectConfig -from models.config import DIRECTORIES -from tools.xilinx_ise.common import copy_file, run_tool +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import copy_file, run_tool def run_par(project: ProjectConfig): run_tool( diff --git a/src/tools/xilinx_ise/trace.py b/src/hdlbuild/tools/xilinx_ise/trace.py similarity index 79% rename from src/tools/xilinx_ise/trace.py rename to src/hdlbuild/tools/xilinx_ise/trace.py index 54d6470..21ce4e2 100644 --- a/src/tools/xilinx_ise/trace.py +++ b/src/hdlbuild/tools/xilinx_ise/trace.py @@ -2,9 +2,9 @@ import subprocess import os import shutil from typing import Optional -from models.project import ProjectConfig -from models.config import DIRECTORIES -from tools.xilinx_ise.common import copy_file, run_tool +from hdlbuild.models.project import ProjectConfig +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import copy_file, run_tool def run_trace(project: ProjectConfig): run_tool( diff --git a/src/tools/xilinx_ise/xst.py b/src/hdlbuild/tools/xilinx_ise/xst.py similarity index 87% rename from src/tools/xilinx_ise/xst.py rename to src/hdlbuild/tools/xilinx_ise/xst.py index 2bea59f..4836011 100644 --- a/src/tools/xilinx_ise/xst.py +++ b/src/hdlbuild/tools/xilinx_ise/xst.py @@ -1,9 +1,9 @@ from typing import Optional -from dependencies.resolver import DependencyResolver -from models.config import DIRECTORIES -from tools.xilinx_ise.common import copy_file, run_tool -from utils.source_resolver import expand_all_sources -from models.project import ProjectConfig +from hdlbuild.dependencies.resolver import DependencyResolver +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.tools.xilinx_ise.common import copy_file, run_tool +from hdlbuild.utils.source_resolver import expand_all_sources +from hdlbuild.models.project import ProjectConfig import subprocess import os import shutil diff --git a/src/utils/console_utils.py b/src/hdlbuild/utils/console_utils.py similarity index 100% rename from src/utils/console_utils.py rename to src/hdlbuild/utils/console_utils.py diff --git a/src/utils/directory_manager.py b/src/hdlbuild/utils/directory_manager.py similarity index 95% rename from src/utils/directory_manager.py rename to src/hdlbuild/utils/directory_manager.py index 92a3003..f03eaec 100644 --- a/src/utils/directory_manager.py +++ b/src/hdlbuild/utils/directory_manager.py @@ -1,7 +1,7 @@ import os import shutil -from models.config import DIRECTORIES -from utils.console_utils import ConsoleUtils +from hdlbuild.models.config import DIRECTORIES +from hdlbuild.utils.console_utils import ConsoleUtils def ensure_directories_exist(silent: bool = False): """ diff --git a/src/utils/project_loader.py b/src/hdlbuild/utils/project_loader.py similarity index 90% rename from src/utils/project_loader.py rename to src/hdlbuild/utils/project_loader.py index 1c6f1e0..7709abf 100644 --- a/src/utils/project_loader.py +++ b/src/hdlbuild/utils/project_loader.py @@ -1,5 +1,5 @@ import yaml -from models.project import ProjectConfig +from hdlbuild.models.project import ProjectConfig def load_project_config(path: str = "project.yml") -> ProjectConfig: """ diff --git a/src/utils/source_resolver.py b/src/hdlbuild/utils/source_resolver.py similarity index 95% rename from src/utils/source_resolver.py rename to src/hdlbuild/utils/source_resolver.py index a84b0bb..e711ec5 100644 --- a/src/utils/source_resolver.py +++ b/src/hdlbuild/utils/source_resolver.py @@ -3,8 +3,8 @@ import glob import os from typing import List, Tuple -from models.project import SourceFile, ProjectConfig -from models.dependency import ResolvedDependency +from hdlbuild.models.project import SourceFile, ProjectConfig +from hdlbuild.models.dependency import ResolvedDependency def _expand_project_sources(project: ProjectConfig, project_root: str) -> Tuple[List[Tuple[str, str]], List[Tuple[str, str]]]: """