From 9d7ad008ad48aaa5a4eef2043ad145334d188ec3 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Mon, 29 May 2006 10:27:26 +0000 Subject: [PATCH] Changed GUI interface to new name. This allows us to use the new XML signature format (not understood by old versions of the injector) and to make new releases without having to keep compatibility support for very old versions (which will continue to use the old interface). git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/trunk/0launch@927 9f8c893c-44ee-0310-b757-c8ca8341c71e --- MANIFEST.in | 2 +- setup.py | 2 +- zeroinstall/0launch-gui/ZeroInstall-GUI.xml | 12 ++++++++++++ zeroinstall/0launch-gui/injector-gui.xml | 11 ----------- zeroinstall/injector/namespaces.py | 2 +- zeroinstall/injector/reader.py | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 zeroinstall/0launch-gui/ZeroInstall-GUI.xml delete mode 100644 zeroinstall/0launch-gui/injector-gui.xml diff --git a/MANIFEST.in b/MANIFEST.in index 896dab1..cad13c2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,4 +9,4 @@ include tests/6FCF121BE2390E0B.gpg include tests/Foo.xml include zeroinstall/0launch-gui/README include zeroinstall/0launch-gui/0launch-gui -include zeroinstall/0launch-gui/injector-gui.xml +include zeroinstall/0launch-gui/ZeroInstall-GUI.xml diff --git a/setup.py b/setup.py index 8c7f923..e36079c 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ class build_with_data(build_py): package_data_files = [ "zeroinstall/0launch-gui/README", "zeroinstall/0launch-gui/0launch-gui", - "zeroinstall/0launch-gui/injector-gui.xml", + "zeroinstall/0launch-gui/ZeroInstall-GUI.xml", ] def run(self): # Copy .py files and build, as usual diff --git a/zeroinstall/0launch-gui/ZeroInstall-GUI.xml b/zeroinstall/0launch-gui/ZeroInstall-GUI.xml new file mode 100644 index 0000000..8697a6f --- /dev/null +++ b/zeroinstall/0launch-gui/ZeroInstall-GUI.xml @@ -0,0 +1,12 @@ + + + ZeroInstall-GUI + graphical interface for the Zero Install injector + + The Zero Install GUI displays a window showing which versions of various components will be used when running a program, and allows you to alter various policy settings to affect the selection process. You can use this to mark particular versions of libraries as preferred, bugggy, etc. + + http://0install.net/injector.html + + + + diff --git a/zeroinstall/0launch-gui/injector-gui.xml b/zeroinstall/0launch-gui/injector-gui.xml deleted file mode 100644 index 154ab43..0000000 --- a/zeroinstall/0launch-gui/injector-gui.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 0launch-gui - graphical interface for the injector - - The injector GUI displays a window showing which versions of various components will be used when running a program, and allows you to alter various policy settings to affect the selection process. You can use this to mark particular versions of libraries as preferred, bugggy, etc. - - - - - diff --git a/zeroinstall/injector/namespaces.py b/zeroinstall/injector/namespaces.py index 877daae..f860f10 100644 --- a/zeroinstall/injector/namespaces.py +++ b/zeroinstall/injector/namespaces.py @@ -6,4 +6,4 @@ XMLNS_IFACE = 'http://zero-install.sourceforge.net/2004/injector/interface' config_site = '0install.net' config_prog = 'injector' -injector_gui_uri = 'http://0install.net/2005/interfaces/injector-gui' +injector_gui_uri = 'http://0install.net/2006/interfaces/ZeroInstall-GUI.xml' diff --git a/zeroinstall/injector/reader.py b/zeroinstall/injector/reader.py index cf9b15b..ca30cf9 100644 --- a/zeroinstall/injector/reader.py +++ b/zeroinstall/injector/reader.py @@ -86,7 +86,7 @@ def update_from_cache(interface): # Special case: add our fall-back local copy of the injector as a feed if interface.uri == injector_gui_uri: - local_gui = os.path.join(os.path.abspath(dirname(dirname(__file__))), '0launch-gui', 'injector-gui.xml') + local_gui = os.path.join(os.path.abspath(dirname(dirname(__file__))), '0launch-gui', 'ZeroInstall-GUI.xml') interface.feeds.append(Feed(local_gui, None, False)) return bool(cached) -- 2.11.4.GIT