Commit a82a1c96 authored by Guido Günther's avatar Guido Günther

Merge branch 'upstream'

Conflicts:

	config.guess
	config.sub
	src/graphWidgets/pysparklinemodule.c
parents e660f557 5e8bcb19
^.*~$
^build
Makefile\.in$
^install-sh$
^missing$
^configure$
^aclocal\.m4$
^autom4te\.cache
.*\.gladep$
.*\.bak$
.*\.pyc$
^compile$
^depcomp$
^ltmain\.sh$
^config\..*$
^mkinstalldirs
^libtool
^intltool-.*\.in$
^m4/.*\.m4$
po/Makefile\.in\.in
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
86487f54181a94acf6e7ca8fc99a9f66daae7b1a RELEASE-0.1.2-1
aa2d2a7a856b6a2f5b11760ad22a404f5ea80ba7 RELEASE-0.1.2-2
189d414f9fe41333bbb768f2070f4f5656fa2da5 RELEASE-0.1.2-3
667c1e792acceaefed8e3d25d0b1028850211ad6 RELEASE-0.1.3-1
263881a07fa4addc6314fad90a2fa745211116bd RELEASE-0.1.4-1
a5976d3f807f516d06b8890e754f9b0265f2bd52 RELEASE-0.1.5-1
869707b48d518080f877bace387fa43458e197e0 RELEASE-0.2.0-1
4aba9106462877a7df2bf1211bc41eb5321af1ee RELEASE-0.2.1-1
37220522ba6d379d0ea140c2960e688cdb375927 RELEASE-0.2.2-1
408e703e0a36d1f601b7038e3ee633236c5a5a28 RELEASE-0.2.3-1
a72f4fcfc37be3ccca9c966d8d62c1c95212bdbc RELEASE-0.2.4-1
f026bca68967ffcbf61ac60f2c653b3fba243785 RELEASE-0.2.5-1
912d53a50279d9c6e05d263b54837ad001a0ccb3 RELEASE-0.2.6-1
aab1b39dae04d051c2f7073ff9bcc74c55ff704a RELEASE-0.3.0-1
a671c435f0c6cb78ec10980ad5d4fb71adc1a622 RELEASE-0.3.2-1
225ff0619562f046101d6fc4f90371051367f850 RELEASE-0.3.1-1
bee4afe144ec72d1afe38833f4e62af8ab48cc2b RELEASE-0.4.0-1
380af83bb51b3c79ccd0e18992ce3942a5146664 RELEASE-0.5.0-1
038ba1ea0e3395e39c8a2ac0d596dbad7369b7e0 RELEASE-0.5.1-1
a0902e8de8d1b97eccabc7d177052eefe3a837b8 RELEASE-0.5.2-1
......@@ -27,6 +27,7 @@ Further patches have been submitted by:
Alexander Todorov <atodorov-at-redhat-dot-com>
Bernhard Kaindl <bk-at-suse-dot-de>
Eduardo Habkost <ehabkost-at-redhat-dot-com>
Dan Hork <dan-at-danny-dot-cz>
<...send a patch & get your name here...>
......
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
......@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
......@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
set -e
# Make things clean.
make -k distclean ||:
rm -rf MANIFEST blib
# Make makefiles.
./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
cd build
make
make install
rm -f *.tar.gz
make dist
if [ -f /usr/bin/rpmbuild ]; then
if [ -n "$AUTOBUILD_COUNTER" ]; then
EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
else
NOW=`date +"%s"`
EXTRA_RELEASE=".$USER$NOW"
fi
rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
fi
#!/bin/sh
set -e
# Hack around autoconf wierdness. Need to figure out what's really wrong
touch config.rpath
# Make makefiles.
intltoolize --automake --copy --force
perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' po/Makefile.in.in
aclocal -I m4
libtoolize
automake -a
autoconf
test -d build && rm -rf build
mkdir build
cd build
../configure $@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Procedure for doing new releases
=================================
Preparing the source tree:
1. Sync up latest translations - see po/README.txt
2. Change release number in configure.ac
3. Update NEWS file
4. Re-generate ChangeLog with 'hg log --style changelog > ChangeLog'
6. Update virt-manager.spec.in changelog & reset Release to '1'
5. Checkin changes
6. Run 'hg tag RELEASE-X.Y.Z-1'
Preparing the build:
1. Get a fresh checkout from http://hg.et.redhat.com/virt/applications/virt-manager--devel
2. Run 'autobuild.sh'
3. Upload build/virt-manager-X.Y.Z.tar.gz to website download area
4. Update the website download.html page
5. Mail fedora-xen and libvirt mailing lists
6. Update freshmeat record
7. Mail lwn.net release announcement
danpb_ltop: going back to the applet/manager thing - if you email
me a list of tasks / actions you'd like to be able to trigger from the
applet, I'll se about added the capabilities to the manger
kzak: four actions:
1/ define (configure) new domain,
2/ re-configure domain,
3/ domain details (your cool plots),
4/ go to the manager...
5/ ???
DBus Remote Control
===================
The GNOME virt manager provides the ability to control its high level
UI actions via a DBus service.
Interface description
---------------------
The service is intended to run on the session bus, and when launched
will register a well known bus name of 'com.redhat.virt.manager'.
Within this service, a single object is to be exported under the
path of '/com/redhat/virt/manager'.
This object implements a single interface 'com.redhat.virt.manager'
which contains the following methods:
- show_domain_performance(string:uri, string:uuid)
Takes a domain's UUID in printable string format and displays
the window showing detailed performance data
- show_domain_editor(string:uri, string:uuid)
Takes a domain's UUID in printable string format and displays
the window for configuring the VM hardware resources
- show_domain_console(string:uri, string:uuid)
Takes a domain's UUID in printable string format and displays
the window for accessing the graphical framebuffer associated
with the VM.
- show_domain_serial_console(string:uri, string:uuid)
Takes a domain's UUID in printable string format and displays
the window for accessing the serial console connected to the
guest VM. NB, not all domains have a serial console activated,
and it is only typically accessible as root.
- show_domain_creator(string:uri)
Displays the window for creating & configuring a new domain.
NB. the domain creator is only accessible as root.
- show_host_summary(string:uri)
Displays the window showing a summary of all active domains
on the host
- show_connect()
Displays the dialog for connecting to a hypervisor
In all these methods the 'uri' parameter is the URI for the hypervisor,
typically either 'Xen', or 'test://default'.
Example usage from shell
------------------------
To display the performance window for the domain with a UUID of
'349025e8-ad34-34ff-239a-12ae095249f3', one would use the dbus-send
command as follows:
# First ensure the application is running
$ dbus-send --print-reply --session --dest="org.freedesktop.DBus" \
"/org/freedesktop/DBus" \
"org.freedesktop.DBus.StartServiceByName" \
"string:com.redhat.virt.manager"
# Now call the show_domain_performance method
$dbus-send --print-reply --session --dest="com.redhat.virt.manager" \
"/com/redhat/virt/manager"
"com.redhat.virt.manager.show_domain_performance" \
"string:xen" \
"string:349025e8-ad34-34ff-239a-12ae095249f3"
Example usage from python
-------------------------
import dbus
bus = dbus.SessionBus()
bus_object = bus.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus")
bus_iface = dbus.Interface(bus_object, "org.freedesktop.DBus")
bus_iface.StartServiceByName("com.redhat.virt.manager")
virt_object = bus.get_object("com.redhat.virt.manager",
"/com/redhat/virt/manager")
virt_iface = dbus.Interface(virt_object, "com.redhat.virt.manager")
virt_iface.show_domain_performance("xen", "349025e8-ad34-34ff-239a-12ae095249f3")
This diff is collapsed.
This diff is collapsed.
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# 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 =
Notes on translation process
============================
The translations for virt-manager are currently handled by the Fedora translations
team. Thus the translators work on .po files which are in the master Fedora CVS
repo for i18n stuff. Before each new release, the latest translated .po files are
pulled back into the master HG repo for virt-manager, and a new virt-manager.pot
file pushed out.
The process for updates is this:
- Get checkout of 'virt-manager' from hg.et.redhat.com/virt/ repo
- Get checkout of 'virt-manager' from elvis.redhat.com:/usr/local/CVS repo
- Copy all the .po files from CVS repo into the po/ directory from HG
- Run 'make update-po'. This
- Rebuilds the virt-manager.pot to pull in latest strings from source
code files
- Runs 'msgmerge' on each .po file to add entries for new messages
and disable old ones, etc
- Commit this to HG repo
- Copy the virt-manager.pot & msgmerge'd .po files back to CVS repo
- Commit the CVS repo
Running this only at time of release isn't entirely ideal since translators
will always be one release behind the latest source strings. Thus ideally
the sync-up should be done on a weekly basis, as well as immediately before
release.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
#
import os
......@@ -124,6 +125,14 @@ def setup_logging():
rootLogger.addHandler(fileHandler)
logging.info("Application startup")
# Log uncaught exceptions
def exception_log(type, val, tb):
import traceback
str = traceback.format_exception(type, val, tb)
logging.exception("".join(str))
sys.__excepthook__(type, val, tb)
sys.excepthook = exception_log
def parse_commandline():
optParser = OptionParser()
optParser.add_option("--profile", dest="profile", help="Generate runtime performance profile stats", metavar="FILE")
......
This diff is collapsed.
......@@ -14,5 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
#
......@@ -14,7 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
#
import gtk.glade
......
This diff is collapsed.
......@@ -14,7 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
#
import threading
......
......@@ -14,11 +14,13 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
#
import gtk.glade
import gobject
import logging
import virtinst
from virtManager.opticalhelper import vmmOpticalDriveHelper
class vmmChooseCD(gobject.GObject):
......@@ -42,7 +44,7 @@ class vmmChooseCD(gobject.GObject):
"on_cancel_clicked": self.cancel,
})
self.window.get_widget("physical-media").set_active(True)
self.window.get_widget("iso-image").set_active(True)
# set up the list for the cd-path widget
cd_list = self.window.get_widget("cd-path")
......@@ -78,11 +80,24 @@ class vmmChooseCD(gobject.GObject):
def ok(self,ignore1=None, ignore2=None):
if self.window.get_widget("iso-image").get_active():
self.emit("cdrom-chosen", "file", self.window.get_widget("iso-path").get_text(), self.target)
path = self.window.get_widget("iso-path").get_text()
else:
cd = self.window.get_widget("cd-path")
model = cd.get_model()
self.emit("cdrom-chosen", "block", model.get_value(cd.get_active_iter(), 0), self.target)
path = model.get_value(cd.get_active_iter(), 0)
if path == "" or path == None:
self._validation_error_box(_("Invalid Media Path"), \
_("A media path must be specified."))
return
try:
disk = virtinst.VirtualDisk(path=path, device=virtinst.VirtualDisk.DEVICE_CDROM, readOnly=True)
except Exception, e:
self._validation_error_box(_("Invalid Media Path"), str(e))
return
self.emit("cdrom-chosen", disk.type, disk.path, self.target)
self.close()
def media_toggled(self, ignore1=None, ignore2=None):
......@@ -126,5 +141,16 @@ class vmmChooseCD(gobject.GObject):
else:
fcdialog.destroy()
return None
def _validation_error_box(self, text1, text2=None):
message_box = gtk.MessageDialog(self.window.get_widget("vmm-choosecd"), \
0, \
gtk.MESSAGE_ERROR, \
gtk.BUTTONS_OK, \
text1)
if text2 != None:
message_box.format_secondary_text(text2)
message_box.run()
message_box.destroy()
gobject.type_register(vmmChooseCD)
......@@ -14,7 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,