tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move microfactory main.main() to microfactory.bash

Browse source 
package renaming and addition of func main() both done in the same place for clarity

Test: m nothing
Bug: N/A
Change-Id: Icc7d18033fe6049001007fb35271335f19395b8a
This commit is contained in:
Usta Shrestha 2022-08-09 13:01:45 -04:00
parent ab1bac0e12
commit d5b704c089
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
microfactory/microfactory.bash
View file

@ -51,6 +51,7 @@ function build_go
local gen_src_dir="${BUILDDIR}/.microfactory_$(uname)_intermediates/src" local gen_src_dir="${BUILDDIR}/.microfactory_$(uname)_intermediates/src"
mkdir -p "${gen_src_dir}" mkdir -p "${gen_src_dir}"
sed "s/^package microfactory/package main/" "${mf_src}/microfactory.go" >"${gen_src_dir}/microfactory.go" sed "s/^package microfactory/package main/" "${mf_src}/microfactory.go" >"${gen_src_dir}/microfactory.go"
printf "\n//for use with go run\nfunc main() { Main() }\n" >>"${gen_src_dir}/microfactory.go"
mf_cmd="${GOROOT}/bin/go run ${gen_src_dir}/microfactory.go" mf_cmd="${GOROOT}/bin/go run ${gen_src_dir}/microfactory.go"
else else

2
microfactory/microfactory.go
View file

@ -617,8 +617,6 @@ func rebuildMicrofactory(config *Config, mybin string) bool {
return true return true
} }
// microfactory.bash will make a copy of this file renamed into the main package for use with `go run`
func main() { Main() }
func Main() { func Main() {
var output, mybin string var output, mybin string
var config Config var config Config