ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: Rename 'VERSION' to 'QEMU_VERSION'

This commit is contained in:
Matt Borgerson 2022-04-22 13:02:40 -07:00 committed by mborgerson
parent 8afd391ad0
commit 0891752dce
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -87,7 +87,7 @@ x := $(shell rm -rf meson-private meson-info meson-logs)
endif endif
# 1. ensure config-host.mak is up-to-date # 1. ensure config-host.mak is up-to-date
config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/QEMU_VERSION
@echo config-host.mak is out-of-date, running configure @echo config-host.mak is out-of-date, running configure
@if test -f meson-private/coredata.dat; then \ @if test -f meson-private/coredata.dat; then \
./config.status --skip-meson; \ ./config.status --skip-meson; \
@ -208,7 +208,7 @@ clean: recurse-clean
rm -f TAGS cscope.* *.pod *~ */*~ rm -f TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod rm -f fsdev/*.pod scsi/*.pod
VERSION = $(shell cat $(SRC_PATH)/VERSION) VERSION = $(shell cat $(SRC_PATH)/QEMU_VERSION)
dist: qemu-$(VERSION).tar.bz2 dist: qemu-$(VERSION).tar.bz2

0
VERSION → QEMU_VERSION
View File

6
configure vendored
View File

@ -844,7 +844,7 @@ for opt do
case "$opt" in case "$opt" in
--help|-h) show_help=yes --help|-h) show_help=yes
;; ;;
--version|-V) exec cat $source_path/VERSION --version|-V) exec cat $source_path/QEMU_VERSION
;; ;;
--prefix=*) prefix="$optarg" --prefix=*) prefix="$optarg"
;; ;;
@ -4489,7 +4489,7 @@ if test "$QEMU_GA_DISTRO" = ""; then
QEMU_GA_DISTRO=Linux QEMU_GA_DISTRO=Linux
fi fi
if test "$QEMU_GA_VERSION" = ""; then if test "$QEMU_GA_VERSION" = ""; then
QEMU_GA_VERSION=$(cat $source_path/VERSION) QEMU_GA_VERSION=$(cat $source_path/QEMU_VERSION)
fi fi
QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin" QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
@ -4680,7 +4680,7 @@ fi
if test "$xfs" = "yes" ; then if test "$xfs" = "yes" ; then
echo "CONFIG_XFS=y" >> $config_host_mak echo "CONFIG_XFS=y" >> $config_host_mak
fi fi
qemu_version=$(head $source_path/VERSION) qemu_version=$(head $source_path/QEMU_VERSION)
echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak

2
meson.build
View File

@ -1,7 +1,7 @@
project('qemu', ['c'], meson_version: '>=0.55.0', project('qemu', ['c'], meson_version: '>=0.55.0',
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=c++17', 'b_colorout=auto'] + default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=c++17', 'b_colorout=auto'] +
(meson.version().version_compare('>=0.56.0') ? [ 'b_staticpic=false' ] : []), (meson.version().version_compare('>=0.56.0') ? [ 'b_staticpic=false' ] : []),
version: run_command('head', meson.source_root() / 'VERSION').stdout().strip()) version: run_command('head', meson.source_root() / 'QEMU_VERSION').stdout().strip())
not_found = dependency('', required: false) not_found = dependency('', required: false)
if meson.version().version_compare('>=0.56.0') if meson.version().version_compare('>=0.56.0')