forked from aliguori/qemu
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rules.mak: quiet-command: Split command name and args to print
The quiet-command make rule currently takes two arguments: the command and arguments to run, and a string to print if the V flag is not set (ie we are not being verbose). By convention, the string printed is of the form " NAME some args". Unfortunately to get nicely lined up output all the strings have to agree about what column the arguments should start in, which means that if we add a new quiet-command usage which wants a slightly longer CMD name then we either put up with misalignment or change every quiet-command string. Split the quiet-mode string into two, the "NAME" and the "same args" part, and use printf(1) to format the string automatically. This means we only need to change one place if we want to support a longer maximum name. In particular, we can now print 7-character names lined up properly (they are needed for the OSX "SETTOOL" invocation). Change all the uses of quiet-command to the new syntax. (Any which are missed or inadvertently reintroduced via later merges will result in slightly misformatted quiet output rather than disaster.) A few places in the pc-bios/ makefiles are updated to use "BUILD", "SIGN" and "STRIP" rather than "Building", "Signing" and "Stripping" for consistency and to keep them below 7 characters. Module .mo links now print "LD" rather than the nonstandard "LD -r". Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Eric Blake <[email protected]> Message-id: [email protected]
- Loading branch information
Showing
12 changed files
with
106 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -107,20 +107,20 @@ SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) | |
|
|
||
| ifeq ($(SUBDIR_DEVICES_MAK),) | ||
| config-all-devices.mak: | ||
| $(call quiet-command,echo '# no devices' > $@," GEN $@") | ||
| $(call quiet-command,echo '# no devices' > $@,"GEN","$@") | ||
| else | ||
| config-all-devices.mak: $(SUBDIR_DEVICES_MAK) | ||
| $(call quiet-command, sed -n \ | ||
| 's|^\([^=]*\)=\(.*\)$$|\1:=$$(findstring y,$$(\1)\2)|p' \ | ||
| $(SUBDIR_DEVICES_MAK) | sort -u > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| endif | ||
|
|
||
| -include $(SUBDIR_DEVICES_MAK_DEP) | ||
|
|
||
| %/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_device_config.sh | ||
| $(call quiet-command, \ | ||
| $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > [email protected], " GEN [email protected]") | ||
| $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > [email protected],"GEN","[email protected]") | ||
| $(call quiet-command, if test -f $@; then \ | ||
| if cmp -s [email protected] $@; then \ | ||
| mv [email protected] $@; \ | ||
|
|
@@ -137,7 +137,7 @@ endif | |
| else \ | ||
| mv [email protected] $@; \ | ||
| cp -p $@ [email protected]; \ | ||
| fi, " GEN $@"); | ||
| fi,"GEN","$@"); | ||
|
|
||
| defconfig: | ||
| rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) | ||
|
|
@@ -191,7 +191,7 @@ qemu-version.h: FORCE | |
| config-host.h: config-host.h-timestamp | ||
| config-host.h-timestamp: config-host.mak | ||
| qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") | ||
|
|
||
| SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) | ||
| SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) | ||
|
|
@@ -235,9 +235,9 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) | |
| recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) | ||
|
|
||
| $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h | $(BUILD_DIR)/version.lo | ||
| $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") | ||
| $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o") | ||
| $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc config-host.h | ||
| $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.lo") | ||
| $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.lo") | ||
|
|
||
| Makefile: $(version-obj-y) $(version-lobj-y) | ||
|
|
||
|
|
@@ -261,7 +261,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal | |
| fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap | ||
|
|
||
| qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") | ||
|
|
||
| qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) | ||
| qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated | ||
|
|
@@ -274,17 +274,17 @@ qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ | |
| $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ | ||
| $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ | ||
| $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ | ||
| $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\ | ||
| $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ | ||
| $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ | ||
| $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ | ||
|
|
@@ -296,27 +296,27 @@ qapi-types.c qapi-types.h :\ | |
| $(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ | ||
| $(gen-out-type) -o "." -b $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qapi-visit.c qapi-visit.h :\ | ||
| $(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ | ||
| $(gen-out-type) -o "." -b $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qapi-event.c qapi-event.h :\ | ||
| $(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \ | ||
| $(gen-out-type) -o "." $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qmp-commands.h qmp-marshal.c :\ | ||
| $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ | ||
| $(gen-out-type) -o "." $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qmp-introspect.h qmp-introspect.c :\ | ||
| $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) | ||
| $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-introspect.py \ | ||
| $(gen-out-type) -o "." $<, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) | ||
| $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) | ||
|
|
@@ -335,7 +335,7 @@ $(QEMU_GA_MSI): config-host.mak | |
|
|
||
| $(QEMU_GA_MSI): $(SRC_PATH)/qga/installer/qemu-ga.wxs | ||
| $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \ | ||
| wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<, " WIXL $@") | ||
| wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<,"WIXL","$@") | ||
| else | ||
| msi: | ||
| @echo "MSI build not configured or dependency resolution failed (reconfigure with --enable-guest-agent-msi option)" | ||
|
|
@@ -354,7 +354,7 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a | |
| module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak | ||
| $(call quiet-command,$(PYTHON) $< $@ \ | ||
| $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| clean: | ||
| # avoid old build problems by removing potentially incorrect old files | ||
|
|
@@ -521,13 +521,13 @@ ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclu | |
| @mkdir -p $(dir $@) | ||
| $(call quiet-command,\ | ||
| perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ | ||
| " VERT $@") | ||
| "VERT","$@") | ||
|
|
||
| ui/shader/%-frag.h: $(SRC_PATH)/ui/shader/%.frag $(SRC_PATH)/scripts/shaderinclude.pl | ||
| @mkdir -p $(dir $@) | ||
| $(call quiet-command,\ | ||
| perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ | ||
| " FRAG $@") | ||
| "FRAG","$@") | ||
|
|
||
| ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ | ||
| ui/shader/texture-blit-vert.h ui/shader/texture-blit-frag.h | ||
|
|
@@ -537,60 +537,60 @@ MAKEINFO=makeinfo | |
| MAKEINFOFLAGS=--no-headers --no-split --number-sections | ||
| TEXIFLAG=$(if $(V),,--quiet) | ||
| %.dvi: %.texi | ||
| $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@") | ||
| $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"GEN","$@") | ||
|
|
||
| %.html: %.texi | ||
| $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| %.info: %.texi | ||
| $(call quiet-command,$(MAKEINFO) $< -o $@," GEN $@") | ||
| $(call quiet-command,$(MAKEINFO) $< -o $@,"GEN","$@") | ||
|
|
||
| %.pdf: %.texi | ||
| $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") | ||
| $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"GEN","$@") | ||
|
|
||
| qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") | ||
|
|
||
| qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") | ||
|
|
||
| qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") | ||
|
|
||
| qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") | ||
| $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") | ||
|
|
||
| qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi | ||
| $(call quiet-command, \ | ||
| perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \ | ||
| $(POD2MAN) --section=1 --center=" " --release=" " qemu.pod > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
| qemu.1: qemu-option-trace.texi | ||
|
|
||
| qemu-img.1: qemu-img.texi qemu-option-trace.texi qemu-img-cmds.texi | ||
| $(call quiet-command, \ | ||
| perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \ | ||
| $(POD2MAN) --section=1 --center=" " --release=" " qemu-img.pod > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| fsdev/virtfs-proxy-helper.1: fsdev/virtfs-proxy-helper.texi | ||
| $(call quiet-command, \ | ||
| perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< fsdev/virtfs-proxy-helper.pod && \ | ||
| $(POD2MAN) --section=1 --center=" " --release=" " fsdev/virtfs-proxy-helper.pod > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| qemu-nbd.8: qemu-nbd.texi qemu-option-trace.texi | ||
| $(call quiet-command, \ | ||
| perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-nbd.pod && \ | ||
| $(POD2MAN) --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| qemu-ga.8: qemu-ga.texi | ||
| $(call quiet-command, \ | ||
| perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-ga.pod && \ | ||
| $(POD2MAN) --section=8 --center=" " --release=" " qemu-ga.pod > $@, \ | ||
| " GEN $@") | ||
| "GEN","$@") | ||
|
|
||
| dvi: qemu-doc.dvi qemu-tech.dvi | ||
| html: qemu-doc.html qemu-tech.html | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ all: | |
| .PHONY: all build clean install update | ||
|
|
||
| %.mo: %.po | ||
| $(call quiet-command, msgfmt -o $@ $<, " GEN $@") | ||
| $(call quiet-command, msgfmt -o $@ $<,"GEN","$@") | ||
|
|
||
| -include ../config-host.mak | ||
| include $(SRC_PATH)/rules.mak | ||
|
|
@@ -46,7 +46,7 @@ $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c | |
| xgettext -o - --from-code=UTF-8 --foreign-user \ | ||
| --package-name=QEMU --package-version=$(VERSION) \ | ||
| [email protected] -k_ -C ui/gtk.c | \ | ||
| sed -e s/CHARSET/UTF-8/) >$@, " GEN $@") | ||
| sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@") | ||
|
|
||
| $(PO_PATH)/%.po: $(PO_PATH)/messages.po | ||
| $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@, " GEN $@") | ||
| $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@") | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.