mirror of https://github.com/WebAssembly/wasi-sdk
In the past, I've had trouble keeping the current set of version scripts to correctly output the version, especially in light of how we append Git suffixes for a non-tagged commit and dirty state. This change replaces those scripts with a single Python one which, though much more wordy than the previous one, may be easier for contributors to read and modify. The original scripts relied on Perl; this one relies on Python, which seems like a fair exchange. Having a single script also makes it easier to solve #372.pull/403/head
Andrew Brown
1 year ago
parent
96bbd95197
commit
2436b99f1d
@ -1,4 +0,0 @@
|
||||
#/bin/bash
|
||||
LLVM_PROJ_DIR=${1:-./src/llvm-project}
|
||||
MAJOR=`(grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/llvm/CMakeLists.txt || grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/cmake/Modules/LLVMVersion.cmake) | awk '{print substr($2, 1, length($2) - 1)}'`
|
||||
echo $MAJOR
|
||||
@ -0,0 +1,122 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# This script finds and prints the various versions in this project: wasi-sdk
|
||||
# itself, LLVM, and the Git revisions of dependencies.
|
||||
#
|
||||
# Usage: version [wasi-sdk|llvm|llvm-major|dump] [--llvm-dir=<non-project dir>]
|
||||
|
||||
import sys
|
||||
import argparse
|
||||
import subprocess
|
||||
|
||||
# The number of characters to use for the abbreviated Git revision.
|
||||
GIT_REF_LEN = 12
|
||||
|
||||
|
||||
def exec(command, cwd=None):
|
||||
result = subprocess.run(command, stdout=subprocess.PIPE,
|
||||
universal_newlines=True, check=True, cwd=cwd)
|
||||
return result.stdout.strip()
|
||||
|
||||
|
||||
def git_commit(dir='.'):
|
||||
return exec(['git', 'rev-parse', f'--short={GIT_REF_LEN}', 'HEAD'], dir)
|
||||
|
||||
|
||||
def parse_git_version(version):
|
||||
# Parse, e.g.: wasi-sdk-21-0-g317548590b40+m
|
||||
parts = version.replace('+', '-').split('-')
|
||||
assert parts.pop(0) == 'wasi'
|
||||
assert parts.pop(0) == 'sdk'
|
||||
|
||||
major, minor = parts.pop(0), parts.pop(0)
|
||||
git = None
|
||||
dirty = False
|
||||
|
||||
if parts:
|
||||
# Check: git|dirty.
|
||||
next = parts.pop(0)
|
||||
if next == 'm':
|
||||
dirty = True
|
||||
else:
|
||||
git = next[1:]
|
||||
|
||||
# Check: dirty.
|
||||
if parts:
|
||||
assert parts.pop(0) == 'm', f'expected dirty flag: +m'
|
||||
dirty = True
|
||||
|
||||
assert not parts, f'unexpected suffixes: {parts}'
|
||||
return major, minor, git, dirty
|
||||
|
||||
|
||||
# Some inline tests to check Git version parsing:
|
||||
assert parse_git_version(
|
||||
'wasi-sdk-21-0-g317548590b40+m') == ('21', '0', '317548590b40', True)
|
||||
assert parse_git_version('wasi-sdk-21-2+m') == ('21', '2', None, True)
|
||||
assert parse_git_version(
|
||||
'wasi-sdk-23-0-g317548590b40') == ('23', '0', '317548590b40', False)
|
||||
|
||||
|
||||
def git_version():
|
||||
version = exec(['git', 'describe', '--long', '--candidates=999',
|
||||
'--match=wasi-sdk-*', '--dirty=+m', f'--abbrev={GIT_REF_LEN}'])
|
||||
major, minor, git, dirty = parse_git_version(version)
|
||||
version = f'{major}.{minor}'
|
||||
if git:
|
||||
version += f'g{git}'
|
||||
if dirty:
|
||||
version += '+m'
|
||||
return version
|
||||
|
||||
|
||||
def parse_cmake_set(line):
|
||||
return line.split(' ')[1].split(')')[0]
|
||||
|
||||
|
||||
def llvm_cmake_version(llvm_dir):
|
||||
with open(f'{llvm_dir}/llvm/CMakeLists.txt') as file:
|
||||
for line in file:
|
||||
line = line.strip()
|
||||
if line.startswith('set(LLVM_VERSION_MAJOR'):
|
||||
llvm_version_major = parse_cmake_set(line)
|
||||
elif line.startswith('set(LLVM_VERSION_MINOR'):
|
||||
llvm_version_minor = parse_cmake_set(line)
|
||||
elif line.startswith('set(LLVM_VERSION_PATCH'):
|
||||
llvm_version_patch = parse_cmake_set(line)
|
||||
return llvm_version_major, llvm_version_minor, llvm_version_patch
|
||||
|
||||
|
||||
def main(action, llvm_dir):
|
||||
if action == 'wasi-sdk':
|
||||
print(git_version())
|
||||
elif action == 'llvm':
|
||||
major, minor, path = llvm_cmake_version(llvm_dir)
|
||||
print(f'{major}.{minor}.{path}')
|
||||
elif action == 'llvm-major':
|
||||
major, _, _ = llvm_cmake_version(llvm_dir)
|
||||
print(major)
|
||||
elif action == 'dump':
|
||||
print(git_version())
|
||||
print(f'wasi-libc: {git_commit("src/wasi-libc")}')
|
||||
print(f'llvm: {git_commit(llvm_dir)}')
|
||||
major, minor, path = llvm_cmake_version(llvm_dir)
|
||||
print(f'llvm-version: {major}.{minor}.{path}')
|
||||
print(f'config: {git_commit("src/config")}')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Print the various kinds of versions in wasi-sdk')
|
||||
parser.add_argument('action',
|
||||
choices=['wasi-sdk', 'llvm', 'llvm-major', 'dump'],
|
||||
nargs='?',
|
||||
default='wasi-sdk',
|
||||
help='Which kind of version to print (default: wasi-sdk).')
|
||||
parser.add_argument('--llvm-dir',
|
||||
nargs='?',
|
||||
default='src/llvm-project',
|
||||
help='Override the location of the LLVM source directory (default: src/llvm-project).')
|
||||
args = parser.parse_args()
|
||||
main(args.action, args.llvm_dir)
|
||||
sys.exit(0)
|
||||
@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
git config --global --add safe.directory "/workspace"
|
||||
GIT_DESCR=$(git describe --long --candidates=999 --match='wasi-sdk-*' --dirty='+m' --abbrev=12)
|
||||
GIT_PACKAGE_VERSION=$(echo $GIT_DESCR | perl -ne 'if(/^wasi-sdk-(\d+)-(\d+)-g([0-9a-f]{7,12})([+]m)?$/) { if($2 == 0) { print "$1.$2$4" } else { print "$1.$2g$3$4" } exit } else { print "could not parse git description"; exit 1 }';)
|
||||
echo $GIT_PACKAGE_VERSION
|
||||
Loading…
Reference in new issue