Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7321b098 authored by Cole Faust's avatar Cole Faust
Browse files

Improve error message when a required makefile can't be found 

Bug: 193566316
Test: go test
Change-Id: I41a28808c95df76f212980ef1e59047312fe587b
parent f7ed5343

mk2rbc/mk2rbc_test.go

+4 −4
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ def init(g, handle): 
  }.get("vendor/%s/cfg.mk" % g["MY_PATH"])

  (_varmod, _varmod_init) = _entry if _entry else (None, None)

  if not _varmod_init:

    rblf.mkerror("cannot")

    rblf.mkerror("product.mk", "Cannot find %s" % ("vendor/%s/cfg.mk" % g["MY_PATH"]))

  rblf.inherit(handle, _varmod, _varmod_init)

`,

	},
@@ -1073,7 +1073,7 @@ def init(g, handle): 
  }.get("%s/cfg.mk" % g["MY_PATH"])

  (_varmod, _varmod_init) = _entry if _entry else (None, None)

  if not _varmod_init:

    rblf.mkerror("cannot")

    rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))

  rblf.inherit(handle, _varmod, _varmod_init)

`,

	},
@@ -1099,7 +1099,7 @@ def init(g, handle): 
  }.get("%s/cfg.mk" % g["MY_PATH"])

  (_varmod, _varmod_init) = _entry if _entry else (None, None)

  if not _varmod_init:

    rblf.mkerror("cannot")

    rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))

  rblf.inherit(handle, _varmod, _varmod_init)

  #RBC# include_top vendor/foo1

  _entry = {
@@ -1107,7 +1107,7 @@ def init(g, handle): 
  }.get("%s/cfg.mk" % g["MY_PATH"])

  (_varmod, _varmod_init) = _entry if _entry else (None, None)

  if not _varmod_init:

    rblf.mkerror("cannot")

    rblf.mkerror("product.mk", "Cannot find %s" % ("%s/cfg.mk" % g["MY_PATH"]))

  rblf.inherit(handle, _varmod, _varmod_init)

`,

	},

mk2rbc/node.go

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ func (i inheritedDynamicModule) emitSelect(gctx *generationContext) { 
		gctx.writef("if not %s:", i.entryName())

		gctx.indentLevel++

		gctx.newLine()

		gctx.write(`rblf.mkerror("cannot")`)

		gctx.write(`rblf.mkerror("`, gctx.starScript.mkFile, `", "Cannot find %s" % (`)

		i.path.emit(gctx)

		gctx.write("))")

		gctx.indentLevel--

	}

}