mirror of
https://github.com/EnumeratedDev/bpm.git
synced 2026-09-16 02:26:12 +00:00
Add 'runtime_depends' field to package info
This commit is contained in:
@@ -344,6 +344,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks, k
|
|||||||
pkgInfo.Arch = pkg.OutputArch
|
pkgInfo.Arch = pkg.OutputArch
|
||||||
pkgInfo.OutputArch = ""
|
pkgInfo.OutputArch = ""
|
||||||
|
|
||||||
|
// Add runtime dependencies to common dependencies
|
||||||
|
pkgInfo.Depends = removeDuplicates(append(pkgInfo.Depends, pkgInfo.RuntimeDepends...))
|
||||||
|
pkgInfo.RuntimeDepends = nil
|
||||||
|
|
||||||
// Remove split package and downloads fields
|
// Remove split package and downloads fields
|
||||||
pkgInfo.SplitPackages = nil
|
pkgInfo.SplitPackages = nil
|
||||||
pkgInfo.Downloads = nil
|
pkgInfo.Downloads = nil
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ type PackageInfo struct {
|
|||||||
Type string `yaml:"type,omitempty"`
|
Type string `yaml:"type,omitempty"`
|
||||||
Keep []string `yaml:"keep,omitempty"`
|
Keep []string `yaml:"keep,omitempty"`
|
||||||
Depends []string `yaml:"depends,omitempty"`
|
Depends []string `yaml:"depends,omitempty"`
|
||||||
|
RuntimeDepends []string `yaml:"runtime_depends,omitempty"`
|
||||||
OptionalDepends []string `yaml:"optional_depends,omitempty"`
|
OptionalDepends []string `yaml:"optional_depends,omitempty"`
|
||||||
MakeDepends []string `yaml:"make_depends,omitempty"`
|
MakeDepends []string `yaml:"make_depends,omitempty"`
|
||||||
Conflicts []string `yaml:"conflicts,omitempty"`
|
Conflicts []string `yaml:"conflicts,omitempty"`
|
||||||
@@ -457,6 +458,7 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) {
|
|||||||
OutputArch: GetArch(),
|
OutputArch: GetArch(),
|
||||||
Keep: make([]string, 0),
|
Keep: make([]string, 0),
|
||||||
Depends: make([]string, 0),
|
Depends: make([]string, 0),
|
||||||
|
RuntimeDepends: make([]string, 0),
|
||||||
MakeDepends: make([]string, 0),
|
MakeDepends: make([]string, 0),
|
||||||
OptionalDepends: make([]string, 0),
|
OptionalDepends: make([]string, 0),
|
||||||
Conflicts: make([]string, 0),
|
Conflicts: make([]string, 0),
|
||||||
@@ -562,6 +564,7 @@ func (pkgInfo *PackageInfo) CreateReadableInfo(rootDir string) string {
|
|||||||
ret = append(ret, "Type: "+pkgInfo.Type)
|
ret = append(ret, "Type: "+pkgInfo.Type)
|
||||||
appendArray("Dependencies", pkgInfo.Depends)
|
appendArray("Dependencies", pkgInfo.Depends)
|
||||||
if pkgInfo.Type == "source" {
|
if pkgInfo.Type == "source" {
|
||||||
|
appendArray("Runtime Dependencies", pkgInfo.RuntimeDepends)
|
||||||
appendArray("Make Dependencies", pkgInfo.MakeDepends)
|
appendArray("Make Dependencies", pkgInfo.MakeDepends)
|
||||||
}
|
}
|
||||||
appendArray("Optional dependencies", pkgInfo.OptionalDepends)
|
appendArray("Optional dependencies", pkgInfo.OptionalDepends)
|
||||||
|
|||||||
Reference in New Issue
Block a user