only gen window VHDL during create project

Author: Salvador Santoluctio

labview_fpga_hdl_tools/create_vivado_project.py

@@ -661,10 +661,10 @@ def create_project(overwrite=False, update=False, test=False):
         return 1
 
     if len(config.window_vhdl_templates) > 0:
-        # Run (or rerun) generate LV target support - this is needed to generate TheWindow.vhd that goes
+        # Run (or rerun) generate LV Window VHDL - this is needed to generate TheWindow.vhd that goes
         # into the objects directory and which gets used in the Vivado project
         try:
-            gen_labview_target_plugin.gen_lv_target_support()
+            gen_labview_target_plugin.gen_window_vhdl()
         except Exception as e:
             print(f"Error: {e}")
             return 1

labview_fpga_hdl_tools/gen_labview_target_plugin.py

@@ -663,96 +663,101 @@ def _copy_targetinfo_ini(plugin_folder, targetinfo_path):
         print("Warning: Could not resolve path to TargetInfo.ini")
 
 
-def _validate_ini(config):
-    """Validate that all required configuration settings are present.
+def _validate_ini(config, gen_window_only=False):
+    """Validate that required configuration settings are present.
 
-    This function checks that all settings required for target plugin generation
-    are present in the configuration object and validates that all specified paths exist.
+    This function checks configuration settings and validates that all specified paths exist.
+    When gen_window_only is True, only validates settings needed for Window VHDL generation.
 
     Args:
         config: Configuration object containing settings from INI file
