games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

fix fetching git info from Gradle

Browse Source
This commit is contained in:
Andrey Filipenkov
2023-02-26 13:47:09 +03:00
parent c960cb0506
commit dad5b93706
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/vcmi-app/build.gradle
View File

@@ -74,7 +74,7 @@ def RenameOutput(final baseName, final variant) {
ResolveGitInfo()
def name = baseName + "-" + ext.gitInfoLauncher + "-" + ext.gitInfoVcmi
def name = baseName + "-" + ext.gitInfoVcmi
if (buildTaskId != null && !buildTaskId.isEmpty()) {
name = buildTaskId + "-" + name
@@ -109,14 +109,13 @@ def CommandOutput(final cmd, final arguments, final cwd) {
}
def ResolveGitInfo() {
if (ext.gitInfoLauncher != "none" && ext.gitInfoVcmi != "none") {
if (ext.gitInfoVcmi != "none") {
return
}
ext.gitInfoLauncher = CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE)
ext.gitInfoVcmi =
CommandOutput("git", ["log", "-1", "--pretty=%D", "--decorate-refs=refs/remotes/origin/*"], PROJECT_PATH_BASE + "/ext/vcmi").replace("origin/", "").replace(", HEAD", "").replaceAll("[^a-zA-Z0-9\\-_]", "_") +
CommandOutput("git", ["log", "-1", "--pretty=%D", "--decorate-refs=refs/remotes/origin/*"], ".").replace("origin/", "").replace(", HEAD", "").replaceAll("[^a-zA-Z0-9\\-_]", "_") +
"-" +
CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE + "/ext/vcmi")
CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], ".")
}
def SigningPropertiesPath(final basePath) {