diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/argparse.py | 2 | ||||
| -rwxr-xr-x | scripts/git-submodule.sh | 2 | ||||
| -rwxr-xr-x | scripts/make-release | 5 | ||||
| -rw-r--r-- | scripts/qapi-commands.py | 6 | ||||
| -rw-r--r-- | scripts/qapi-event.py | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/scripts/argparse.py b/scripts/argparse.py index 288c1f06c0..27d1f28935 100644 --- a/scripts/argparse.py +++ b/scripts/argparse.py @@ -76,7 +76,7 @@ considered public as object names -- the API of the formatter objects is still considered an implementation detail.) """ -__version__ = '1.4.0' # we use our own version number independant of the +__version__ = '1.4.0' # we use our own version number independent of the # one in stdlib and we release this on pypi. __external_lib__ = True # to make sure the tests really test THIS lib, diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index bc7224a27f..807ca0b4f8 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -28,7 +28,7 @@ error() { echo echo "and then manually update submodules prior to running make, with:" echo - echo " $ scripts/git-sbumodule.sh update $modules" + echo " $ scripts/git-submodule.sh update $modules" echo exit 1 } diff --git a/scripts/make-release b/scripts/make-release index 3917df7142..04fa9defdc 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -19,11 +19,10 @@ pushd ${destination} git checkout "v${version}" git submodule update --init (cd roms/seabios && git describe --tags --long --dirty > .version) -rm -rf .git roms/*/.git dtc/.git pixman/.git # FIXME: The following line is a workaround for avoiding filename collisions # when unpacking u-boot sources on case-insensitive filesystems. Once we # update to something with u-boot commit 610eec7f0 we can drop this line. -tar cfj roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot +tar --exclude=.git -cjf roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot popd -tar cfj ${destination}.tar.bz2 ${destination} +tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination} rm -rf ${destination} diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 974d0a4a80..f89d748ba4 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -289,14 +289,16 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" -#include "qapi/qmp/types.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/error.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" #include "%(prefix)sqmp-commands.h" @@ -306,9 +308,7 @@ fdef.write(mcgen(''' fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" -#include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" -#include "qapi/error.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 07b4b70199..c710968dc2 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -209,6 +209,8 @@ fdef.write(mcgen(''' #include "qemu-common.h" #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp-event.h" @@ -216,9 +218,7 @@ fdef.write(mcgen(''' prefix=prefix)) fdecl.write(mcgen(''' -#include "qapi/error.h" #include "qapi/util.h" -#include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h" ''', |