[Erp5-report] r32893 nicolas.dumazet - in /erp5/trunk/buildout: recipes/erp5.recipe.openoff...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 22 07:00:46 CET 2010
Author: nicolas.dumazet
Date: Mon Feb 22 07:00:46 2010
New Revision: 32893
URL: http://svn.erp5.org?rev=32893&view=rev
Log:
We need different binaries depending on the architecture
Added:
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/setup.py
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/__init__.py
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/__init__.py
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/
erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/__init__.py
Modified:
erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
Added: erp5/trunk/buildout/recipes/erp5.recipe.openoffice/setup.py
URL: http://svn.erp5.org/erp5/trunk/buildout/recipes/erp5.recipe.openoffice/setup.py?rev=32893&view=auto
==============================================================================
--- erp5/trunk/buildout/recipes/erp5.recipe.openoffice/setup.py (added)
+++ erp5/trunk/buildout/recipes/erp5.recipe.openoffice/setup.py [utf8] Mon Feb 22 07:00:46 2010
@@ -1,0 +1,27 @@
+from setuptools import setup, find_packages
+
+name = "erp5.recipe.openoffice"
+version = '0.1'
+
+setup(
+ name = name,
+ version = version,
+ author = "Nicolas Dumazet",
+ author_email = "nicolas.dumazet at nexedi.com",
+ description = "ZC Buildout recipe to install openoffice",
+ license = "ZPL 2.1",
+ keywords = "openoffice buildout",
+ classifiers=[
+ "License :: OSI Approved :: Zope Public License",
+ "Framework :: Buildout",
+ ],
+ packages = find_packages('src'),
+ include_package_data = True,
+ package_dir = {'':'src'},
+ namespace_packages = ['erp5', 'erp5.recipe'],
+ install_requires = [
+ 'z3c.recipe.openoffice',
+ ],
+ zip_safe=False,
+ entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
+ )
Added: erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/__init__.py?rev=32893&view=auto
==============================================================================
--- erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/__init__.py (added)
+++ erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/__init__.py [utf8] Mon Feb 22 07:00:46 2010
@@ -1,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+ __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
Added: erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/__init__.py
URL: http://svn.erp5.org/erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/__init__.py?rev=32893&view=auto
==============================================================================
--- erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/__init__.py (added)
+++ erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/__init__.py [utf8] Mon Feb 22 07:00:46 2010
@@ -1,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+ __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
Added: erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/__init__.py
URL: http://svn.erp5.org/erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/__init__.py?rev=32893&view=auto
==============================================================================
--- erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/__init__.py (added)
+++ erp5/trunk/buildout/recipes/erp5.recipe.openoffice/src/erp5/recipe/openoffice/__init__.py [utf8] Mon Feb 22 07:00:46 2010
@@ -1,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+# Copyright (c) 2006-2008 Zope Corporation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import z3c.recipe.openoffice.recipe as original
+import platform
+
+class Recipe(original.Recipe):
+ """
+ Wrap z3c.recipe.openoffice to allow selecting the architecture
+ """
+ def __init__(self, buildout, name, options):
+ machine = platform.uname()[-2]
+ if machine in ('i386', 'i586', 'i686'):
+ target = 'x86_32'
+ elif machine == 'x86_64':
+ target = 'x86_64'
+ else:
+ raise ValueError('Unknown machine')
+
+ options['download-url'] = options['download-%s' % target]
+ original.Recipe.__init__(self, buildout, name, options)
Modified: erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/openoffice-bin.cfg?rev=32893&r1=32892&r2=32893&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] Mon Feb 22 07:00:46 2010
@@ -1,13 +1,17 @@
[buildout]
parts =
openoffice-bin
+develop =
+ recipes/erp5.recipe.openoffice
[openoffice-bin]
-recipe = z3c.recipe.openoffice
+recipe = erp5.recipe.openoffice
install-pyuno-egg = no
hack-openoffice-python = no
-download-url =
+download-x86_64 =
http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_LinuxX86-64_install_wJRE_en-US.tar.gz
+download-x86_32 =
+ http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_LinuxIntel_install_wJRE_en-US.tar.gz
unpack-name = OOO320_m12_native_packed-1_en-US.9483
# below version is internally used in recipe
version = 3
More information about the Erp5-report
mailing list