On 02/04/2016 07:55 AM, Peter Maydell wrote: > On 4 February 2016 at 14:39, Lluís Vilanova <vilan...@ac.upc.edu> wrote: >> Dynamically detects the files used to generate QAPI code, thus ensuring >> it's never out of sync with the sources. >> >> Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu> >> --- >> Makefile | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index d0de2d4..627f772 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -269,10 +269,8 @@ $(SRC_PATH)/qga/qapi-schema.json >> $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) >> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \ >> " GEN $@") >> >> -qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ >> - $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json >> \ >> - $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json >> \ >> - $(SRC_PATH)/qapi/crypto.json >> +qapi-modules = $(SRC_PATH)/qapi-schema.json >> +qapi-modules += $(shell find $(SRC_PATH)/qapi -name "*.json") > > All the .json files are in the same directory, so I don't think we should > need to use find here. Does > > qapi-modules += $(wildcard $(SRC_PATH)/qapi/*.json)) > > work ?
Does this wildcard affect what goes into a tarball? I'm worried that we may run the risk of a stale .json file on one developer's machine causing an unreproducible build on other machines where the file is not found; explicit lists tend to be safer than wildcards. I won't reject the patch if others like it, but I won't approve it myself. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
