diff options
author | Jon Nettleton <jon.nettleton@gmail.com> | 2009-06-10 12:29:20 +0200 |
---|---|---|
committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-06-16 14:17:10 -0400 |
commit | 51a646796896312b1bdfdb2ddf46379e3fccced7 (patch) | |
tree | 1ecefda54e0eda1219b2ce957d37708ec3295bf8 /test | |
parent | 9127993d847f106b58c3863ca8e35952cb7a32e1 (diff) | |
download | mutter-51a646796896312b1bdfdb2ddf46379e3fccced7.tar.gz |
Comprehensively rename to Mutter
Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.
The overall version was brought up to 2.27 to match current gnome.
Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system. Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap. These files will eventually end up in an external
gnome-wm-data module.
Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.
Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set. This allows
gnome-control-center to continue using libmetacity.so for
configuration. This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.
Diffstat (limited to 'test')
-rw-r--r-- | test/mutter-test (renamed from test/metacity-test) | 16 | ||||
-rw-r--r-- | test/tokentest/Makefile | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/metacity-test b/test/mutter-test index de46d6665..3f22b6777 100644 --- a/test/metacity-test +++ b/test/mutter-test @@ -1,6 +1,6 @@ #!/usr/bin/python # -# metacity-test.py -- testing for Metacity +# mutter-test.py -- testing for Mutter # # Copyright (C) 2008 Thomas Thurman # @@ -49,7 +49,7 @@ class Test(object): tests_by_name = {} tests_by_bug_number = {} -pristine_copy = '/usr/local/src/metacity' +pristine_copy = '/usr/local/src/mutter' working_directory = pristine_copy homepath = os.getcwd () @@ -121,7 +121,7 @@ class BuildTest(Test): return name def run_build(self, **params): - """Generalised routine to attempt to build Metacity. + """Generalised routine to attempt to build Mutter. Parameters are: action = (string) -- run "make (string)" rather than "make" @@ -171,20 +171,20 @@ class BuildTest(Test): if not run('make', 'env %s make %s' % (' '.join(flags), command)): raise TestFailure('Build failed; can\'t really go on from here.') - binary = 'src/metacity' # or 'metacity/src/metacity' sometimes. hmm.... + binary = 'src/mutter' # or 'mutter/src/mutter' sometimes. hmm.... if not os.path.lexists(binary): raise TestFailure('Binary was not built.') output = commands.getoutput("env LANG=C %s --version" % binary) - if not output.startswith('metacity '): + if not output.startswith('mutter '): raise TestFailure('Built program fails to identify itself: ['+output+']') # Should also test what it says about its flags # (and make it show its flags) - if not run ('recopy', 'cp %s %s/metacity-%s' % (binary, homepath, self.executable_name())): + if not run ('recopy', 'cp %s %s/mutter-%s' % (binary, homepath, self.executable_name())): raise TestFailure('Couldn\'t copy binary somewhere safe') # Should clear up build if it's temp directory @@ -230,12 +230,12 @@ for (name, klass) in inspect.getmembers(sys.modules['__main__']): # And back in the ordinary world... def show_help(): - print ' --- metacity-test --- a test system for metacity.' + print ' --- mutter-test --- a test system for mutter.' print 'There are three kinds of test: unit, regression, or build.' print 'Only build tests are currently implemented.' print print 'Syntax:' - print ' metacity-test <switches> <test names>' + print ' mutter-test <switches> <test names>' print 'where <switches> can be:' print ' -h Show this help and exit' print ' -l List all known tests and exit' diff --git a/test/tokentest/Makefile b/test/tokentest/Makefile index 88b3c5f2e..010fd604d 100644 --- a/test/tokentest/Makefile +++ b/test/tokentest/Makefile @@ -4,4 +4,4 @@ default: @echo "Try 'make tp' or 'make glib'" tp: tokentest.c - gcc `pkg-config --cflags --libs glib-2.0 gdk-2.0 atk` -DMETACITY_DATADIR=\"/usr/share/metacity\" -I../.. -I../../src -I../../src/include tokentest.c ../../src/ui/theme.c ../../src/ui/gradient.c -o tp + gcc `pkg-config --cflags --libs glib-2.0 gdk-2.0 atk` -DMUTTER_DATADIR=\"/usr/share/mutter\" -I../.. -I../../src -I../../src/include tokentest.c ../../src/ui/theme.c ../../src/ui/gradient.c -o tp |