Commit c886edfb authored by Blue Swirl's avatar Blue Swirl
Browse files

Let users select their pythons 



Add configure check for python, exit if not found. Add switches
for specifying the path to python, use the path in Makefile.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 0caf448b

Makefile

+6 −6
Original line number Diff line number Diff line
@@ -168,22 +168,22 @@ test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-di 


$(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h

$(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py

	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")

$(qapi-dir)/test-qapi-visit.c: $(qapi-dir)/test-qapi-visit.h

$(qapi-dir)/test-qapi-visit.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py

	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")

$(qapi-dir)/test-qmp-commands.h: $(qapi-dir)/test-qmp-marshal.c

$(qapi-dir)/test-qmp-marshal.c: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py

	    $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")

	    $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")



$(qapi-dir)/qga-qapi-types.c: $(qapi-dir)/qga-qapi-types.h

$(qapi-dir)/qga-qapi-types.h: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py

	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")

$(qapi-dir)/qga-qapi-visit.c: $(qapi-dir)/qga-qapi-visit.h

$(qapi-dir)/qga-qapi-visit.h: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py

	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")

$(qapi-dir)/qga-qmp-marshal.c: $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py

	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")



test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)

test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o

configure

+13 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ fi 


: ${make=${MAKE-make}}

: ${install=${INSTALL-install}}

: ${python=${PYTHON-python}}



if test "$mingw32" = "yes" ; then

  EXESUF=".exe"
@@ -516,6 +517,8 @@ for opt do 
  ;;

  --install=*) install="$optarg"

  ;;

  --python=*) python="$optarg"

  ;;

  --extra-cflags=*)

  ;;

  --extra-ldflags=*)
@@ -924,6 +927,7 @@ echo " --extra-cflags=CFLAGS append extra C compiler flags QEMU_CFLAGS" 
echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"

echo "  --make=MAKE              use specified make [$make]"

echo "  --install=INSTALL        use specified install [$install]"

echo "  --python=PYTHON          use specified python [$python]"

echo "  --static                 enable static build [$static]"

echo "  --mandir=PATH            install man pages in PATH"

echo "  --datadir=PATH           install firmware in PATH"
@@ -1084,6 +1088,13 @@ if test "$solaris" = "yes" ; then 
  fi

fi



if has $python; then

  :

else

  echo "Python not found. Use --python=/path/to/python"

  exit 1

fi



if test -z "$target_list" ; then

    target_list="$default_target_list"

else
@@ -2591,6 +2602,7 @@ echo "QEMU_CFLAGS $QEMU_CFLAGS" 
echo "LDFLAGS           $LDFLAGS"

echo "make              $make"

echo "install           $install"

echo "python            $python"

echo "host CPU          $cpu"

echo "host big endian   $bigendian"

echo "target list       $target_list"
@@ -3003,6 +3015,7 @@ echo "INSTALL=$install" >> $config_host_mak 
echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak

echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak

echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak

echo "PYTHON=$python" >> $config_host_mak

echo "CC=$cc" >> $config_host_mak

echo "CC_I386=$cc_i386" >> $config_host_mak

echo "HOST_CC=$host_cc" >> $config_host_mak