Remove autotools, replace with distutils-extra

Despite being a known quantity, autotools is so overkill for our needs,
so let's drop it and replace it with a much simpler and easy to customize
system.
This commit is contained in:
Cole Robinson 2013-03-16 21:32:29 -04:00
parent b1bfc7ab85
commit 9d05583c26
182 changed files with 1677 additions and 5878 deletions

38
.gitignore vendored
View File

@ -1,40 +1,12 @@
*~
*.pyc
.tstamp*
*.gmo
/po/POTFILES
/po/.*
/po/stamp-it
/po/Rules-quot
/po/boldquot.sed
/po/en@boldquot.header
/po/en@quot.header
/po/insert-header.sin
/po/quot.sed
/po/remove-potcdate.sin
/po/Makevars.template
Makefile
Makefile.in*
/build/
/build-aux/
/autom4te.cache/
/aclocal.m4
/configure
/config.log
/config.status
/intltool-merge.in
/intltool-extract.in
/intltool-update.in
/MANIFEST
/virt-manager
/virt-manager-tui
/man/virt-manager.1
/virt-manager.spec
/src/virt-manager
/src/virt-manager.py
/src/virt-manager.schemas
/src/virt-manager-launch
/src/virt-manager.service
/src/virt-manager-tui
/src/virt-manager-tui.py
/src/virt-manager.desktop
/virtcli/cli.cfg

View File

@ -1,7 +0,0 @@
Please see http://git.fedorahosted.org/git/?p=virt-manager.git;a=shortlog
Or directly from a git checkout:
git clone git://git.fedorahosted.org/virt-manager.git
cd virt-manager
git log

View File

@ -1,15 +0,0 @@
SUBDIRS = src icons man po tests
EXTRA_DIST = @PACKAGE@.spec HACKING \
intltool-extract.in intltool-merge.in intltool-update.in
DISTCLEAN_FILES = @PACKAGE@.spec intltool-extract intltool-merge intltool-update
rpm: clean
$(MAKE) dist && rpmbuild -ta $(distdir).tar.gz
srpm: clean
$(MAKE) dist && rpmbuild -ts $(distdir).tar.gz
check-pylint:
@tests/pylint-virt-manager.sh

13
README
View File

@ -102,5 +102,16 @@ Copyright / License
Unless otherwise noted, all the code for the Virtual Machine Manager
is covered under the GPL, and Copyright (C) Red Hat.
-- End of broadcast!
Notes on translation process
============================
The translations for virt-manager are handled via transifex.net.
To pull in the latest translations requires the transifex-client package:
tx pull
make update-po
Translators can easily sign up to contribute:
http://help.transifex.net/

View File

@ -1,17 +0,0 @@
#!/bin/sh
set -e
set -x
# Remove config.status, so rerunning autogen.sh regenerates everything
rm -f config.status
# Touch this to work around gettext issues following intltool I18N-HOWTO:
# http://lists.gnu.org/archive/html/bug-gettext/2011-10/msg00012.html
mkdir -p build-aux/m4
touch build-aux/config.rpath
autoreconf --force --install --verbose
intltoolize --force --copy --automake
./configure "$@"

View File

