Merge "Check for errors in preparer.sh" into main
This commit is contained in:
@@ -240,10 +240,14 @@ func (p *PackagingBase) GatherPackagingSpecs(ctx ModuleContext) map[string]Packa
|
|||||||
// CopySpecsToDir is a helper that will add commands to the rule builder to copy the PackagingSpec
|
// CopySpecsToDir is a helper that will add commands to the rule builder to copy the PackagingSpec
|
||||||
// entries into the specified directory.
|
// entries into the specified directory.
|
||||||
func (p *PackagingBase) CopySpecsToDir(ctx ModuleContext, builder *RuleBuilder, specs map[string]PackagingSpec, dir WritablePath) (entries []string) {
|
func (p *PackagingBase) CopySpecsToDir(ctx ModuleContext, builder *RuleBuilder, specs map[string]PackagingSpec, dir WritablePath) (entries []string) {
|
||||||
|
if len(specs) == 0 {
|
||||||
|
return entries
|
||||||
|
}
|
||||||
seenDir := make(map[string]bool)
|
seenDir := make(map[string]bool)
|
||||||
preparerPath := PathForModuleOut(ctx, "preparer.sh")
|
preparerPath := PathForModuleOut(ctx, "preparer.sh")
|
||||||
cmd := builder.Command().Tool(preparerPath)
|
cmd := builder.Command().Tool(preparerPath)
|
||||||
var sb strings.Builder
|
var sb strings.Builder
|
||||||
|
sb.WriteString("set -e\n")
|
||||||
for _, k := range SortedKeys(specs) {
|
for _, k := range SortedKeys(specs) {
|
||||||
ps := specs[k]
|
ps := specs[k]
|
||||||
destPath := filepath.Join(dir.String(), ps.relPathInPackage)
|
destPath := filepath.Join(dir.String(), ps.relPathInPackage)
|
||||||
|
Reference in New Issue
Block a user