Update the version files with the new rc or dev build number.

Author: BartHertog

setup.py

@@ -118,6 +118,102 @@ def get_current_branch():
         return 'develop'
 
 
+def update_version_json(version_string):
+    """Update the version.json file with the new version string."""
+    try:
+        version_file = 'EmbeddedProto/version.json'
+        with open(version_file, 'r') as f:
+            version_data = json.load(f)
+        
+        # Update the version
+        version_data['version'] = version_string
+        
+        # Write back to the file
+        with open(version_file, 'w') as f:
+            json.dump(version_data, f, indent=2)
+        
+        print(f"Debug: Updated version.json with version: '{version_string}'")
+        return True
+    except Exception as e:
+        print(f"Warning: Failed to update version.json: {e}")
+        return False
+
+def update_version_h(version_string):
+    """Update the Version.h file with the new version string."""
+    try:
+        version_h_file = 'src/Version.h'
+        
+        # Parse the version string to extract components
+        version_parts = re.match(r'(\d+)\.(\d+)\.(\d+)(.*)', version_string)
+        if not version_parts:
+            print(f"Warning: Could not parse version string: '{version_string}'")
+            return False
+        
+        major = version_parts.group(1)
+        minor = version_parts.group(2)
+        patch = version_parts.group(3)
+        suffix = version_parts.group(4) or ""  # This will be empty, rc{N}, or .dev{N}
+        
+        # Extract RC number if present
+        rc_match = re.match(r'rc(\d+)', suffix)
+        rc_number = rc_match.group(1) if rc_match else "0"
+        has_rc = bool(rc_match)
+        
+        # Extract DEV number if present
+        dev_match = re.match(r'\.dev(\d+)', suffix)
+        dev_number = dev_match.group(1) if dev_match else "0"
+        has_dev = bool(dev_match)
+        
+        # Read the current file
+        with open(version_h_file, 'r') as f:
+            content = f.read()
+        
+        # Replace the version macros
+        content = re.sub(r'#define EMBEDDEDPROTO_VERSION_MAJOR \d+', 
+                         f'#define EMBEDDEDPROTO_VERSION_MAJOR {major}', content)
+        content = re.sub(r'#define EMBEDDEDPROTO_VERSION_MINOR \d+', 
+                         f'#define EMBEDDEDPROTO_VERSION_MINOR {minor}', content)
+        content = re.sub(r'#define EMBEDDEDPROTO_VERSION_PATCH \d+', 
+                         f'#define EMBEDDEDPROTO_VERSION_PATCH {patch}', content)
+        
+        # Add or update RC macro if needed
+        rc_define = f'//! The release candidate number (0 if not a release candidate).\n#define EMBEDDEDPROTO_VERSION_RC {rc_number}\n'
+        if '#define EMBEDDEDPROTO_VERSION_RC' in content:
+            content = re.sub(r'//!.*\n#define EMBEDDEDPROTO_VERSION_RC \d+', 
+                            rc_define.strip(), content)
+        else:
+            # Add after PATCH definition
+            patch_pos = content.find('#define EMBEDDEDPROTO_VERSION_PATCH')
+            if patch_pos != -1:
+                end_line_pos = content.find('\n', patch_pos) + 1
+                content = content[:end_line_pos] + '\n' + rc_define + content[end_line_pos:]
+        
+        # Add or update DEV macro if needed
+        dev_define = f'//! The development build number (0 if not a development build).\n#define EMBEDDEDPROTO_VERSION_DEV {dev_number}\n'
+        if '#define EMBEDDEDPROTO_VERSION_DEV' in content:
+            content = re.sub(r'//!.*\n#define EMBEDDEDPROTO_VERSION_DEV \d+', 
+                            dev_define.strip(), content)
+        else:
+            # Add after RC definition
+            rc_pos = content.find('#define EMBEDDEDPROTO_VERSION_RC')
+            if rc_pos != -1:
+                end_line_pos = content.find('\n', rc_pos) + 1
+                content = content[:end_line_pos] + '\n' + dev_define + content[end_line_pos:]
+        
+        # Update version string
+        content = re.sub(r'#define EMBEDDEDPROTO_VERSION_STRING "[^"]+"', 
+                         f'#define EMBEDDEDPROTO_VERSION_STRING "{version_string}"', content)
+        
+        # Write back to the file
+        with open(version_h_file, 'w') as f:
+            f.write(content)
+        
+        print(f"Debug: Updated Version.h with version: '{version_string}'")
+        return True
+    except Exception as e:
+        print(f"Warning: Failed to update Version.h: {e}")
+        return False
+
 def get_version():
     try:
         version_file = 'EmbeddedProto/version.json'
@@ -129,8 +225,11 @@ def get_version():
         try:
             with open(version_file, 'r') as f:
                 version_data = json.load(f)
-            base_version = version_data.get('version', '0.0.0')
-            print(f"Debug: Base version from version.json: '{base_version}'")
+            version_from_file = version_data.get('version', '0.0.0')
+            
+            # Strip any existing rc or dev suffix to get the base version
+            base_version = re.sub(r'(rc\d+|\.dev\d+)$', '', version_from_file)
+            print(f"Debug: Base version (stripped): '{base_version}'")
         except (FileNotFoundError, json.JSONDecodeError) as e:
             print(f"Debug: Error reading version.json: {e}")
             # Fallback if version file is missing or invalid
@@ -150,11 +249,23 @@ def get_version():
             print(f"Debug: Detected release branch, using GITHUB_RUN_NUMBER '{build_number}' for rc suffix")
             full_version = f"{base_version}rc{build_number}"
             print(f"Debug: Using release candidate version: '{full_version}'")
+            
+            # Only update files if the version has changed
+            if full_version != version_from_file:
+                print(f"Debug: Updating version files from '{version_from_file}' to '{full_version}'")
+                update_version_json(full_version)
+                update_version_h(full_version)
 
         else:
             # Development or feature branch
             full_version = f"{base_version}.dev{build_number}"
             print(f"Debug: Using development version: '{full_version}'")
+            
+            # Only update files if the version has changed
+            if full_version != version_from_file:
+                print(f"Debug: Updating version files from '{version_from_file}' to '{full_version}'")
+                update_version_json(full_version)
+                update_version_h(full_version)
 
         return full_version
     except Exception as e: