Merge branch 'dev'

Author: mrbindraw

.gitignore

@@ -4,3 +4,4 @@ Binaries
 Intermediate
 Saved
 Build
+.DS_Store

Config/FilterPlugin.ini

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Andrew Bindraw
+Copyright (c) 2025 Andrew Bindraw
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 5,
-	"VersionName": "2.2.3",
+	"Version": 6,
+	"VersionName": "2.5.0",
 	"FriendlyName": "ProjectVersionFromGit",
 	"Description": "Set version for project from git tag format MAJOR.MINOR.PATCH also set branch name, commit hash and datetime build",
 	"Category": "Source Control",
@@ -14,18 +14,17 @@
 	"IsBetaVersion": false,
 	"IsExperimentalVersion": false,
 	"Installed": false,
-  	"SupportedTargetPlatforms": [
-		"Win64",
-		"Android"
-	],
 	"Modules": [
 		{
 			"Name": "ProjectVersionFromGit",
 			"Type": "Runtime",
 			"LoadingPhase": "Default",
-			"WhitelistPlatforms": [
+			"PlatformAllowList": [
 				"Win64",
-				"Android"
+				"Android",
+				"Mac",
+				"IOS",
+				"Linux"
 			]
 		}
 	]

ProjectVersionFromGit.uplugin

@@ -1,6 +1,5 @@
 # ProjectVersionFromGit
-Plugin for UE4/5 project.  
-Set version for project from git tag format MAJOR.MINOR.PATCH also set branch name, commit hash and datetime build.
+This plugin set version for project from git tag format MAJOR.MINOR.PATCH also set branch name, commit hash and utc-datetime build.
 
 **C++/Blueprints functions:**
 - GetProjectVersion()
@@ -12,8 +11,22 @@ Set version for project from git tag format MAJOR.MINOR.PATCH also set branch na
 - GetProjectVersionDateTimeBuild()
 - GetProjectVersionFormatAll()
 
-# Install 
+# Install into Project
 You can install manually by extracting archive (ProjectVersionFromGit-X.X.X-...zip) from
 [Releases](https://github.com/mrbindraw/ProjectVersionFromGit/releases) to your project plugins folder  
 or build example project (ExamplePrj-UEX.X-ProjectVersionFromGit-X.X.X.zip).  
+
+# Install into Unreal Engine  
 You can install it from the marketplace [ProjectVersionFromGit](https://www.fab.com/listings/044c4f9a-eedc-487b-a973-c1c940470373)
+
+Manual:   
+1. Download and extracting archive (ProjectVersionFromGit-X.X.X-...zip) from [Releases](https://github.com/mrbindraw/ProjectVersionFromGit/releases) to any disk path, for example: `D:\Plugins`  
+2. Than open any terminal (cmd, powershell) in `D:\Plugins` folder  
+3. Launch `RunUAT.bat` in the terminal, for example:
+```  
+D:\EpicGames\UE_5.4\Engine\Build\BatchFiles\RunUAT.bat BuildPlugin -Plugin=D:\Plugins\ProjectVersionFromGit\ProjectVersionFromGit.uplugin -Package=D:\Plugins\UE_5.4\ProjectVersionFromGit -Rocket
+```  
+4. If you see the message `BUILD SUCCESSFUL` in the terminal after the build is complete,  
+copy the `ProjectVersionFromGit` folder from `D:\Plugins\UE_5.4` to `D:\EpicGames\UE_5.4\Engine\Plugins\Marketplace`  
+> [!IMPORTANT]
+> **The engine path and folder names may differ on your system.**

README.md

@@ -1,4 +1,4 @@
-// Copyright 2024 Andrew Bindraw. All Rights Reserved.
+// Copyright 2025 Andrew Bindraw. All Rights Reserved.
 
 #include "ProjectVersionFromGit.h"
 
@@ -7,16 +7,36 @@
 void FProjectVersionFromGitModule::StartupModule()
 {
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
-	
+    
+#if WITH_EDITOR
+    ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings");
+
+    if (SettingsModule != nullptr)
+    {
+        SettingsModule->RegisterSettings("Project", "Plugins", "ProjectVersionGit",
+            LOCTEXT("ProjectVersionGitSettingsName", "Project Version Git"),
+            LOCTEXT("ProjectVersionGitSettingsDescription", "Configure the ProjectVersionFromGit plugin"),
+            GetMutableDefault<UProjectVersionGitSettings>()
+        );
+    }
+#endif //WITH_EDITOR
 }
 
 void FProjectVersionFromGitModule::ShutdownModule()
 {
 	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
 	// we call this function before unloading the module.
+    
+#if WITH_EDITOR
+    ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings");
+    if (SettingsModule != nullptr)
+    {
+        SettingsModule->UnregisterSettings("Project", "Plugins", "ProjectVersionGit");
+    }
+#endif //WITH_EDITOR
 
 }
 
 #undef LOCTEXT_NAMESPACE
 
-IMPLEMENT_MODULE(FProjectVersionFromGitModule, ProjectVersionFromGit)
+IMPLEMENT_MODULE(FProjectVersionFromGitModule, ProjectVersionFromGit)

Source/ProjectVersionFromGit/Private/ProjectVersionFromGit.cpp

@@ -1,7 +1,6 @@
-// Copyright 2024 Andrew Bindraw. All Rights Reserved.
+// Copyright 2025 Andrew Bindraw. All Rights Reserved.
 
 #include "ProjectVersionFromGitBPLibrary.h"
-#include "ProjectVersionFromGit.h"
 
 FText UProjectVersionFromGitBPLibrary::ProjectVersion 			= FText::GetEmpty();
 FText UProjectVersionFromGitBPLibrary::ProjectVersionFormatAll 	= FText::GetEmpty();
@@ -18,12 +17,29 @@ FString UProjectVersionFromGitBPLibrary::VersionFileIni	= FString(TEXT("Version.
 
 FString UProjectVersionFromGitBPLibrary::GitStdOutput = FString(TEXT(""));
 
-DEFINE_LOG_CATEGORY(ProjectVersionFromGit)
+DEFINE_LOG_CATEGORY(LogProjectVersionFromGitBPLibrary)
 
 UProjectVersionFromGitBPLibrary::UProjectVersionFromGitBPLibrary(const FObjectInitializer& ObjectInitializer)
 : Super(ObjectInitializer)
 {
-	GetProjectVersionInfo(FParseVersionDelegate());
+	
+}
+
+void UProjectVersionFromGitBPLibrary::PostInitProperties()
+{
+	Super::PostInitProperties();
+
+	UProjectVersionGitSettings::OnPostInitPropertiesCompleted.AddLambda([]() 
+		{ 
+			GetProjectVersionInfo(FParseVersionDelegate()); 
+		});
+
+#if WITH_EDITOR
+	UProjectVersionGitSettings::OnPostEditChangePropertyCompleted.AddLambda([]() 
+		{ 
+			GetProjectVersionInfo(FParseVersionDelegate()); 
+		});
+#endif
 }
 
 bool UProjectVersionFromGitBPLibrary::ExecProcess(const TCHAR* URL, const TCHAR* Params, int32* OutReturnCode, FString* OutStdOut, FString* OutStdErr, const TCHAR* OptionalWorkingDirectory)
@@ -49,20 +65,24 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 
 		if (GEngine->IsEditor())
 		{
+            const auto Cfg = GetMutableDefault<UProjectVersionGitSettings>();
+            
 			FString OutStdOut;
 			FString OutStdErr;
 			int32 OutReturnCode;
 			static const FString OptionalWorkingDirectory = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
 
 			FString TagNameArg;
 
-			ExecProcess(TEXT("git"), TEXT("rev-list --tags --max-count=1"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
+			UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Cfg->GitBinPath: %s"), *Cfg->GitBinPath);
+
+			ExecProcess(*Cfg->GitBinPath, TEXT("rev-list --tags --max-count=1"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
 			OutStdOut.TrimStartAndEndInline();
 
 			TagNameArg = FString(TEXT("describe --tags ")) + OutStdOut;
-			ExecProcess(TEXT("git"), *TagNameArg, &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
+			ExecProcess(*Cfg->GitBinPath, *TagNameArg, &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
 			OutStdOut.TrimStartAndEndInline();
-			//UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- Git tag: %s"), *OutStdOut);
+			//UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Git tag: %s"), *OutStdOut);
 
 			const FRegexPattern myPattern(TEXT("([0-9]\\.[0-9]\\.[0-9])+"));
 			FRegexMatcher myMatcher(myPattern, OutStdOut);
@@ -71,10 +91,10 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 			{
 				int32 beginPos = myMatcher.GetMatchBeginning();
 				int32 endPos = myMatcher.GetMatchEnding();
-				//UE_LOG(ProjectVersionFromGit, Log, TEXT("Regex git tag pos: %i %i"), beginPos, endPos);
+				//UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("Regex git tag pos: %i %i"), beginPos, endPos);
 				OutStdOut = OutStdOut.Mid(beginPos, endPos - beginPos);
 			}
-			UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- Git tag: %s"), *OutStdOut);
+			UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Git tag: %s"), *OutStdOut);
 
 			if (OutStdOut.IsEmpty())
 			{
@@ -105,7 +125,7 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 
 
 			// Get BranchName
-			ExecProcess(TEXT("git"), TEXT("symbolic-ref --short HEAD"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
+			ExecProcess(*Cfg->GitBinPath, TEXT("symbolic-ref --short HEAD"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
 			OutStdOut.TrimStartAndEndInline();
 			if (OutStdOut.IsEmpty())
 			{
@@ -118,12 +138,12 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 			OutStdOut = FString(TEXT(""));
 
 			// Get CommitHash
-			ExecProcess(TEXT("git"), TEXT("status --short"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
+			ExecProcess(*Cfg->GitBinPath, TEXT("status --short"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
 			OutStdOut.TrimStartAndEndInline();
 			GitStdOutput = OutStdOut;
 			OutStdOut.Reset();
 
-			ExecProcess(TEXT("git"), TEXT("describe --always --abbrev=8"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
+			ExecProcess(*Cfg->GitBinPath, TEXT("describe --always --abbrev=8"), &OutReturnCode, &OutStdOut, &OutStdErr, *OptionalWorkingDirectory);
 			OutStdOut.TrimStartAndEndInline();
 
 			if (GitStdOutput.IsEmpty())
@@ -143,7 +163,7 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 
 			if (!GitStdOutput.IsEmpty())
 			{
-				UE_LOG(ProjectVersionFromGit, Warning, TEXT("-------- Git status --short: %s"), *GitStdOutput);
+				UE_LOG(LogProjectVersionFromGitBPLibrary, Warning, TEXT("-------- Git status --short: %s"), *GitStdOutput);
 			}
 
 			FConfigFile ConfigFile;
@@ -266,18 +286,16 @@ void UProjectVersionFromGitBPLibrary::GetProjectVersionInfo(FParseVersionDelegat
 			);
 		}
 
-#if PLATFORM_WINDOWS
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- ProjectVersion: %s"), *ProjectVersion.ToString());
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- Major: %d"), Major);
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- Minor: %d"), Minor);
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- Patch: %d"), Patch);
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- BranchName: %s"), *BranchName.ToString());
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- CommitHash: %s"), *CommitHash.ToString());
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- DateTimeBuild: %s"), *DateTimeBuild.ToString());
-		UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- ProjectVersionFormatAll: %s"), *ProjectVersionFormatAll.ToString());
-		//UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- GGameIni: %s"), *GGameIni);
-		//UE_LOG(ProjectVersionFromGit, Log, TEXT("-------- VersionFileIniPath: %s"), *VersionFileIniPath);
-#endif
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- ProjectVersion: %s"), *ProjectVersion.ToString());
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Major: %d"), Major);
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Minor: %d"), Minor);
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- Patch: %d"), Patch);
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- BranchName: %s"), *BranchName.ToString());
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- CommitHash: %s"), *CommitHash.ToString());
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- DateTimeBuild: %s"), *DateTimeBuild.ToString());
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- ProjectVersionFormatAll: %s"), *ProjectVersionFormatAll.ToString());
+		UE_LOG(LogProjectVersionFromGitBPLibrary, Log, TEXT("-------- VersionFileIniPath: %s"), *VersionFileIniPath);
+
 		AsyncTask(ENamedThreads::GameThread, [OnCompleted]()
 		{
 			OnCompleted.ExecuteIfBound();
@@ -323,4 +341,4 @@ FText UProjectVersionFromGitBPLibrary::GetProjectVersionDateTimeBuild()
 FText UProjectVersionFromGitBPLibrary::GetProjectVersionFormatAll()
 {
 	return ProjectVersionFormatAll;
-}
+}

Source/ProjectVersionFromGit/Private/ProjectVersionFromGitBPLibrary.cpp

@@ -0,0 +1,82 @@
+// Copyright 2025 Andrew Bindraw. All Rights Reserved.
+
+#include "ProjectVersionGitSettings.h"
+
+DEFINE_LOG_CATEGORY(LogProjectVersionGitSettings)
+
+FPostInitPropertiesDelegate UProjectVersionGitSettings::OnPostInitPropertiesCompleted;
+
+#if WITH_EDITOR
+FPostEditChangePropertyDelegate UProjectVersionGitSettings::OnPostEditChangePropertyCompleted;
+#endif
+
+UProjectVersionGitSettings::UProjectVersionGitSettings(const FObjectInitializer& ObjectInitializer):
+    Super(ObjectInitializer)
+{
+    /*
+     * Check more info about git path:
+     * Engine/Plugins/Developer/GitSourceControl/Source/GitSourceControl/Private/GitSourceControlUtils.cpp#L170
+     * FString FindGitBinaryPath()
+     * Open terminal
+     * $ whereis git
+     * $ which -a git
+    */
+
+#if PLATFORM_WINDOWS
+    GitBinPath = "git.exe";
+#else
+    GitBinPath = "/usr/bin/git";
+#endif
+}
+
+void UProjectVersionGitSettings::PostInitProperties()
+{
+    Super::PostInitProperties();
+
+#if WITH_EDITOR
+    static const FString ConfigIniName = TEXT("DefaultProjectVersionGitSettings.ini");
+    static const FString ConfigIniPath = FConfigCacheIni::NormalizeConfigIniPath(FString::Printf(TEXT("%s%s"), *FPaths::SourceConfigDir(), *ConfigIniName));
+    static const FString SectionName = TEXT("/Script/ProjectVersionFromGit.ProjectVersionGitSettings");
+
+    if (!FPaths::FileExists(ConfigIniPath))
+    {
+        FConfigFile ConfigFile;
+        GConfig->SetFile(ConfigIniPath, &ConfigFile);
+
+        GConfig->SetString(
+            *SectionName,
+            TEXT("GitBinPath"),
+            *GitBinPath,
+            ConfigIniPath
+        );
+
+        GConfig->Flush(false, ConfigIniPath);
+
+        UE_LOG(LogProjectVersionGitSettings, Log, TEXT("---> Created Config: %s, Path: %s"), *ConfigIniName, *ConfigIniPath);
+    }
+    else
+    {
+        GConfig->GetString(
+            *SectionName,
+            TEXT("GitBinPath"),
+            GitBinPath,
+            ConfigIniPath
+        );
+    }
+#endif // WITH_EDITOR
+
+    UE_LOG(LogProjectVersionGitSettings, Log, TEXT("---> PostInitProperties, GitBinPath: %s"), *GitBinPath);
+
+    OnPostInitPropertiesCompleted.Broadcast();
+}
+
+#if WITH_EDITOR
+void UProjectVersionGitSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+    Super::PostEditChangeProperty(PropertyChangedEvent);
+
+    UE_LOG(LogProjectVersionGitSettings, Log, TEXT("---> PostEditChangeProperty, GitBinPath: %s"), *GitBinPath);
+
+    OnPostEditChangePropertyCompleted.Broadcast();
+}
+#endif // WITH_EDITOR

Source/ProjectVersionFromGit/Private/ProjectVersionGitSettings.cpp

@@ -1,4 +1,4 @@
-// Copyright 2024 Andrew Bindraw. All Rights Reserved.
+// Copyright 2025 Andrew Bindraw. All Rights Reserved.
 
 using UnrealBuildTool;
 
@@ -49,5 +49,11 @@ public ProjectVersionFromGit(ReadOnlyTargetRules Target) : base(Target)
 				// ... add any modules that your module loads dynamically here ...
 			}
 			);
+
+        if (Target.Type == TargetType.Editor)
+        {
+            DynamicallyLoadedModuleNames.Add("Settings");
+            PrivateIncludePathModuleNames.Add("Settings");
+        }
 	}
 }