@ -1,164 +0,0 @@
AC_INIT(virt-manager, 0.9.5)
# Latest virtinst version required to run
VIRTINST_VERSION="0.600.4"
AC_CONFIG_SRCDIR(src/virt-manager.py.in)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE([enable])
ALL_LINGUAS="as bg bn_IN bs ca cs da de es fi fr gu hi hr hu is it ja kn ko ml mr ms nb nl or pa pl pt_BR pt ro ru sr@latin sr sv ta te tr uk zh_CN zh_TW"
IT_PROG_INTLTOOL([0.35.0], [no-xml])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=virt-manager
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
"$GETTEXT_PACKAGE",
[GETTEXT package name])
dnl ---------------
dnl Option handling
dnl ---------------
dnl Install TUI
AC_ARG_WITH([tui],
AC_HELP_STRING(
[--with-tui],
[install virt-manager command line interface @<:@default=yes@:>@]),
[],
[with_tui=yes])
dnl Default QEMU user
AC_ARG_WITH([qemu-user],
AC_HELP_STRING(
[--with-qemu-user],
[user libvirt uses to launch qemu processes @<:@default=root@:>@]),
[DEFAULT_QEMU_USER=$withval],
[DEFAULT_QEMU_USER="root"])
dnl Distro libvirt package name
AC_ARG_WITH([libvirt-package-names],
AC_HELP_STRING(
[--with-libvirt-package-names],
[name of libvirt distro packages virt-manager will check for on first run @<:@default=none@:>@]),
[LIBVIRT_PACKAGES=$withval],
[LIBVIRT_PACKAGES=""])
dnl Recommended HV packages
AC_ARG_WITH([kvm-packages],
AC_HELP_STRING(
[--with-kvm-packages],
[recommended kvm packages virt-manager will check for on first run @<:@default=none@:>@]),
[KVM_PACKAGES=$withval],
[KVM_PACKAGES=""])
dnl askpass package name
AC_ARG_WITH([askpass-package],
AC_HELP_STRING(
[--with-askpass-package],
[name of your distros openssh askpass package@<:@default=none@:>@]),
[ASKPASS_PACKAGE=$withval],
[ASKPASS_PACKAGE=""])
dnl Don't list options that rhel doesn't support
AC_ARG_ENABLE([unsupported-rhel-options],
AC_HELP_STRING(
[--enable-unsupported-rhel-options],
[enable VM config options unsupported by RHEL @<:@default=yes@:>@]),
[test "x$enableval" == "xno" && \
ENABLE_UNSUPPORTED_RHEL_OPTS=0 ||
ENABLE_UNSUPPORTED_RHEL_OPTS=1],
[ENABLE_UNSUPPORTED_RHEL_OPTS=1])
dnl Allow passing in a prefered distro list
AC_ARG_WITH([preferred-distros],
AC_HELP_STRING(
[--with-preferred-distros],
[Distros to list first in New VM wizard @<:@default=none@:>@]),
[PREFERRED_DISTROS=$withval],
[PREFERRED_DISTROS=""])
dnl Default graphics type (spice/vnc)
AC_ARG_WITH([default-graphics],
AC_HELP_STRING(
[--with-default-graphics],
[default graphics type for new guests in gconf(spice or vnc) @<:@default=vnc@:>@]),
[DEFAULT_GRAPHICS=$withval],
[DEFAULT_GRAPHICS="vnc"])
dnl -----------------------
dnl Variable substitution
dnl -----------------------
AC_SUBST([VIRTINST_VERSION])
AC_SUBST([DEFAULT_QEMU_USER])
AC_SUBST([ENABLE_UNSUPPORTED_RHEL_OPTS])
AC_SUBST([PREFERRED_DISTROS])
AC_SUBST([LIBVIRT_PACKAGES])
AC_SUBST([KVM_PACKAGES])
AC_SUBST([ASKPASS_PACKAGE])
AC_SUBST([DEFAULT_GRAPHICS])
AM_CONDITIONAL([INSTALL_TUI], [test "x$with_tui" = "xyes"])
AC_OUTPUT(Makefile
po/Makefile.in
src/Makefile
src/virtManager/Makefile
src/virtManagerTui/Makefile
src/virtManagerTui/importblacklist/Makefile
man/Makefile
tests/Makefile
virt-manager.spec
icons/Makefile
icons/hicolor/Makefile
icons/hicolor/16x16/Makefile
icons/hicolor/22x22/Makefile
icons/hicolor/24x24/Makefile
icons/hicolor/32x32/Makefile
icons/hicolor/48x48/Makefile
icons/hicolor/256x256/Makefile
)
AC_MSG_NOTICE([])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Required virtinst: $VIRTINST_VERSION])
AC_MSG_NOTICE([Default qemu user: $DEFAULT_QEMU_USER])
if test "x$with_tui" = "xyes" ; then
AC_MSG_NOTICE([Install TUI: yes])
else
AC_MSG_NOTICE([Install TUI: no])
fi
if test "x$ENABLE_UNSUPPORTED_RHEL_OPTS" = "x1" ; then
AC_MSG_NOTICE([Enable unsupported RHEL options: yes])
else
AC_MSG_NOTICE([Enable unsupported RHEL options: no])
fi
if test "x$PREFERRED_DISTROS" = "x" ; then
AC_MSG_NOTICE([Preferred distros: none])
else
AC_MSG_NOTICE([Preferred distros: $PREFERRED_DISTROS])
fi
if test "x$LIBVIRT_PACKAGES" = "x" ; then
AC_MSG_NOTICE([Libvirt packages: none])
else
AC_MSG_NOTICE([Libvirt Packages: $LIBVIRT_PACKAGES])
fi
if test "x$KVM_PACKAGES" = "x" ; then
AC_MSG_NOTICE([KVM packages: none])
else
AC_MSG_NOTICE([KVM packages: $KVM_PACKAGES])
fi
if test "x$ASKPASS_PACKAGE" = "x" ; then
AC_MSG_NOTICE([askpass package: none])
else
AC_MSG_NOTICE([askpass package: $ASKPASS_PACKAGE])
fi
AC_MSG_NOTICE([Default graphics: $DEFAULT_GRAPHICS])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([])

View File

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 570 B

View File

Before

Width:  |  Height:  |  Size: 702 B

After

Width:  |  Height:  |  Size: 702 B

View File

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 932 B

View File

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 716 B

View File

Before

Width:  |  Height:  |  Size: 915 B

After

Width:  |  Height:  |  Size: 915 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 783 B

View File

Before

Width:  |  Height:  |  Size: 945 B

After

Width:  |  Height:  |  Size: 945 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 742 B

After

Width:  |  Height:  |  Size: 742 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 921 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 828 B

After

Width:  |  Height:  |  Size: 828 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -1,8 +1,8 @@
[Desktop Entry]
_Name=Virtual Machine Manager
_Comment=Manage virtual machines
Icon=::PACKAGE::
Exec=::PACKAGE::
Icon=virt-manager
Exec=virt-manager
Type=Application
Terminal=false
Categories=System;

View File