+        gen_window_only: If True, only validate settings for Window VHDL generation
 
     Raises:
         ValueError: If any required settings are missing or paths are invalid
     """
     missing_settings = []
     invalid_paths = []
 
-    # Required general settings
-    if not config.target_family:
-        missing_settings.append("GeneralSettings.TargetFamily")
-
-    if not config.base_target:
-        missing_settings.append("GeneralSettings.BaseTarget")
-
-    # Required plugin settings
-    if not config.lv_target_plugin_folder:
-        missing_settings.append("LVFPGATargetSettings.LVTargetPluginFolder")
-
-    if not config.lv_target_name:
-        missing_settings.append("LVFPGATargetSettings.LVTargetName")
-
-    if not config.lv_target_guid:
-        missing_settings.append("LVFPGATargetSettings.LVTargetGUID")
-
-    # Validate input files and folders
+    # Validate input CSV if custom IO is included (required for both modes)
     if config.include_custom_io and not config.custom_signals_csv:
         missing_settings.append("LVFPGATargetSettings.LVTargetBoardIO")
 
-    if not config.boardio_output:
-        missing_settings.append("LVFPGATargetSettings.BoardIOXML")
-
-    if not config.clock_output:
-        missing_settings.append("LVFPGATargetSettings.ClockXML")
-
+    # Validate Window VHDL template paths (required for both modes)
     if not config.window_vhdl_templates:
         missing_settings.append("LVFPGATargetSettings.WindowVhdlTemplates")
     else:
-        # Validate each template file path
         for i, template_path in enumerate(config.window_vhdl_templates):
             invalid_path = common.validate_path(
                 template_path, f"LVFPGATargetSettings.WindowVhdlTemplates[{i}]", "file"
             )
             if invalid_path:
                 invalid_paths.append(invalid_path)
 
+    # Validate output folder setting (required for both modes)
     if not config.window_vhdl_output_folder:
         missing_settings.append("LVFPGATargetSettings.WindowVhdlOutputFolder")
 
-    if not config.board_io_signal_assignments_example:
-        missing_settings.append("LVFPGATargetSettings.BoardIOSignalAssignmentsExample")
+    # Only validate additional settings if generating full target support
+    if not gen_window_only:
+        # Required general settings
+        if not config.target_family:
+            missing_settings.append("GeneralSettings.TargetFamily")
 
-    # Check list settings
-    if not config.hdl_file_lists:
-        missing_settings.append("VivadoProjectSettings.VivadoProjectFilesLists")
-    else:
-        # Validate each file list path
-        for i, file_list_path in enumerate(config.hdl_file_lists):
-            invalid_path = common.validate_path(
-                file_list_path, f"VivadoProjectSettings.VivadoProjectFilesLists[{i}]", "file"
-            )
-            if invalid_path:
-                invalid_paths.append(invalid_path)
+        if not config.base_target:
+            missing_settings.append("GeneralSettings.BaseTarget")
 
-    if not config.target_xml_templates:
-        missing_settings.append("LVFPGATargetSettings.TargetXMLTemplates")
-    else:
-        # Validate each template file path
-        for i, template_path in enumerate(config.target_xml_templates):
-            invalid_path = common.validate_path(
-                template_path, f"LVFPGATargetSettings.TargetXMLTemplates[{i}]", "file"
-            )
-            if invalid_path:
-                invalid_paths.append(invalid_path)
+        # Required plugin settings
+        if not config.lv_target_plugin_folder:
+            missing_settings.append("LVFPGATargetSettings.LVTargetPluginFolder")
 
-    # Validate any constraint files if specified
-    if config.lv_target_constraints_files:
-        for i, constraint_path in enumerate(config.lv_target_constraints_files):
-            invalid_path = common.validate_path(
-                constraint_path, f"LVFPGATargetSettings.LVTargetConstraintsFiles[{i}]", "file"
-            )
-            if invalid_path:
-                invalid_paths.append(invalid_path)
+        if not config.lv_target_name:
+            missing_settings.append("LVFPGATargetSettings.LVTargetName")
+
+        if not config.lv_target_guid:
+            missing_settings.append("LVFPGATargetSettings.LVTargetGUID")
+
+        # Validate input files and folders
+        if not config.boardio_output:
+            missing_settings.append("LVFPGATargetSettings.BoardIOXML")
+
+        if not config.clock_output:
+            missing_settings.append("LVFPGATargetSettings.ClockXML")
+
+        if not config.board_io_signal_assignments_example:
+            missing_settings.append("LVFPGATargetSettings.BoardIOSignalAssignmentsExample")
+
+        # Check list settings
+        if not config.hdl_file_lists:
+            missing_settings.append("VivadoProjectSettings.VivadoProjectFilesLists")
+        else:
+            # Validate each file list path
+            for i, file_list_path in enumerate(config.hdl_file_lists):
+                invalid_path = common.validate_path(
+                    file_list_path, f"VivadoProjectSettings.VivadoProjectFilesLists[{i}]", "file"
+                )
+                if invalid_path:
+                    invalid_paths.append(invalid_path)
+
+        if not config.target_xml_templates:
+            missing_settings.append("LVFPGATargetSettings.TargetXMLTemplates")
+        else:
+            # Validate each template file path
+            for i, template_path in enumerate(config.target_xml_templates):
+                invalid_path = common.validate_path(
+                    template_path, f"LVFPGATargetSettings.TargetXMLTemplates[{i}]", "file"
+                )
+                if invalid_path:
+                    invalid_paths.append(invalid_path)
+
+        # Validate any constraint files if specified
+        if config.lv_target_constraints_files:
+            for i, constraint_path in enumerate(config.lv_target_constraints_files):
+                invalid_path = common.validate_path(
+                    constraint_path, f"LVFPGATargetSettings.LVTargetConstraintsFiles[{i}]", "file"
+                )
+                if invalid_path:
+                    invalid_paths.append(invalid_path)
 
     # Construct error message
     error_msg = common.get_missing_settings_error(missing_settings)
@@ -764,6 +769,39 @@ def _validate_ini(config):
         raise ValueError(error_msg)
 
 
+def gen_window_vhdl():
+    """Generate Window VHDL files only.
+
+    Standalone entry point for generating Window VHDL files from CSV and templates.
+    This is useful when you only need to regenerate VHDL interface files without
+    rebuilding the entire target plugin.
+
+    Returns:
+        int: 0 if successful, 1 if errors occurred
+    """
+    # Load configuration
+    config = common.load_config()
+
+    # Validate that required settings for Window VHDL generation are present
+    try:
+        _validate_ini(config, gen_window_only=True)
+    except Exception as e:
+        print(f"Error: {e}")
+        return 1
+
+    # Generate Window VHDL files
+    _generate_window_vhdl_from_csv(
+        config.custom_signals_csv,
+        config.window_vhdl_templates,
+        config.window_vhdl_output_folder,
+        config.include_clip_socket_ports,
+        config.include_custom_io,
+    )
+
+    print("Window VHDL generation complete.")
+    return 0
+
+
 def gen_lv_target_support():
     """Generate target support files."""
     # Load configuration