Refactors project structure for modularity
Renames and reorganizes modules under a new 'hdlbuild' namespace for improved clarity and maintainability. Updates import paths across the codebase to reflect the new structure. No logic changes introduced.
This commit is contained in:
@@ -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")
|
@@ -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):
|
@@ -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
|
@@ -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(
|
@@ -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(
|
@@ -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):
|
@@ -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(
|
@@ -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(
|
@@ -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(
|
@@ -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(
|
@@ -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
|
@@ -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):
|
||||
"""
|
@@ -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:
|
||||
"""
|
@@ -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]]]:
|
||||
"""
|
Reference in New Issue
Block a user