@ -1,9 +1,9 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/::PACKAGE::/vmlist-fields/disk_usage</key>
<applyto>/apps/::PACKAGE::/vmlist-fields/disk_usage</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/vmlist-fields/disk_usage</key>
<applyto>/apps/virt-manager/vmlist-fields/disk_usage</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -14,9 +14,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/vmlist-fields/network_traffic</key>
<applyto>/apps/::PACKAGE::/vmlist-fields/network_traffic</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/vmlist-fields/network_traffic</key>
<applyto>/apps/virt-manager/vmlist-fields/network_traffic</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -27,9 +27,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/vmlist-fields/cpu_usage</key>
<applyto>/apps/::PACKAGE::/vmlist-fields/cpu_usage</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/vmlist-fields/cpu_usage</key>
<applyto>/apps/virt-manager/vmlist-fields/cpu_usage</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -40,9 +40,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/vmlist-fields/host_cpu_usage</key>
<applyto>/apps/::PACKAGE::/vmlist-fields/host_cpu_usage</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/vmlist-fields/host_cpu_usage</key>
<applyto>/apps/virt-manager/vmlist-fields/host_cpu_usage</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -53,9 +53,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/stats/update-interval</key>
<applyto>/apps/::PACKAGE::/stats/update-interval</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/stats/update-interval</key>
<applyto>/apps/virt-manager/stats/update-interval</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>1</default>
@ -66,9 +66,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/stats/history-length</key>
<applyto>/apps/::PACKAGE::/stats/history-length</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/stats/history-length</key>
<applyto>/apps/virt-manager/stats/history-length</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>120</default>
@ -79,9 +79,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/stats/enable-disk-poll</key>
<applyto>/apps/::PACKAGE::/stats/enable-disk-poll</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/stats/enable-disk-poll</key>
<applyto>/apps/virt-manager/stats/enable-disk-poll</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -92,9 +92,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/stats/enable-net-poll</key>
<applyto>/apps/::PACKAGE::/stats/enable-net-poll</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/stats/enable-net-poll</key>
<applyto>/apps/virt-manager/stats/enable-net-poll</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -105,9 +105,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/urls/url-list-length</key>
<applyto>/apps/::PACKAGE::/urls/url-list-length</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/urls/url-list-length</key>
<applyto>/apps/virt-manager/urls/url-list-length</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>10</default>
@ -118,9 +118,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/console/enable-accels</key>
<applyto>/apps/::PACKAGE::/console/enable-accels</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/console/enable-accels</key>
<applyto>/apps/virt-manager/console/enable-accels</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>false</default>
@ -131,9 +131,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/console/scaling</key>
<applyto>/apps/::PACKAGE::/console/scaling</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/console/scaling</key>
<applyto>/apps/virt-manager/console/scaling</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>1</default>
@ -144,9 +144,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/details/show-toolbar</key>
<applyto>/apps/::PACKAGE::/details/show-toolbar</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/details/show-toolbar</key>
<applyto>/apps/virt-manager/details/show-toolbar</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -157,9 +157,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/new-vm/local-sound</key>
<applyto>/apps/::PACKAGE::/new-vm/local-sound</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/new-vm/local-sound</key>
<applyto>/apps/virt-manager/new-vm/local-sound</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -170,9 +170,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/new-vm/remote-sound</key>
<applyto>/apps/::PACKAGE::/new-vm/remote-sound</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/new-vm/remote-sound</key>
<applyto>/apps/virt-manager/new-vm/remote-sound</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -183,22 +183,22 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/new-vm/graphics_type</key>
<applyto>/apps/::PACKAGE::/new-vm/graphics_type</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/new-vm/graphics_type</key>
<applyto>/apps/virt-manager/new-vm/graphics_type</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default>::DEFAULT_GRAPHICS::</default>
<default>system</default>
<locale name="C">
<short>Install selected graphics type for new VM</short>
<long>Install selected graphics type for new VM. vnc or spice</long>
<long>Install selected graphics type for new VM. vnc or spice, system for software configured default</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/new-vm/storage-format</key>
<applyto>/apps/::PACKAGE::/new-vm/storage-format</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/new-vm/storage-format</key>
<applyto>/apps/virt-manager/new-vm/storage-format</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default>default</default>
@ -209,9 +209,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/system-tray</key>
<applyto>/apps/::PACKAGE::/system-tray</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/system-tray</key>
<applyto>/apps/virt-manager/system-tray</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -222,9 +222,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/paths/default-image-path</key>
<applyto>/apps/::PACKAGE::/paths/default-image-path</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/paths/default-image-path</key>
<applyto>/apps/virt-manager/paths/default-image-path</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default></default>
@ -235,9 +235,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/paths/default-media-path</key>
<applyto>/apps/::PACKAGE::/paths/default-media-path</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/paths/default-media-path</key>
<applyto>/apps/virt-manager/paths/default-media-path</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default></default>
@ -248,9 +248,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/paths/default-save-path</key>
<applyto>/apps/::PACKAGE::/paths/default-save-path</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/paths/default-save-path</key>
<applyto>/apps/virt-manager/paths/default-save-path</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default></default>
@ -261,9 +261,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/paths/default-restore-path</key>
<applyto>/apps/::PACKAGE::/paths/default-restore-path</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/paths/default-restore-path</key>
<applyto>/apps/virt-manager/paths/default-restore-path</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default></default>
@ -274,9 +274,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/paths/default-screenshot-path</key>
<applyto>/apps/::PACKAGE::/paths/default-screenshot-path</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/paths/default-screenshot-path</key>
<applyto>/apps/virt-manager/paths/default-screenshot-path</applyto>
<owner>virt-manager</owner>
<type>string</type>
<default></default>
@ -287,9 +287,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/forcepoweroff</key>
<applyto>/apps/::PACKAGE::/confirm/forcepoweroff</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/forcepoweroff</key>
<applyto>/apps/virt-manager/confirm/forcepoweroff</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -300,9 +300,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/poweroff</key>
<applyto>/apps/::PACKAGE::/confirm/poweroff</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/poweroff</key>
<applyto>/apps/virt-manager/confirm/poweroff</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -313,9 +313,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/pause</key>
<applyto>/apps/::PACKAGE::/confirm/pause</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/pause</key>
<applyto>/apps/virt-manager/confirm/pause</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>0</default>
@ -326,9 +326,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/removedev</key>
<applyto>/apps/::PACKAGE::/confirm/removedev</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/removedev</key>
<applyto>/apps/virt-manager/confirm/removedev</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -339,9 +339,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/interface_power</key>
<applyto>/apps/::PACKAGE::/confirm/interface_power</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/interface_power</key>
<applyto>/apps/virt-manager/confirm/interface_power</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -352,9 +352,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/unapplied_dev</key>
<applyto>/apps/::PACKAGE::/confirm/unapplied_dev</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/unapplied_dev</key>
<applyto>/apps/virt-manager/confirm/unapplied_dev</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -365,9 +365,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/confirm/delete_storage</key>
<applyto>/apps/::PACKAGE::/confirm/delete_storage</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/confirm/delete_storage</key>
<applyto>/apps/virt-manager/confirm/delete_storage</applyto>
<owner>virt-manager</owner>
<type>bool</type>
<default>1</default>
@ -378,9 +378,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/manager_window_height</key>
<applyto>/apps/::PACKAGE::/manager_window_height</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/manager_window_height</key>
<applyto>/apps/virt-manager/manager_window_height</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>0</default>
@ -391,9 +391,9 @@
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/manager_window_width</key>
<applyto>/apps/::PACKAGE::/manager_window_width</applyto>
<owner>::PACKAGE::</owner>
<key>/schemas/apps/virt-manager/manager_window_width</key>
<applyto>/apps/virt-manager/manager_window_width</applyto>
<owner>virt-manager</owner>
<type>int</type>
<default>0</default>

