Skip to content

Commit

Permalink
fix verbose make
Browse files Browse the repository at this point in the history
  • Loading branch information
allaVolkov committed Feb 19, 2019
1 parent c526b15 commit 9442ec2
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion internal/proc/cores.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func OsCore() Proc {
osProcMap := map[string]Proc{
"linux": {`NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)`, `MAKEFLAGS += -j$(NPROCS)`},
"darwin": {`NPROCS = $(sysctl -n hw.ncpu)`, `MAKEFLAGS += -j$(NPROCS)`},
"windows": {`NPROCS = $(shell echo %NUMBER_OF_PROCESSORS%)`, `MAKEFLAGS += -j$(NPROCS)`},
"windows": {`NPROCS = $(shell echo %NUMBER_OF_PROCESSORS%)`, `MAKEFLAGS += -j`},
}
return osProcMap[runtime.GOOS]
}
2 changes: 1 addition & 1 deletion internal/proc/cores_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ import (

var _ = Describe("Proc", func() {
It("OsCore", func() {
Ω(OsCore().MAKEFLAGS).Should(Equal("MAKEFLAGS += -j$(NPROCS)"))
Ω(OsCore().MAKEFLAGS).Should(Equal("MAKEFLAGS += -j"))
})
})
2 changes: 1 addition & 1 deletion internal/tpl/base_pre_verbose.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tpl

// basePreVerbose - do not edit
var basePreVerbose = []byte{0x7b, 0x7b, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x22, 0x7d, 0x7d, 0xd, 0xa, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x7b, 0x7b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6b, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x7d, 0x7d, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x70, 0xd, 0xa, 0x24, 0x28, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x20, 0x69, 0x73, 0x20, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x20, 0x65, 0x2e, 0x67, 0x2e, 0x20, 0x75, 0x73, 0x65, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x20, 0x2d, 0x66, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x6d, 0x74, 0x61, 0x20, 0x70, 0x3d, 0x63, 0x66, 0x29, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x74, 0xd, 0xa, 0x74, 0x3d, 0x24, 0x28, 0x43, 0x55, 0x52, 0x44, 0x49, 0x52, 0x29, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0xd, 0xa, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x3d, 0x74, 0x72, 0x75, 0x65, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x23, 0x20, 0x44, 0x65, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x65, 0x20, 0x4f, 0x53, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x20, 0x4f, 0x73, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4e, 0x50, 0x52, 0x4f, 0x43, 0x53, 0x20, 0x20, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x20, 0x4f, 0x73, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4d, 0x41, 0x4b, 0x45, 0x46, 0x4c, 0x41, 0x47, 0x53, 0x20, 0x20, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x63, 0x69, 0x70, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0xd, 0xa, 0x2e, 0x50, 0x48, 0x4f, 0x4e, 0x59, 0x3a, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x20, 0x6d, 0x65, 0x74, 0x61, 0x20, 0x6d, 0x74, 0x61, 0x72, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0xd, 0xa, 0x23, 0x20, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0xd, 0xa, 0x61, 0x6c, 0x6c, 0x3a, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x20, 0x6d, 0x65, 0x74, 0x61, 0x20, 0x6d, 0x74, 0x61, 0x72, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0xd, 0xa, 0x23, 0x20, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x6d, 0x74, 0x61, 0x2e, 0x79, 0x61, 0x6d, 0x6c, 0xd, 0xa, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x3a, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x6d, 0x62, 0x74, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x2d, 0x64, 0x3d, 0x7b, 0x7b, 0x2e, 0x44, 0x65, 0x70, 0x7d, 0x7d, 0x20, 0x2d, 0x72, 0x3d, 0x24, 0x7b, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x53, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x6d, 0x74, 0x61, 0x20, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0xd, 0xa, 0x20, 0x20, 0x50, 0x52, 0x4f, 0x4a, 0x5f, 0x44, 0x49, 0x52, 0x20, 0x3a, 0x3d, 0x20, 0x24, 0x28, 0x43, 0x55, 0x52, 0x44, 0x49, 0x52, 0x29, 0xd, 0xa, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d}
var basePreVerbose = []byte{0x7b, 0x7b, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x22, 0x7d, 0x7d, 0xd, 0xa, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x7b, 0x7b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x6b, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x7d, 0x7d, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x70, 0xd, 0xa, 0x24, 0x28, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x20, 0x69, 0x73, 0x20, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x20, 0x65, 0x2e, 0x67, 0x2e, 0x20, 0x75, 0x73, 0x65, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x20, 0x2d, 0x66, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x6d, 0x74, 0x61, 0x20, 0x70, 0x3d, 0x63, 0x66, 0x29, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x74, 0xd, 0xa, 0x74, 0x3d, 0x22, 0x24, 0x28, 0x43, 0x55, 0x52, 0x44, 0x49, 0x52, 0x29, 0x22, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x69, 0x66, 0x6e, 0x64, 0x65, 0x66, 0x20, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0xd, 0xa, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x3d, 0x74, 0x72, 0x75, 0x65, 0xd, 0xa, 0x65, 0x6e, 0x64, 0x69, 0x66, 0xd, 0xa, 0x23, 0x20, 0x44, 0x65, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x65, 0x20, 0x4f, 0x53, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x20, 0x4f, 0x73, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4e, 0x50, 0x52, 0x4f, 0x43, 0x53, 0x20, 0x20, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x20, 0x4f, 0x73, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4d, 0x41, 0x4b, 0x45, 0x46, 0x4c, 0x41, 0x47, 0x53, 0x20, 0x20, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x63, 0x69, 0x70, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0xd, 0xa, 0x2e, 0x50, 0x48, 0x4f, 0x4e, 0x59, 0x3a, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x20, 0x6d, 0x65, 0x74, 0x61, 0x20, 0x6d, 0x74, 0x61, 0x72, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0xd, 0xa, 0x23, 0x20, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0xd, 0xa, 0x61, 0x6c, 0x6c, 0x3a, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x20, 0x6d, 0x65, 0x74, 0x61, 0x20, 0x6d, 0x74, 0x61, 0x72, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0xd, 0xa, 0x23, 0x20, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x6d, 0x74, 0x61, 0x2e, 0x79, 0x61, 0x6d, 0x6c, 0xd, 0xa, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x3a, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x6d, 0x62, 0x74, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x2d, 0x64, 0x3d, 0x7b, 0x7b, 0x2e, 0x44, 0x65, 0x70, 0x7d, 0x7d, 0x20, 0x2d, 0x72, 0x3d, 0x24, 0x7b, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x53, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x6d, 0x74, 0x61, 0x20, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0xd, 0xa, 0x20, 0x20, 0x50, 0x52, 0x4f, 0x4a, 0x5f, 0x44, 0x49, 0x52, 0x20, 0x3a, 0x3d, 0x20, 0x24, 0x28, 0x43, 0x55, 0x52, 0x44, 0x49, 0x52, 0x29, 0xd, 0xa, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d}
4 changes: 2 additions & 2 deletions internal/tpl/base_pre_verbose.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ifndef p
$(error platform flag is expected. e.g. use make -f makefile.mta p=cf)
endif
ifndef t
t=$(CURDIR)
t="$(CURDIR)"
endif
ifndef strict
strict=true
Expand All @@ -13,7 +13,7 @@ endif
{{ OsCore.NPROCS }}
{{ OsCore.MAKEFLAGS }}
# List of all the recipes to be executed during the build process
.PHONY: {{- range .File.Modules}} {{.Name}}{{end}} meta mtar cleanup
.PHONY: validate {{- range .File.Modules}} {{.Name}}{{end}} meta mtar cleanup
# Default target compile all
all: validate {{- range .File.Modules}} {{.Name}}{{end}} meta mtar cleanup
# Validate mta.yaml
Expand Down
2 changes: 1 addition & 1 deletion internal/tpl/make_verbose.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tpl

// makeVerbose - do not edit
var makeVerbose = []byte{0x7b, 0x7b, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x22, 0x20, 0x2e, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0xd, 0xa, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0xd, 0xa, 0x23, 0x20, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x3a, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x63, 0x64, 0x20, 0x24, 0x28, 0x50, 0x52, 0x4f, 0x4a, 0x5f, 0x44, 0x49, 0x52, 0x29, 0x2f, 0x7b, 0x7b, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x7d, 0x7d, 0x20, 0x26, 0x26, 0x20, 0x7b, 0x7b, 0x77, 0x69, 0x74, 0x68, 0x20, 0x24, 0x63, 0x6d, 0x64, 0x73, 0x20, 0x3a, 0x3d, 0x20, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x20, 0x2e, 0x7d, 0x7d, 0x7b, 0x7b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x24, 0x69, 0x2c, 0x20, 0x24, 0x63, 0x6d, 0x64, 0x3a, 0x3d, 0x24, 0x63, 0x6d, 0x64, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x69, 0x66, 0x20, 0x67, 0x74, 0x20, 0x24, 0x69, 0x20, 0x30, 0x20, 0x7d, 0x7d, 0x20, 0x26, 0x26, 0x20, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x2e, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x50, 0x61, 0x63, 0x6b, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x6d, 0x62, 0x74, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x63, 0x6b, 0x20, 0x2d, 0x6d, 0x3d, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x20, 0x2d, 0x70, 0x3d, 0x24, 0x7b, 0x70, 0x7d, 0x20, 0x2d, 0x74, 0x3d, 0x24, 0x7b, 0x74, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x22, 0x20, 0x2e, 0x7d, 0x7d}
var makeVerbose = []byte{0x7b, 0x7b, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x22, 0x20, 0x2e, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0xd, 0xa, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0xd, 0xa, 0x23, 0x20, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x2d, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x3a, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x63, 0x64, 0x20, 0x22, 0x24, 0x28, 0x50, 0x52, 0x4f, 0x4a, 0x5f, 0x44, 0x49, 0x52, 0x29, 0x2f, 0x7b, 0x7b, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x7d, 0x7d, 0x22, 0x20, 0x26, 0x26, 0x20, 0x7b, 0x7b, 0x77, 0x69, 0x74, 0x68, 0x20, 0x24, 0x63, 0x6d, 0x64, 0x73, 0x20, 0x3a, 0x3d, 0x20, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x20, 0x2e, 0x7d, 0x7d, 0x7b, 0x7b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x24, 0x69, 0x2c, 0x20, 0x24, 0x63, 0x6d, 0x64, 0x3a, 0x3d, 0x24, 0x63, 0x6d, 0x64, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x69, 0x66, 0x20, 0x67, 0x74, 0x20, 0x24, 0x69, 0x20, 0x30, 0x20, 0x7d, 0x7d, 0x20, 0x26, 0x26, 0x20, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x2e, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0x23, 0x20, 0x50, 0x61, 0x63, 0x6b, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x73, 0xd, 0xa, 0x7b, 0x7b, 0x22, 0x5c, 0x74, 0x22, 0x7d, 0x7d, 0x40, 0x6d, 0x62, 0x74, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x63, 0x6b, 0x20, 0x2d, 0x6d, 0x3d, 0x7b, 0x7b, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x7d, 0x7d, 0x20, 0x2d, 0x70, 0x3d, 0x24, 0x7b, 0x70, 0x7d, 0x20, 0x2d, 0x74, 0x3d, 0x24, 0x7b, 0x74, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x65, 0x6e, 0x64, 0x7d, 0x7d, 0xd, 0xa, 0x7b, 0x7b, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x22, 0x20, 0x2e, 0x7d, 0x7d}
2 changes: 1 addition & 1 deletion internal/tpl/make_verbose.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modules = {{- range .File.Modules}} {{.Name}}{{end}}
{{- range .File.Modules}}
# build module {{.Name}}
{{.Name}}:
{{"\t"}}@cd $(PROJ_DIR)/{{.Path}} && {{with $cmds := CommandProvider .}}{{range $i, $cmd:=$cmds.Command}}{{if gt $i 0 }} && {{end}}{{.}}{{end}}{{end}}
{{"\t"}}@cd "$(PROJ_DIR)/{{.Path}}" && {{with $cmds := CommandProvider .}}{{range $i, $cmd:=$cmds.Command}}{{if gt $i 0 }} && {{end}}{{.}}{{end}}{{end}}
# Pack module build artifacts
{{"\t"}}@mbt module pack -m={{.Name}} -p=${p} -t=${t}
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion internal/tpl/testdata/ExpectedMakeFileDepLinux
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)
MAKEFLAGS += -j$(NPROCS)
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down
2 changes: 1 addition & 1 deletion internal/tpl/testdata/ExpectedMakeFileDepMac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
NPROCS = $(sysctl -n hw.ncpu)
MAKEFLAGS += -j$(NPROCS)
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down
4 changes: 2 additions & 2 deletions internal/tpl/testdata/ExpectedMakeFileDepWindows
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ strict=true
endif
# Determine OS cores
NPROCS = $(shell echo %NUMBER_OF_PROCESSORS%)
MAKEFLAGS += -j$(NPROCS)
MAKEFLAGS += -j
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down
2 changes: 1 addition & 1 deletion internal/tpl/testdata/ExpectedMakeFileLinux
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)
MAKEFLAGS += -j$(NPROCS)
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down
2 changes: 1 addition & 1 deletion internal/tpl/testdata/ExpectedMakeFileMac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
NPROCS = $(sysctl -n hw.ncpu)
MAKEFLAGS += -j$(NPROCS)
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down
4 changes: 2 additions & 2 deletions internal/tpl/testdata/ExpectedMakeFileWindows
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ strict=true
endif
# Determine OS cores
NPROCS = $(shell echo %NUMBER_OF_PROCESSORS%)
MAKEFLAGS += -j$(NPROCS)
MAKEFLAGS += -j
# List of all the recipes to be executed during the build process
.PHONY: ui meta mtar cleanup
.PHONY: validate ui meta mtar cleanup
# Default target compile all
all: validate ui meta mtar cleanup
# Validate mta.yaml
Expand Down

0 comments on commit 9442ec2

Please sign in to comment.