[jhbuild] remove deprecated cvsmodule, svnmodule and archmodule module types
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild] remove deprecated cvsmodule, svnmodule and archmodule module types
- Date: Sun, 3 May 2009 09:24:39 -0400 (EDT)
commit 4345a43d47ad9ecb56c383265d3b6b9589ef794c
Author: Frederic Peters <fpeters 0d be>
Date: Sun May 3 15:23:50 2009 +0200
remove deprecated cvsmodule, svnmodule and archmodule module types
---
doc/C/jhbuild.xml | 170 +++--------------------------------------
jhbuild/modtypes/autotools.py | 121 -----------------------------
2 files changed, 11 insertions(+), 280 deletions(-)
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index b00a770..b47be96 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -2525,162 +2525,13 @@ libgnomecanvas is missing branch definition for gnome-2-20
</para>
</warning>
- <section id="moduleset-syntax-defs-cvsmodule">
- <title>cvsmodule</title>
-
- <para>The <sgmltag class="element">cvsmodule</sgmltag> element
- is now deprecated. The appropriate build system's module should
- be used instead.</para>
-
- <para>The <sgmltag class="element">cvsmodule</sgmltag> element
- is used to define a module that is to be built from
- CVS.</para>
-
- <programlisting>
- <cvsmodule module="<replaceable>modulename</replaceable>"
- [ revision="<replaceable>branch-or-tag</replaceable>" ]
- [ checkoutdir="<replaceable>directory</replaceable>" ]
- [ root="<replaceable>rootname</replaceable>" ]
- [ autogenargs="<replaceable>autogenargs</replaceable>" ]
- [ makeargs="<replaceable>makeargs</replaceable>" ]
- [ supports-non-srcdir-builds="<replaceable>yes|no</replaceable>" ]>
- <dependencies>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </dependencies>
- <suggests>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </suggests>
- <after>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- >
- </cvsmodule>
-</programlisting>
-
- <para>The <sgmltag class="attribute">module</sgmltag>,
- <sgmltag class="attribute">revision</sgmltag> and <sgmltag
- class="attribute">root</sgmltag> attributes identify the
- module to check out from CVS. The <sgmltag
- class="attribute">checkoutdir</sgmltag> attribute can be used
- to specify an alternative directory to check out to (by
- default, the value of <sgmltag
- class="attribute">module</sgmltag> is used).</para>
-
- <para>The <sgmltag class="attribute">autogenargs</sgmltag>,
- <sgmltag class="attribute">makeargs</sgmltag> and <sgmltag
- class="attribute">supports-non-srcdir-builds</sgmltag>
- attributes are common to many different module types. The
- <sgmltag class="attribute">autogenargs</sgmltag> attribute
- lists additional arguments to be passed to
- <command>autogen.sh</command>, and <sgmltag
- class="attribute">makeargs</sgmltag> lists additional
- arguments to be passed to <command>make</command>. The
- <sgmltag
- class="attribute">supports-non-srcdir-builds</sgmltag>
- attribute is used to mark modules that can't be cleanly built
- using a separate source directory.</para>
-
- <para>The <sgmltag class="element">dependencies</sgmltag>,
- <sgmltag class="element">suggests</sgmltag> and
- <sgmltag class="element">after</sgmltag> elements are processed
- as for <link
- linkend="moduleset-syntax-defs-autotools">autotools</link>.
- </para>
-
- </section>
-
- <section id="moduleset-syntax-defs-svnmodule">
- <title>svnmodule</title>
-
- <para>The <sgmltag class="element">svnmodule</sgmltag> element
- is now deprecated. The appropriate build system's module should
- be used instead.</para>
-
- <para>The <sgmltag class="element">svnmodule</sgmltag> element
- is used to define a module that is to be built from
- Subversion.</para>
-
- <programlisting>
- <svnmodule module="<replaceable>modulename</replaceable>"
- [ checkoutdir="<replaceable>directory</replaceable>" ]
- [ root="<replaceable>rootname</replaceable>" ]
- [ autogenargs="<replaceable>autogenargs</replaceable>" ]
- [ makeargs="<replaceable>makeargs</replaceable>" ]
- [ supports-non-srcdir-builds="<replaceable>yes|no</replaceable>" ]>
- <dependencies>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </dependencies>
- <suggests>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </suggests>
- <after>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </after>
- </svnmodule>
-</programlisting>
- <para>The <sgmltag class="attribute">module</sgmltag>
- attribute gives the path of the module relative to the
- repository URI. All other options for this element are
- processed as for <link
- linkend="moduleset-syntax-defs-cvsmodule"><sgmltag
- class="element">cvsmodule</sgmltag></link>.</para>
- </section>
-
- <section id="moduleset-syntax-defs-archmodule">
- <title>archmodule</title>
-
- <para>The <sgmltag class="element">archmodule</sgmltag> element
- is now deprecated. The appropriate build system's module should
- be used instead.</para>
-
- <para>The <sgmltag class="element">archmodule</sgmltag> element
- is used to define a module that is to be built from
- a GNU Arch archive.</para>
-
- <programlisting>
- <archmodule version="<replaceable>modulename</replaceable>"
- [ checkoutdir="<replaceable>directory</replaceable>" ]
- [ root="<replaceable>rootname</replaceable>" ]
- [ autogenargs="<replaceable>autogenargs</replaceable>" ]
- [ makeargs="<replaceable>makeargs</replaceable>" ]
- [ supports-non-srcdir-builds="<replaceable>yes|no</replaceable>" ]>
- <dependencies>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </dependencies>
- <suggests>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </suggests>
- <after>
- <dep package="<replaceable>modulename</replaceable>"/>
- ...
- </after>
- </archmodule>
-</programlisting>
- <para>The <sgmltag class="attribute">version</sgmltag>
- attribute gives the version to be checked out from the archive
- specified by <sgmltag class="attribute">root</sgmltag>. All
- other options for this element are processed as for <link
- linkend="moduleset-syntax-defs-cvsmodule"><sgmltag
- class="element">cvsmodule</sgmltag></link>.</para>
- </section>
-
<section id="moduleset-syntax-defs-tarball">
<title>tarball</title>
<important>
- <para>The <sgmltag class="element">tarball</sgmltag> element
- is now deprecated. The appropriate build type module should
- be used instead. As a transitive measure this element has
- however been reimplemented as a thin wrapper around both <sgmltag
- class="element">autotools</sgmltag> module type and <sgmltag
- class="element">tarball</sgmltag> repository type.
+ <para>This deprecated element is just a thin wrapper
+ around both <sgmltag class="element">autotools</sgmltag> module type
+ and <sgmltag class="element">tarball</sgmltag> repository type.
</para>
</important>
@@ -2741,13 +2592,14 @@ libgnomecanvas is missing branch definition for gnome-2-20
for the <sgmltag class="attribute">file</sgmltag> attribute to
specify a URI, in which case it will be downloaded from that location.
</para>
-
- <para>The other attributes and the <sgmltag
- class="element">dependencies</sgmltag> and <sgmltag
- class="element">suggests</sgmltag> sub-elements are processed
- as for <link
- linkend="moduleset-syntax-defs-cvsmodule"><sgmltag
- class="element">cvsmodule</sgmltag></link>.</para>
+
+
+ <para>
+ The other attributes and the <sgmltag class="element">dependencies</sgmltag>,
+ <sgmltag class="element">suggests</sgmltag> and <sgmltag
+ class="element">after</sgmltag> elements are processed as for <link
+ linkend="moduleset-syntax-defs-autotools">autotools</link>.
+ </para>
</section>
</section> <!-- end of deprecated module types -->
</section> <!-- end of deprecated elements -->
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 6339b79..aaeddc2 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -386,124 +386,3 @@ def parse_autotools(node, config, uri, repositories, default_repo):
check_target=check_target)
register_module_type('autotools', parse_autotools)
-
-# deprecated module types below:
-def parse_cvsmodule(node, config, uri, repositories, default_repo):
- id = node.getAttribute('id')
- module = None
- revision = None
- checkoutdir = None
- autogenargs = ''
- makeargs = ''
- supports_non_srcdir_builds = True
- if node.hasAttribute('module'):
- module = node.getAttribute('module')
- if node.hasAttribute('revision'):
- revision = node.getAttribute('revision')
- if node.hasAttribute('checkoutdir'):
- checkoutdir = node.getAttribute('checkoutdir')
- if node.hasAttribute('autogenargs'):
- autogenargs = node.getAttribute('autogenargs')
- if node.hasAttribute('makeargs'):
- makeargs = node.getAttribute('makeargs')
- if node.hasAttribute('supports-non-srcdir-builds'):
- supports_non_srcdir_builds = \
- (node.getAttribute('supports-non-srcdir-builds') != 'no')
-
- if not id:
- id = checkoutdir or module
-
- dependencies, after, suggests = get_dependencies(node)
-
- for attrname in ['cvsroot', 'root']:
- if node.hasAttribute(attrname):
- try:
- repo = repositories[node.getAttribute(attrname)]
- break
- except KeyError:
- raise FatalError(_('Repository=%s not found for module id=%s. '
- 'Possible repositories are %s')
- % (node.getAttribute(attrname),
- node.getAttribute('id'), repositories))
- else:
- repo = repositories.get(default_repo, None)
- branch = repo.branch(id, module=module, checkoutdir=checkoutdir,
- revision=revision)
-
- return AutogenModule(id, branch, autogenargs, makeargs,
- dependencies=dependencies,
- after=after, suggests=suggests,
- supports_non_srcdir_builds=supports_non_srcdir_builds)
-register_module_type('cvsmodule', parse_cvsmodule)
-
-def parse_svnmodule(node, config, uri, repositories, default_repo):
- id = node.getAttribute('id')
- module = None
- checkoutdir = None
- autogenargs = ''
- makeargs = ''
- supports_non_srcdir_builds = True
- if node.hasAttribute('module'):
- module = node.getAttribute('module')
- if node.hasAttribute('checkoutdir'):
- checkoutdir = node.getAttribute('checkoutdir')
- if node.hasAttribute('autogenargs'):
- autogenargs = node.getAttribute('autogenargs')
- if node.hasAttribute('makeargs'):
- makeargs = node.getAttribute('makeargs')
- if node.hasAttribute('supports-non-srcdir-builds'):
- supports_non_srcdir_builds = \
- (node.getAttribute('supports-non-srcdir-builds') != 'no')
-
- if not id:
- id = checkoutdir or os.path.basename(module)
-
- dependencies, after, suggests = get_dependencies(node)
-
- if node.hasAttribute('root'):
- repo = repositories[node.getAttribute('root')]
- else:
- repo = repositories.get(default_repo, None)
- branch = repo.branch(id, module=module, checkoutdir=checkoutdir)
-
- return AutogenModule(id, branch, autogenargs, makeargs,
- dependencies=dependencies,
- after=after, suggests=suggests,
- supports_non_srcdir_builds=supports_non_srcdir_builds)
-register_module_type('svnmodule', parse_svnmodule)
-
-def parse_archmodule(node, config, uri, repositories, default_repo):
- id = node.getAttribute('id')
- version = None
- checkoutdir = None
- autogenargs = ''
- makeargs = ''
- supports_non_srcdir_builds = True
- if node.hasAttribute('version'):
- version = node.getAttribute('version')
- if node.hasAttribute('checkoutdir'):
- checkoutdir = node.getAttribute('checkoutdir')
- if node.hasAttribute('autogenargs'):
- autogenargs = node.getAttribute('autogenargs')
- if node.hasAttribute('makeargs'):
- makeargs = node.getAttribute('makeargs')
- if node.hasAttribute('supports-non-srcdir-builds'):
- supports_non_srcdir_builds = \
- (node.getAttribute('supports-non-srcdir-builds') != 'no')
-
- if not id:
- id = checkoutdir or version
-
- dependencies, after, suggests = get_dependencies(node)
-
- if node.hasAttribute('root'):
- repo = repositories[node.getAttribute('root')]
- else:
- repo = repositories.get(default_repo, None)
- branch = repo.branch(id, module=version, checkoutdir=checkoutdir)
-
- return AutogenModule(id, branch, autogenargs, makeargs,
- dependencies=dependencies,
- after=after, suggests=suggests,
- supports_non_srcdir_builds=supports_non_srcdir_builds)
-register_module_type('archmodule', parse_archmodule)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
