diff --git a/meson.build b/meson.build index 2eecd4d43..2081698de 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ version_h = custom_target('git_version.h', command: [version_sh, meson.current_build_dir(), meson.current_source_dir()], build_by_default: true, build_always_stale: true, # has internal check whether target file will be refreshed - output: ['git_version.h', 'git_version.xml']) + output: ['git_version.h']) if host_machine.system() == 'darwin' and get_option('build_osx_bundle') prefix = meson.current_build_dir() / 'Aegisub.app' / 'Contents' diff --git a/tools/version.ps1 b/tools/version.ps1 index 1fdb29adc..58c7ce5e1 100644 --- a/tools/version.ps1 +++ b/tools/version.ps1 @@ -28,7 +28,6 @@ if ([System.IO.Path]::GetFullPath([System.IO.Path]::Combine((pwd).Path, $BuildRo $BuildRoot = Join-Path $repositoryRootPath 'build' } $gitVersionHeaderPath = Join-Path $BuildRoot 'git_version.h' -$gitVersionXmlPath = Join-Path $BuildRoot 'git_version.xml' $version = @{} if (Test-Path $gitVersionHeaderPath) { @@ -50,6 +49,10 @@ $gitHash = git -C $repositoryRootPath rev-parse --short HEAD 2>$null $gitVersionString = $gitRevision, $gitBranch, $gitHash -join '-' $exactGitTag = git -C $repositoryRootPath describe --exact-match --tags 2>$null +if ($gitVersionString -eq $version['BUILD_GIT_VERSION_STRING']) { + exit 0 +} + if ($exactGitTag -match $semVerMatch) { $version['TAGGED_RELEASE'] = $true $version['RESOURCE_BASE_VERSION'] = $Matches[1..3] @@ -85,19 +88,3 @@ $version.GetEnumerator() | %{ } "#define $($_.Key) $($fmtValue)" } | Out-File -FilePath $gitVersionHeaderPath -Encoding utf8 - -$gitVersionXml = [xml]@' - - - - - - - - -'@ - -$gitVersionXml.Project.PropertyGroup.GitVersionNumber = $gitRevision.ToString() -$gitVersionXml.Project.PropertyGroup.GitVersionString = $gitVersionString -$gitVersionXml.Project.PropertyGroup.ReleaseVersion = $gitVersionString -$gitVersionXml.Save($gitVersionXmlPath) diff --git a/tools/version.sh b/tools/version.sh index 3db7c280d..2266bba88 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -11,8 +11,7 @@ if ! test -d "${srcdir}/.git"; then export $2=$(echo $3 | sed 's/"//g') done < "${version_h_path}" if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then - export VERSION_SOURCE="from cached git_version.h" - return 0 + exit 0 else echo "invalid git_version.h" exit 2 @@ -65,17 +64,3 @@ in "${new_version_h}");; *) echo "${new_version_h}" > "${version_h_path}" esac - -export BUILD_GIT_VERSION_NUMBER="${git_revision}" -export BUILD_GIT_VERSION_STRING="${git_version_str}" -export VERSION_SOURCE="from git" - -cat << EOF > "${builddir}/git_version.xml" - - - - ${git_revision} - ${git_version_str} - - -EOF