[jhbuild] remove obsolete mozilla module type
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild] remove obsolete mozilla module type
- Date: Sun, 3 May 2009 08:22:33 -0400 (EDT)
commit 209adc4d2b11db549ade1be50a94b3c87c6ba00b
Author: Frederic Peters <fpeters 0d be>
Date: Sun May 3 14:21:57 2009 +0200
remove obsolete mozilla module type
---
jhbuild/modtypes/mozillamodule.py | 209 -------------------------------------
modulesets/gnome-2.10.modules | 5 +-
modulesets/gnome-2.12.modules | 5 +-
modulesets/gnome-2.14.modules | 5 +-
modulesets/gnome-2.16.modules | 5 +-
modulesets/moduleset.dtd | 14 +---
modulesets/moduleset.rnc | 12 --
7 files changed, 13 insertions(+), 242 deletions(-)
diff --git a/jhbuild/modtypes/mozillamodule.py b/jhbuild/modtypes/mozillamodule.py
deleted file mode 100644
index 76def3d..0000000
--- a/jhbuild/modtypes/mozillamodule.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# jhbuild - a build script for GNOME 1.x and 2.x
-# Copyright (C) 2001-2006 James Henstridge
-# Copyright (C) 2003-2004 Marco Pesenti Gritti
-#
-# mozillamodule.py: rules for building Mozilla
-#
-# 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 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-__metaclass__ = type
-
-import os
-
-from jhbuild.modtypes import register_module_type, get_dependencies, SkipToState
-from jhbuild.modtypes.autotools import AutogenModule
-from jhbuild.versioncontrol import cvs
-from jhbuild.errors import FatalError, BuildStateError
-
-class MozillaModule(AutogenModule):
- def __init__(self, name, projects, revision, autogenargs='',
- makeargs='', dependencies=[], after=[], suggests=[],
- repository = None, extra_env = None):
- AutogenModule.__init__(self, name, branch=None,
- autogenargs=autogenargs,
- makeargs=makeargs,
- dependencies=dependencies,
- after=after,
- suggests=suggests,
- supports_non_srcdir_builds=False,
- extra_env = extra_env)
- self.repository = repository
- self.revision = revision
- self.projects = projects
- os.environ['MOZ_CO_PROJECT'] = projects
-
- def get_srcdir(self, buildscript):
- return os.path.join(buildscript.config.checkoutroot, 'mozilla')
- def get_revision(self):
- return self.revision
-
- def get_mozilla_app(self):
- if self.projects == 'browser':
- return 'firefox'
- elif self.projects == 'xulrunner':
- return 'xulrunner'
- else:
- return 'mozilla'
-
- def get_mozilla_ver(self, buildscript):
- if self.projects == 'browser':
- filename = os.path.join(self.get_builddir(buildscript),
- 'browser', 'config', 'version.txt')
- else:
- filename = os.path.join(self.get_builddir(buildscript),
- 'config', 'milestone.txt')
- fp = open(filename, 'r')
- for line in fp.readlines():
- if line[0] not in ('#', '\0', '\n'):
- return line.strip()
- else:
- raise FatalError(_('could not determine mozilla version'))
-
- def checkout(self, buildscript):
- buildscript.set_action(_('Checking out'), self)
- cmd = ['cvs', '-z3', '-q', '-d', self.repository.cvsroot, 'checkout']
- if self.revision:
- cmd.extend(['-r', self.revision])
- else:
- cmd.append('-A')
- if buildscript.config.sticky_date:
- cmd.extend(['-D', buildscript.config.sticky_date])
- cmd.append('mozilla/client.mk')
- buildscript.execute(cmd, cwd = buildscript.config.checkoutroot)
-
- make = os.environ.get('MAKE', 'make')
- buildscript.execute([make, '-f', 'client.mk', 'checkout'],
- cwd = self.get_builddir(buildscript),
- extra_env = self.extra_env)
-
- def do_checkout(self, buildscript):
- checkoutdir = self.get_builddir(buildscript)
- client_mk = os.path.join(checkoutdir, 'client.mk')
- if not os.path.exists(client_mk) or \
- cvs.check_sticky_tag(client_mk) != self.revision:
- self.checkout(buildscript)
- else:
- buildscript.set_action(_('Updating'), self)
- make = os.environ.get('MAKE', 'make')
- buildscript.execute([make, '-f', 'client.mk', 'fast-update'],
- cwd = checkoutdir,
- extra_env = self.extra_env)
-
- # did the checkout succeed?
- if not os.path.exists(checkoutdir):
- raise BuildStateError(_('source directory %s was not created')
- % checkoutdir)
-
- if self.check_build_policy(buildscript):
- raise SkipToState(self.STATE_DONE)
- do_checkout.next_state = AutogenModule.STATE_CONFIGURE
- do_checkout.error_states = [AutogenModule.STATE_FORCE_CHECKOUT]
-
- def do_force_checkout(self, buildscript):
- self.checkout(buildscript)
- do_force_checkout.next_state = AutogenModule.STATE_CONFIGURE
- do_force_checkout.error_states = [AutogenModule.STATE_FORCE_CHECKOUT]
-
- def do_configure(self, buildscript):
- checkoutdir = self.get_builddir(buildscript)
- buildscript.set_action(_('Configuring'), self)
- if buildscript.config.use_lib64:
- mozilla_path = '%s/lib64/%s-%s' \
- % (buildscript.config.prefix,
- self.get_mozilla_app(),
- self.get_mozilla_ver(buildscript))
- else:
- mozilla_path = '%s/lib/%s-%s' \
- % (buildscript.config.prefix,
- self.get_mozilla_app(),
- self.get_mozilla_ver(buildscript))
-
- cmd = './configure --prefix %s ' % buildscript.config.prefix
- if buildscript.config.use_lib64:
- cmd += " --libdir '${exec_prefix}/lib64'"
- cmd += ' --with-default-mozilla-five-home=%s' % mozilla_path
- cmd += ' %s' % self.autogenargs
-
- if self.projects:
- cmd += ' --enable-application=%s' % self.projects
- buildscript.execute(cmd, cwd = checkoutdir,
- extra_env = self.extra_env)
- do_configure.next_state = AutogenModule.STATE_BUILD
- do_configure.error_states = [AutogenModule.STATE_FORCE_CHECKOUT]
-
- def do_install(self, buildscript):
- buildscript.set_action(_('Installing'), self)
- make = os.environ.get('MAKE', 'make')
- cmd = '%s %s %s install' % (make, buildscript.config.makeargs,
- self.makeargs)
- buildscript.execute(cmd, cwd = self.get_builddir(buildscript),
- extra_env = self.extra_env)
- nssdir = '%s/include/%s-%s/nss' % (
- buildscript.config.prefix,
- self.get_mozilla_app(),
- self.get_mozilla_ver(buildscript))
- if not os.path.exists(nssdir):
- buildscript.execute(['mkdir', nssdir])
-
- cmd = ['find', '%s/security/nss/lib/' % self.get_builddir(buildscript),
- '-name', '*.h', '-type', 'f', '-exec', '/bin/cp', '{}',
- '%s/' % nssdir, ';']
- buildscript.execute(cmd, cwd=self.get_builddir(buildscript))
- buildscript.packagedb.add(self.name, self.get_revision() or '')
- do_install.next_state = AutogenModule.STATE_DONE
- do_install.error_states = []
-
- def xml_tag_and_attrs(self):
- # NB, we don't do cvsroot or revision. That should probably be
- # done with branches.
- return 'mozillamodule', [('id', 'name', None),
- ('autogenargs', 'autogenargs', ''),
- ('makeargs', 'makeargs', '')]
-
-def parse_mozillamodule(node, config, uri, repositories, default_repo):
- name = node.getAttribute('id')
- projects = node.getAttribute('projects')
- revision = None
- autogenargs = ''
- makeargs = ''
- dependencies = []
- if node.hasAttribute('revision'):
- revision = node.getAttribute('revision')
- if node.hasAttribute('autogenargs'):
- autogenargs = node.getAttribute('autogenargs')
- if node.hasAttribute('makeargs'):
- makeargs = node.getAttribute('makeargs')
-
- # override revision tag if requested.
- revision = config.branches.get(name, revision)
-
- autogenargs += ' ' + config.module_autogenargs.get(name, config.autogenargs)
- makeargs += ' ' + config.module_makeargs.get(name, config.makeargs)
-
- extra_env = config.module_extra_env.get(id)
- dependencies, after, suggests = get_dependencies(node)
-
- for attrname in ['cvsroot', 'root']:
- if node.hasAttribute(attrname):
- repo = repositories[node.getAttribute(attrname)]
- break
- else:
- repo = repositories.get(default_repo, None)
-
- return MozillaModule(name, projects, revision, autogenargs, makeargs,
- dependencies, after, suggests, repo,
- extra_env = extra_env)
-
-register_module_type('mozillamodule', parse_mozillamodule)
diff --git a/modulesets/gnome-2.10.modules b/modulesets/gnome-2.10.modules
index 527d369..851fde8 100644
--- a/modulesets/gnome-2.10.modules
+++ b/modulesets/gnome-2.10.modules
@@ -1158,11 +1158,12 @@
<dep package="libgnomeui"/>
</dependencies>
</autotools>
- <mozillamodule id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2" cvsroot="mozilla.org" revision="MOZILLA_1_7_BRANCH">
+ <autotools id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2">
+ <branch repo="mozilla.org" revision="MOZILLA_1_7_BRANCH"/>
<dependencies>
<dep package="gtk+"/>
</dependencies>
- </mozillamodule>
+ </autotools>
<autotools id="epiphany">
<branch revision="gnome-2-10"/>
<dependencies>
diff --git a/modulesets/gnome-2.12.modules b/modulesets/gnome-2.12.modules
index b4fca97..bc64fee 100644
--- a/modulesets/gnome-2.12.modules
+++ b/modulesets/gnome-2.12.modules
@@ -1255,11 +1255,12 @@
<dep package="libgnomeui"/>
</dependencies>
</autotools>
- <mozillamodule id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser" cvsroot="mozilla.org" revision="MOZILLA_1_7_BRANCH">
+ <autotools id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser">
+ <branch repo="mozilla.org" revision="MOZILLA_1_7_BRANCH"/>
<dependencies>
<dep package="gtk+"/>
</dependencies>
- </mozillamodule>
+ </autotools>
<autotools id="epiphany">
<branch revision="gnome-2-12"/>
<dependencies>
diff --git a/modulesets/gnome-2.14.modules b/modulesets/gnome-2.14.modules
index 078aa03..3529b21 100644
--- a/modulesets/gnome-2.14.modules
+++ b/modulesets/gnome-2.14.modules
@@ -1446,11 +1446,12 @@
<dep package="libgnomeui"/>
</dependencies>
</autotools>
- <mozillamodule id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser" cvsroot="mozilla.org" revision="MOZILLA_1_7_BRANCH">
+ <autotools id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser">
+ <branch repo="mozilla.org" revision="MOZILLA_1_7_BRANCH"/>
<dependencies>
<dep package="gtk+"/>
</dependencies>
- </mozillamodule>
+ </autotools>
<autotools id="epiphany">
<branch revision="gnome-2-14"/>
<dependencies>
diff --git a/modulesets/gnome-2.16.modules b/modulesets/gnome-2.16.modules
index a6d0674..aa6ca66 100644
--- a/modulesets/gnome-2.16.modules
+++ b/modulesets/gnome-2.16.modules
@@ -1523,11 +1523,12 @@
<dep package="libgnomeui"/>
</dependencies>
</autotools>
- <mozillamodule id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=xulrunner --disable-javaxpcom --enable-extensions=default,cookie,permissions,spellcheck" cvsroot="mozilla.org" revision="MOZILLA_1_8_BRANCH" projects="xulrunner">
+ <autotools id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=xulrunner --disable-javaxpcom --enable-extensions=default,cookie,permissions,spellcheck">
+ <branch repo="mozilla.org" revision="MOZILLA_1_8_BRANCH"/>
<dependencies>
<dep package="gtk+"/>
</dependencies>
- </mozillamodule>
+ </autotools>
<autotools id="enchant">
<branch repo="anoncvs.abisource.com"/>
<dependencies>
diff --git a/modulesets/moduleset.dtd b/modulesets/moduleset.dtd
index 7116874..c7bf8af 100644
--- a/modulesets/moduleset.dtd
+++ b/modulesets/moduleset.dtd
@@ -1,4 +1,4 @@
-<!ELEMENT moduleset (repository|include|autotools|metamodule|tarball|mozillamodule|distutils|perl|linux|testmodule|cvsroot|cvsmodule|waf)+>
+<!ELEMENT moduleset (repository|include|autotools|metamodule|tarball|distutils|perl|linux|testmodule|cvsroot|cvsmodule|waf)+>
<!ATTLIST moduleset
name CDATA #IMPLIED>
@@ -68,18 +68,6 @@
autogen-sh CDATA #IMPLIED
supports-non-srcdir-builds (yes|no) "yes">
-<!-- mozillamodule is deprecated, mozilla projects should
- be built using the autotools module type -->
-<!ELEMENT mozillamodule (dependencies?,after?)>
-<!ATTLIST mozillamodule
- id CDATA #REQUIRED
- projects CDATA #IMPLIED
- revision CDATA #IMPLIED
- autogenargs CDATA #IMPLIED
- makeargs CDATA #IMPLIED
- cvsroot CDATA #IMPLIED
- root CDATA #IMPLIED>
-
<!ELEMENT distutils (branch?,dependencies?,after?)>
<!ATTLIST distutils
id ID #REQUIRED
diff --git a/modulesets/moduleset.rnc b/modulesets/moduleset.rnc
index 68382f1..7851954 100644
--- a/modulesets/moduleset.rnc
+++ b/modulesets/moduleset.rnc
@@ -44,7 +44,6 @@ package = autotools |
distutils |
perl |
tarball |
- mozillamodule |
linux
dep = element dep {
@@ -131,17 +130,6 @@ tarball = element tarball {
common)
}
-mozillamodule = element mozillamodule {
- attribute module { text }?,
- attribute revision { text }?,
- attribute checkoutdir { text }?,
- attribute autogenargs { text }?,
- attribute makeargs { text }?,
- attribute cvsroot { text }?,
- attribute root { text }?,
- common
-}
-
kconfig = element kconfig {
attribute repo { text }?,
attribute version { text },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
