StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "rust: Add support for more cargo pkg version vars" into main

Browse Source
This commit is contained in:
Ivan Lozano
2023-07-31 16:31:14 +00:00
committed by Gerrit Code Review
parent 60a2ca3332 f445562840
commit f74612e346
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust/builder.go
View File

@@ -228,6 +228,17 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string {
pkgVersion := ctx.RustModule().compiler.CargoPkgVersion()
if pkgVersion != "" {
envVars = append(envVars, "CARGO_PKG_VERSION="+pkgVersion)
// Ensure the version is in the form of "x.y.z" (approximately semver compliant).
//
// For our purposes, we don't care to enforce that these are integers since they may
// include other characters at times (e.g. sometimes the patch version is more than an integer).
if strings.Count(pkgVersion, ".") == 2 {
var semver_parts = strings.Split(pkgVersion, ".")
envVars = append(envVars, "CARGO_PKG_VERSION_MAJOR="+semver_parts[0])
envVars = append(envVars, "CARGO_PKG_VERSION_MINOR="+semver_parts[1])
envVars = append(envVars, "CARGO_PKG_VERSION_PATCH="+semver_parts[2])
}
}
}