View File

@ -1,6 +0,0 @@
SUBDIRS = hicolor
pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = $(wildcard $(srcdir)/*.png) $(wildcard $(srcdir)/*.svg)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,8 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)

View File

@ -1,11 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
devicesiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/devices
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
dist_devicesicons_DATA = \
$(wildcard $(srcdir)/devices/*.png)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/apps
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,8 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/apps
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,5 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/256x256/apps
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,11 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
statusiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/status
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)
dist_statusicons_DATA = \
$(wildcard $(srcdir)/status/*.png)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/apps
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/status
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1,8 +0,0 @@
size = $(notdir $(PWD))
appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
actionsiconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
dist_appicons_DATA = \
$(wildcard $(srcdir)/apps/*.png)
dist_actionsicons_DATA = \
$(wildcard $(srcdir)/actions/*.png)

View File

@ -1,5 +0,0 @@
pixmapdir = $(pkgdatadir)/pixmaps/hicolor/48x48/apps
pixmap_DATA = $(wildcard $(srcdir)/*.png)
EXTRA_DIST = $(pixmap_DATA)

View File

@ -1 +0,0 @@
SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256

View File

@ -1,9 +0,0 @@
man_MANS = virt-manager.1
EXTRA_DIST = virt-manager.pod
%.1: %.pod
pod2man --release="" --center="Virtual Machine Manager" $< > $@
CLEANFILES = virt-manager.1

View File

@ -1,41 +0,0 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
DATADIRNAME = $(DOMAIN)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = Free Software Foundation, Inc.
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
# in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
# understood.
# - Strings which make invalid assumptions about notation of date, time or
# money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS =
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =

View File

@ -1,63 +1,64 @@
src/virt-manager.desktop.in.in
src/virt-manager.py.in
src/virt-manager.schemas.in
virt-manager.py
virt-manager-tui.py
src/virtManager/__init__.py
src/virtManager/about.py
src/virtManager/addhardware.py
src/virtManager/asyncjob.py
src/virtManager/choosecd.py
src/virtManager/clone.py
src/virtManager/config.py
src/virtManager/connect.py
src/virtManager/connection.py
src/virtManager/connectauth.py
src/virtManager/console.py
src/virtManager/create.py
src/virtManager/createinterface.py
src/virtManager/createnet.py
src/virtManager/createpool.py
src/virtManager/createvol.py
src/virtManager/delete.py
src/virtManager/details.py
src/virtManager/domain.py
src/virtManager/engine.py
src/virtManager/error.py
src/virtManager/graphwidgets.py
src/virtManager/halhelper.py
src/virtManager/host.py
src/virtManager/keyring.py
src/virtManager/manager.py
src/virtManager/mediadev.py
src/virtManager/migrate.py
src/virtManager/netdev.py
src/virtManager/network.py
src/virtManager/packageutils.py
src/virtManager/preferences.py
src/virtManager/remote.py
src/virtManager/serialcon.py
src/virtManager/storagebrowse.py
src/virtManager/storagepool.py
src/virtManager/storagevol.py
src/virtManager/systray.py
src/virtManager/uihelpers.py
src/virtManager/util.py
data/virt-manager.desktop.in
[type: gettext/glade]src/vmm-about.ui
[type: gettext/glade]src/vmm-add-hardware.ui
[type: gettext/glade]src/vmm-choose-cd.ui
[type: gettext/glade]src/vmm-clone.ui
[type: gettext/glade]src/vmm-create-interface.ui
[type: gettext/glade]src/vmm-create-net.ui
[type: gettext/glade]src/vmm-create-pool.ui
[type: gettext/glade]src/vmm-create-vol.ui
[type: gettext/glade]src/vmm-create.ui
[type: gettext/glade]src/vmm-delete.ui
[type: gettext/glade]src/vmm-details.ui
[type: gettext/glade]src/vmm-host.ui
[type: gettext/glade]src/vmm-manager.ui
[type: gettext/glade]src/vmm-migrate.ui
[type: gettext/glade]src/vmm-open-connection.ui
[type: gettext/glade]src/vmm-preferences.ui
[type: gettext/glade]src/vmm-progress.ui
[type: gettext/glade]src/vmm-storage-browse.ui
virtManager/__init__.py
virtManager/about.py
virtManager/addhardware.py
virtManager/asyncjob.py
virtManager/choosecd.py
virtManager/clone.py
virtManager/config.py
virtManager/connect.py
virtManager/connection.py
virtManager/connectauth.py
virtManager/console.py
virtManager/create.py
virtManager/createinterface.py
virtManager/createnet.py
virtManager/createpool.py
virtManager/createvol.py
virtManager/delete.py
virtManager/details.py
virtManager/domain.py
virtManager/engine.py
virtManager/error.py
virtManager/graphwidgets.py
virtManager/halhelper.py
virtManager/host.py
virtManager/keyring.py
virtManager/manager.py
virtManager/mediadev.py
virtManager/migrate.py
virtManager/netdev.py
virtManager/network.py
virtManager/packageutils.py
virtManager/preferences.py
virtManager/remote.py
virtManager/serialcon.py
virtManager/storagebrowse.py
virtManager/storagepool.py
virtManager/storagevol.py
virtManager/systray.py
virtManager/uihelpers.py
virtManager/util.py
[type: gettext/glade]ui/vmm-about.ui
[type: gettext/glade]ui/vmm-add-hardware.ui
[type: gettext/glade]ui/vmm-choose-cd.ui
[type: gettext/glade]ui/vmm-clone.ui
[type: gettext/glade]ui/vmm-create-interface.ui
[type: gettext/glade]ui/vmm-create-net.ui
[type: gettext/glade]ui/vmm-create-pool.ui
[type: gettext/glade]ui/vmm-create-vol.ui
[type: gettext/glade]ui/vmm-create.ui
[type: gettext/glade]ui/vmm-delete.ui
[type: gettext/glade]ui/vmm-details.ui
[type: gettext/glade]ui/vmm-host.ui
[type: gettext/glade]ui/vmm-manager.ui
[type: gettext/glade]ui/vmm-migrate.ui
[type: gettext/glade]ui/vmm-open-connection.ui
[type: gettext/glade]ui/vmm-preferences.ui
[type: gettext/glade]ui/vmm-progress.ui
[type: gettext/glade]ui/vmm-storage-browse.ui

View File

@ -1 +0,0 @@
src/virt-manager.py

View File

@ -1,12 +0,0 @@
Notes on translation process
============================
The translations for virt-manager are handled via transifex.net.
To pull in the latest translations requires the transifex-client package:
tx pull
make update-po
Translators can easily sign up to contribute:
http://help.transifex.net/

File diff suppressed because it is too large Load Diff

205
setup.py Normal file
View File

@ -0,0 +1,205 @@
#!/usr/bin/env python
import glob
import os
from distutils.core import Command, setup
from distutils.command.install_egg_info import install_egg_info
from DistUtilsExtra.auto import sdist_auto
from DistUtilsExtra.command.build_i18n import build_i18n
from DistUtilsExtra.command.build_extra import build_extra
from DistUtilsExtra.command.build_icons import build_icons
from virtcli import cliconfig
class my_build_i18n(build_i18n):
"""
Add our desktop files to the list, saves us having to track setup.cfg
"""
def finalize_options(self):
build_i18n.finalize_options(self)
self.desktop_files = ('[("share/applications",' +
' ("data/virt-manager.desktop.in", ))]')
class my_build(build_extra):
"""
Create simple shell wrappers for /usr/bin/ tools to point to /usr/share
Compile .pod file
"""
def run(self):
cmds = ["virt-manager"]
if cliconfig.with_tui:
cmds += ["virt-manager-tui"]
for app in cmds:
sharepath = os.path.join(cliconfig.asset_dir, app + ".py")
wrapper = "#!/bin/sh\n\n"
wrapper += "exec python \"%s\" \"$@\"" % (sharepath)
file(app, "w").write(wrapper)
os.system('pod2man --release="" --center="Virtual Machine Manager" '
'< ./man/virt-manager.pod > ./man/virt-manager.1')
build_extra.run(self)
class my_build_icons(build_icons):
"""
Fix up build_icon output to put or private icons in share/virt-manager
"""
def run(self):
data_files = self.distribution.data_files
for size in glob.glob(os.path.join(self.icon_dir, "*")):
for category in glob.glob(os.path.join(size, "*")):
icons = []
for icon in glob.glob(os.path.join(category,"*")):
if not os.path.islink(icon):
icons.append(icon)
if not icons:
continue
category = os.path.basename(category)
dest = ("share/icons/hicolor/%s/%s" %
(os.path.basename(size), category))
if category != "apps":
dest = dest.replace("share/", "share/virt-manager/")
data_files.append((dest, icons))
class my_egg_info(install_egg_info):
"""
Disable egg_info installation, seems pointless for a non-library
"""
def run(self):
pass
###################
# Custom commands #
###################
class my_rpm(Command):
user_options = []
description = "Build a non-binary rpm."
def initialize_options(self):
pass
def finalize_options(self):
pass
def run(self):
"""
Run sdist, then 'rpmbuild' the tar.gz
"""
self.run_command('sdist')
os.system('rpmbuild -ta dist/virt-manager-%s.tar.gz' %
cliconfig.__version__)
class configure(Command):
user_options = [
("without-tui", None, "don't install virt-manager-tui"),
("qemu-user=", None,
"user libvirt uses to launch qemu processes (default=root)"),
("libvirt-package-names=", None,
"list of libvirt distro packages virt-manager will check for on "
"first run. comma separated string (default=none)"),
("kvm-package-names=", None,
"recommended kvm packages virt-manager will check for on first run "
"(default=none)"),
("askpass-package-names=", None,
"name of your distro's askpass package(s) (default=none)"),
("hide-unsupported-rhel-options", None,
"Hide config bits that are not supported on RHEL (default=no)"),
("preferred-distros=", None,
"Distros to list first in the New VM wizard (default=none)"),
("default-graphics=", None,
"Default graphics type (spice or vnc) (default=vnc)"),
]
description = "Configure the build, similar to ./configure"
def finalize_options(self):
pass
def initialize_options(self):
self.without_tui = 0
self.qemu_user = "root"
self.libvirt_package_names = ""
self.kvm_package_names = ""
self.askpass_package_names = ""
self.hide_unsupported_rhel_options = 0
self.preferred_distros = ""
self.default_graphics = "vnc"
def run(self):
template = ""
template += "[config]\n"
template += "with_tui = %s\n" % int(not self.without_tui)
template += "default_qemu_user = %s\n" % self.qemu_user
template += "libvirt_packages = %s\n" % self.libvirt_package_names
template += "hv_packages = %s\n" % self.kvm_package_names
template += "askpass_packages = %s\n" % self.askpass_package_names
template += "preferred_distros = %s\n" % self.preferred_distros
template += ("hide_unsupported_rhel_options = %s\n" %
self.hide_unsupported_rhel_options)
template += "default_graphics = %s\n" % self.default_graphics
file(cliconfig.cfgpath, "w").write(template)
print "Generated %s" % cliconfig.cfgpath
tui_files = [
("share/virt-manager/", ["virt-manager-tui.py"]),
("share/virt-manager/virtManagerTui",
glob.glob("virtManagerTui/*.py")),
("share/virt-manager/virtManagerTui/importblacklist",
glob.glob("virtManagerTui/importblacklist/*.py")),
]
if not cliconfig.with_tui:
tui_files = []
setup(
name = "virt-manager",
version = cliconfig.__version__,
# XXX: proper version, description, long_description, author, author_email
url = "http://virt-manager.org",
license = "GPLv2+",
scripts = (["virt-manager"] +
(cliconfig.with_tui and ["virt-manager-tui"] or [])),
data_files = [
("share/virt-manager/", ["virt-manager.py"]),
("/etc/gconf/schemas", ["data/virt-manager.schemas"]),
("share/virt-manager/ui", glob.glob("ui/*.ui")),
("share/man/man1", ["man/virt-manager.1"]),
("share/virt-manager/virtManager", glob.glob("virtManager/*.py")),
] + tui_files,
cmdclass = {
'build': my_build,
'build_i18n': my_build_i18n,
'build_icons': my_build_icons,
'sdist': sdist_auto,
'install_egg_info': my_egg_info,
'configure': configure,
'rpm': my_rpm,
}
)

View File

@ -1,82 +0,0 @@
SUBDIRS = virtManager
bin_SCRIPTS_IN = virt-manager.in
bin_SCRIPTS = virt-manager
pythondir = $(pkgdatadir)
python_DATA_IN = $(PACKAGE).py.in
python_DATA = $(PACKAGE).py
libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.ui)
desktopdir = $(datadir)/applications
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
dbus_DATA_IN = $(PACKAGE).service.in
dbus_DATA = $(PACKAGE).service
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA_IN = $(PACKAGE).schemas.in
schema_DATA = $(PACKAGE).schemas
CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA) $(libexec_SCRIPTS) $(schema_DATA) $(PACKAGE).desktop.in
EXTRA_DIST = $(bin_SCRIPTS_IN) $(desktop_DATA_IN) $(dbus_DATA_IN) $(python_DATA_IN) $(glade_DATA) $(libexec_DATA_IN) $(schema_DATA_IN)
if INSTALL_TUI
SUBDIRS += virtManagerTui
bin_SCRIPTS_IN += virt-manager-tui.in
bin_SCRIPTS += virt-manager-tui
python_DATA_IN += $(PACKAGE)-tui.py.in
python_DATA += $(PACKAGE)-tui.py
endif
@INTLTOOL_DESKTOP_RULE@
%.desktop.in: $(srcdir)/%.desktop.in.in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@
%.service: $(srcdir)/%.service.in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PREFIX::,$(prefix)," < $< > $@
%.schemas: $(srcdir)/%.schemas.in ${top_builddir}/config.status
sed -e "s|::DEFAULT_GRAPHICS::|$(DEFAULT_GRAPHICS)|g" \
-e "s,::PACKAGE::,$(PACKAGE)," \
< $< > $@
%.py: $(srcdir)/%.py.in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)," \
-e "s,::VERSION::,$(VERSION)," \
-e "s,::ASSETDIR::,$(pkgdatadir)," \
-e "s,::PYLIBDIR::,$(pkgdatadir)," \
-e "s,::GETTEXTDIR::,$(datadir)/locale," \
-e "s,::DATADIR::,$(datadir)," \
-e "s,::PYARCHLIBDIR::,$(pkglibdir)," \
-e "s,::VIRTINST_VERSION::,$(VIRTINST_VERSION)," \
-e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
-e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
-e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
-e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \
-e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \
-e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
< $< > $@
$(PACKAGE): $(srcdir)/$(PACKAGE).in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
$(PACKAGE)-tui: $(srcdir)/$(PACKAGE)-tui.in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)-tui," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@
$(PACKAGE)-launch: $(srcdir)/$(PACKAGE)-launch.in ${top_builddir}/config.status
sed -e "s,::PACKAGE::,$(PACKAGE)," -e "s,::PYTHONDIR::,$(pkgdatadir)," < $< > $@

View File

@ -1,3 +0,0 @@
#!/bin/sh
exec python "::PYTHONDIR::/::PACKAGE::.py"

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 493 KiB

View File

@ -1,3 +0,0 @@
#!/bin/sh
exec python "::PYTHONDIR::/::PACKAGE::.py" "$@"

View File

@ -1,3 +0,0 @@
#!/bin/sh
exec python "::PYTHONDIR::/::PACKAGE::.py" "$@"

View File

@ -1,3 +0,0 @@
[D-BUS Service]
Name=com.redhat.virt.manager
Exec=::PREFIX::/libexec/::PACKAGE::-launch

View File

@ -1,16 +0,0 @@
pythondir = $(pkgdatadir)/virtManager
python_DATA = $(wildcard $(srcdir)/*.py)
EXTRA_DIST = $(python_DATA)
SYNTAX_CHECK_TSTAMPS = $(python_DATA:$(srcdir)/%.py=.tstamp.%.py)
check-local: $(SYNTAX_CHECK_TSTAMPS)
clean-local:
rm -f $(SYNTAX_CHECK_TSTAMPS)
.tstamp.%.py: %.py
touch $@

View File

@ -1,17 +0,0 @@
SUBDIRS = importblacklist
pythondir = $(pkgdatadir)/virtManagerTui
python_DATA = $(wildcard $(srcdir)/*.py)
EXTRA_DIST = $(python_DATA)
SYNTAX_CHECK_TSTAMPS = $(python_DATA:$(srcdir)/%.py=.tstamp.%.py)
check-local: $(SYNTAX_CHECK_TSTAMPS)
clean-local:
rm -f $(SYNTAX_CHECK_TSTAMPS)
.tstamp.%.py: %.py
touch $@

View File

@ -1,15 +0,0 @@
pythondir = $(pkgdatadir)/virtManagerTui/importblacklist
python_DATA = $(wildcard $(srcdir)/*.py)
EXTRA_DIST = $(python_DATA)
SYNTAX_CHECK_TSTAMPS = $(python_DATA:$(srcdir)/%.py=.tstamp.%.py)
check-local: $(SYNTAX_CHECK_TSTAMPS)
clean-local:
rm -f $(SYNTAX_CHECK_TSTAMPS)
.tstamp.%.py: %.py
touch $@

View File

@ -1,2 +0,0 @@
EXTRA_DIST = $(wildcard *.sh)

40
src/virt-manager-tui.py.in → virt-manager-tui.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/python
# virt-manager-tui.py - Copyright (C) 2010 Red Hat, Inc.
# Written by Darryl L. Pierce, <dpierce@redhat.com>.
#
@ -17,34 +19,19 @@
# MA 02110-1301 USA.
#
from newt_syrup.dialogscreen import DialogScreen
import logging
import optparse
import os
import sys
import traceback
import optparse
# These are substituted into code based on --prefix given to configure
appname = "::PACKAGE::-tui"
appversion = "::VERSION::"
gettext_app = "virt-manager"
gettext_dir = "::GETTEXTDIR::"
virtinst_str = "::VIRTINST_VERSION::"
pylib_dir = "::PYLIBDIR::"
pyarchlib_dir = "::PYARCHLIBDIR::"
from newt_syrup.dialogscreen import DialogScreen
from virtcli import cliutils, cliconfig
def setup_pypath():
# Hack to find assets in local dir for dev purposes
if os.path.exists(os.getcwd() + "/src/virt-manager.py.in"):
sys.path.insert(0, os.path.join(os.getcwd(),
"/src/virtManagerTui/importblacklist"))
else:
sys.path.insert(0, pylib_dir)
sys.path.insert(0, pyarchlib_dir)
def parse_commandline():
optParser = optparse.OptionParser(version=appversion)
optParser = optparse.OptionParser(version=cliconfig.__version__)
optParser.add_option("-c", "--connect", dest="uri",
help="Connect to hypervisor at URI", metavar="URI")
@ -60,20 +47,15 @@ def _show_startup_error(message, details):
errordlg.show()
def main():
setup_pypath()
import virtManager
from virtManager import cli
cli.setup_i18n(gettext_app, gettext_dir)
cliutils.setup_i18n()
(options, ignore) = parse_commandline()
cli.setup_logging(appname, options.debug)
cliutils.setup_logging("virt-manager-tui", options.debug)
import virtManager
logging.debug("Launched as: %s", " ".join(sys.argv[:]))
logging.debug("virtManager import: %s", str(virtManager))
cli.check_virtinst_version(virtinst_str)
cliutils.check_virtinst_version()
import virtManager.guidiff
virtManager.guidiff.is_gui(False)

View File

@ -1,3 +1,5 @@
#!/usr/bin/python
#
# Copyright (C) 2006 Red Hat, Inc.
# Copyright (C) 2006 Daniel P. Berrange <berrange@redhat.com>
@ -18,20 +20,22 @@
# MA 02110-1301 USA.
#
import os
import os.path
import sys
import logging
import traceback
import signal
import optparse
import os
import signal
import sys
import traceback
from gi.repository import GObject
from gi.repository import LibvirtGLib
from virtcli import cliutils, cliconfig
GObject.threads_init()
try:
# Make sure we have a default '_' implementation, in case something
# fails before gettext is set up
@ -39,32 +43,10 @@ try:
except:
pass
def split_list(commastr):
return [d for d in commastr.split(",") if d]
# These are substituted into code based on --prefix given to configure
appname = "::PACKAGE::"
appversion = "::VERSION::"
gettext_app = "virt-manager"
gettext_dir = "::GETTEXTDIR::"
virtinst_str = "::VIRTINST_VERSION::"
asset_dir = "::ASSETDIR::"
ui_dir = asset_dir
icon_dir = asset_dir + "/icons"
pylib_dir = "::PYLIBDIR::"
pyarchlib_dir = "::PYARCHLIBDIR::"
default_qemu_user = "::DEFAULT_QEMU_USER::"
rhel_enable_unsupported_opts = bool(int("::ENABLE_UNSUPPORTED_RHEL_OPTS::"))
preferred_distros = split_list("::PREFERRED_DISTROS::")
hv_packages = split_list("::KVM_PACKAGES::")
askpass_package = split_list("::ASKPASS_PACKAGE::")
libvirt_packages = split_list("::LIBVIRT_PACKAGES::")
logging_setup = False
def _show_startup_error(msg, details):
from virtManager.error import vmmErrorDialog
err = vmmErrorDialog()
@ -75,17 +57,6 @@ def _show_startup_error(msg, details):
async=False,
debug=False)
def setup_pypath():
global ui_dir, icon_dir
# Hack to find assets in local dir for dev purposes
if os.path.exists(os.getcwd() + "/src/virt-manager.py.in"):
ui_dir = os.path.join(os.getcwd(), "src")
icon_dir = os.path.join(os.getcwd(), "icons")
else:
sys.path.insert(0, pylib_dir)
sys.path.insert(0, pyarchlib_dir)
def drop_tty():
# We fork and setsid so that we drop the controlling
@ -113,7 +84,7 @@ def drop_stdio():
os.dup2(0, 2)
def parse_commandline():
optParser = optparse.OptionParser(version=appversion,
optParser = optparse.OptionParser(version=cliconfig.__version__,
usage="virt-manager [options]")
optParser.set_defaults(uuid=None)
optParser.epilog = ("Also accepts standard GTK arguments like "
@ -258,12 +229,7 @@ def opt_show_cb(option, opt_str, value, parser):
# Run me!
def main():
setup_pypath()
import virtManager
from virtManager import cli
cli.setup_i18n(gettext_app, gettext_dir)
cliutils.setup_i18n()
# Need to do this before GTK strips args like --sync
origargs = " ".join(sys.argv[:])
@ -280,19 +246,20 @@ def main():
# Need to parse CLI after import gtk, since gtk strips --sync
(options, ignore) = parse_commandline()
cli.setup_logging(appname, options.debug)
cliutils.setup_logging("virt-manager", options.debug)
global logging_setup
logging_setup = True
import virtManager
logging.debug("Launched as: %s", origargs)
logging.debug("GTK version: %d.%d.%d",
Gtk.get_major_version(),
Gtk.get_minor_version(),
Gtk.get_micro_version())
logging.debug("virt-manager version: %s", appversion)
logging.debug("virt-manager version: %s", cliconfig.__version__)
logging.debug("virtManager import: %s", str(virtManager))
cli.check_virtinst_version(virtinst_str)
cliutils.check_virtinst_version()
if options.tracelibvirt:
logging.debug("Libvirt tracing requested")
@ -310,16 +277,19 @@ def main():
# display access
import virtManager.config
import virtManager.util
config = virtManager.config.vmmConfig(appname, appversion, ui_dir,
options.testfirstrun)
config = virtManager.config.vmmConfig("virt-manager",
cliconfig.__version__,
os.path.join(cliconfig.asset_dir, "ui"),
options.testfirstrun)
virtManager.util.running_config = config
config.default_qemu_user = default_qemu_user
config.rhel6_defaults = rhel_enable_unsupported_opts
config.preferred_distros = preferred_distros
config.default_qemu_user = cliconfig.default_qemu_user
config.rhel6_defaults = cliconfig.rhel_enable_unsupported_opts
config.preferred_distros = cliconfig.preferred_distros
config.hv_packages = hv_packages
config.libvirt_packages = libvirt_packages
config.askpass_package = askpass_package
config.hv_packages = cliconfig.hv_packages
config.libvirt_packages = cliconfig.libvirt_packages
config.askpass_package = cliconfig.askpass_package
config.default_graphics_from_config = cliconfig.default_graphics
import virtManager.guidiff
virtManager.guidiff.is_gui(True)
@ -334,11 +304,11 @@ def main():
# Add our icon dir to icon theme
icon_theme = Gtk.IconTheme.get_default()
icon_theme.prepend_search_path(icon_dir)
icon_theme.prepend_search_path(cliconfig.icon_dir)
from virtManager.engine import vmmEngine
Gtk.Window.set_default_icon_name(appname)
Gtk.Window.set_default_icon_name("virt-manager")
if options.show and options.uri is None:
raise optparse.OptionValueError("can't use --show-* options "

View File

@ -1,9 +1,8 @@
# -*- rpm-spec -*-
%define _package @PACKAGE@
%define _version @VERSION@
%define _version 0.9.4
%define _release 1
%define virtinst_version @VIRTINST_VERSION@
%define virtinst_version 0.600.4
%define qemu_user ""
%define preferred_distros ""
@ -59,7 +58,7 @@ fi \
# Fedora RPM builds
%define _extra_release %{?dist:%{dist}}%{?extra_release:%{extra_release}}
Name: %{_package}
Name: virt-manager
Version: %{_version}
Release: %{_release}%{_extra_release}
%define verrel %{version}-%{release}
@ -171,66 +170,70 @@ Common files used by the different Virtual Machine Manager interfaces.
%build
%if %{qemu_user}
%define _qemu_user --with-qemu_user=%{qemu_user}
%define _qemu_user --qemu-user=%{qemu_user}
%endif
%if %{kvm_packages}
%define _kvm_packages --with-kvm-packages=%{kvm_packages}
%define _kvm_packages --kvm-package-names=%{kvm_packages}
%endif
%if %{preferred_distros}
%define _preferred_distros --with-preferred-distros=%{preferred_distros}
%define _preferred_distros --preferred-distros=%{preferred_distros}
%endif
%if %{libvirt_packages}
%define _libvirt_packages --with-libvirt-package-names=%{libvirt_packages}
%define _libvirt_packages --libvirt-package-names=%{libvirt_packages}
%endif
%if %{askpass_package}
%define _askpass_package --with-askpass-package=%{askpass_package}
%define _askpass_package --askpass-package-names=%{askpass_package}
%endif
%if %{disable_unsupported_rhel}
%define _disable_unsupported_rhel --disable-unsupported-rhel-options
%define _disable_unsupported_rhel --hide-unsupported-rhel-options
%endif
%if 0%{?default_graphics:1}
%define _default_graphics --with-default-graphics=%{default_graphics}
%define _default_graphics --default-graphics=%{default_graphics}
%endif
%if %{with_tui}
%define _tui_opt --with-tui
%else
%if ! %{with_tui}
%define _tui_opt --without-tui
%endif
%configure %{?_tui_opt} \
%{?_qemu_user} \
%{?_kvm_packages} \
%{?_libvirt_packages} \
%{?_askpass_package} \
%{?_preferred_distros} \
%{?_disable_unsupported_rhel} \
%{?_default_graphics}
make %{?_smp_mflags}
python setup.py configure \
%{?_tui_opt} \
%{?_qemu_user} \
%{?_kvm_packages} \
%{?_libvirt_packages} \
%{?_askpass_package} \
%{?_preferred_distros} \
%{?_disable_unsupported_rhel} \
%{?_default_graphics}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
python setup.py install -O1 --root=$RPM_BUILD_ROOT
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%pre
%gconf_schema_prepare %{name}
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database -q %{_datadir}/applications
%gconf_schema_upgrade %{name}
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@ -238,22 +241,24 @@ if [ $1 -eq 0 ] ; then
fi
update-desktop-database -q %{_datadir}/applications
%preun
%gconf_schema_remove %{name}
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if %{with_tui}
%files
%else
%files -f %{name}.lang
%endif
%defattr(-,root,root,-)
%doc README COPYING AUTHORS ChangeLog NEWS
%doc README COPYING AUTHORS NEWS
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_libexecdir}/%{name}-launch
%{_mandir}/man1/%{name}.1*
@ -263,14 +268,14 @@ update-desktop-database -q %{_datadir}/applications
%{_datadir}/%{name}/virtManager/*.py*
%endif
%{_datadir}/%{name}/*.ui
%{_datadir}/%{name}/ui/*.ui
%{_datadir}/%{name}/%{name}.py*
%{_datadir}/%{name}/icons
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/dbus-1/services/%{name}.service
%if %{with_tui}
%files common -f %{name}.lang

View File

@ -111,6 +111,7 @@ class vmmConfig(object):
self.hv_packages = []
self.libvirt_packages = []
self.askpass_package = []
self.default_graphics_from_config = "vnc"
self._objects = []
@ -524,6 +525,8 @@ class vmmConfig(object):
def get_graphics_type(self):
ret = self.conf.get_string(self.conf_dir + "/new-vm/graphics_type")
if ret == "system":
return self.default_graphics_from_config
if ret not in ["vnc", "spice"]:
return "vnc"
return ret

Some files were not shown because too many files have changed in this diff Show More