[Python-apps-commits] r7874 - in packages/openerp6/trunk (5 files)
xnox-guest at users.alioth.debian.org
xnox-guest at users.alioth.debian.org
Tue Nov 29 20:06:05 UTC 2011
Date: Tuesday, November 29, 2011 @ 20:06:02
Author: xnox-guest
Revision: 7874
Forget about distutils
Added:
packages/openerp6/trunk/debian/install
Modified:
packages/openerp6/trunk/debian/ (properties)
packages/openerp6/trunk/debian/patches/series
packages/openerp6/trunk/debian/rules
Deleted:
packages/openerp6/trunk/debian/patches/debian_setup.patch
Added: packages/openerp6/trunk/debian/install
===================================================================
--- packages/openerp6/trunk/debian/install (rev 0)
+++ packages/openerp6/trunk/debian/install 2011-11-29 20:06:02 UTC (rev 7874)
@@ -0,0 +1,3 @@
+debian/local/config /usr/share/openerp6-server
+pixmaps /usr/share/openerp6-server
+bin /usr/share/openerp6-server
Deleted: packages/openerp6/trunk/debian/patches/debian_setup.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/debian_setup.patch 2011-11-29 02:19:54 UTC (rev 7873)
+++ packages/openerp6/trunk/debian/patches/debian_setup.patch 2011-11-29 20:06:02 UTC (rev 7874)
@@ -1,270 +0,0 @@
-=== modified file 'MANIFEST.in'
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -1,20 +1,2 @@
--include rpminstall_sh.txt
--include README
--include LICENSE
--include MANIFEST.in
--include setup.nsi
--include setup.cfg
--include bin/import_xml.rng
--include bin/server.cert
--include bin/server.pkey
--include bin/gpl.txt
--include man/openerp-server.1
--include man/openerp_serverrc.5
--recursive-include pixmaps *
--recursive-include win32 *
--recursive-include doc *
--recursive-include bin *xml *xsl *sql *rml *sxw *csv *rng
--graft debian
--graft bin/addons
--graft python25-compat
--global-exclude *pyc *~
-+global-include *
-+global-exclude LICENSE
---- a/setup.py
-+++ b/setup.py
-@@ -28,181 +28,14 @@
-
- import sys
- import os
--from os.path import join, isfile, basename
--import glob
-+from os.path import join
-
--from pprint import pprint as pp
--
--from setuptools import setup, find_packages
--from setuptools.command.install import install
--from distutils.sysconfig import get_python_lib
--
--has_py2exe = False
--py2exe_keywords = {}
--if os.name == 'nt':
-- import py2exe
-- has_py2exe = True
-- py2exe_keywords['console'] = [
-- { "script": join("bin", "openerp-server.py"),
-- "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))]
-- }]
-- py2exe_keywords['options'] = {
-- "py2exe": {
-- "compressed": 1,
-- "optimize": 2,
-- "dist_dir": 'dist',
-- "packages": [
-- "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
-- "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
-- "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-- "pydot", "asyncore","asynchat", "reportlab", "vobject",
-- "HTMLParser", "select", "mako", "poplib",
-- "imaplib", "smtplib", "email", "yaml", "DAV",
-- "uuid", "commands",
-- ],
-- "excludes" : ["Tkconstants","Tkinter","tcl"],
-- }
-- }
-+from setuptools import setup
-
- sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin"))
-
- execfile(join('bin', 'release.py'))
-
--if 'bdist_rpm' in sys.argv:
-- version = version.split('-')[0]
--
--# get python short version
--py_short_version = '%s.%s' % sys.version_info[:2]
--
--# backports os.walk with followlinks from python 2.6
--def walk_followlinks(top, topdown=True, onerror=None, followlinks=False):
-- from os.path import join, isdir, islink
-- from os import listdir, error
--
-- try:
-- names = listdir(top)
-- except error, err:
-- if onerror is not None:
-- onerror(err)
-- return
--
-- dirs, nondirs = [], []
-- for name in names:
-- if isdir(join(top, name)):
-- dirs.append(name)
-- else:
-- nondirs.append(name)
--
-- if topdown:
-- yield top, dirs, nondirs
-- for name in dirs:
-- path = join(top, name)
-- if followlinks or not islink(path):
-- for x in walk_followlinks(path, topdown, onerror, followlinks):
-- yield x
-- if not topdown:
-- yield top, dirs, nondirs
--
--if sys.version_info < (2, 6):
-- os.walk = walk_followlinks
--
--def find_addons():
-- for root, _, names in os.walk(join('bin', 'addons'), followlinks=True):
-- if '__openerp__.py' in names or '__terp__.py' in names:
-- yield basename(root), root
-- #look for extra modules
-- try:
-- empath = os.getenv('EXTRA_MODULES_PATH', '../addons/')
-- for mname in open(join(empath, 'server_modules.list')):
-- mname = mname.strip()
-- if not mname:
-- continue
--
-- terp = join(empath, mname, '__openerp__.py')
-- if not os.path.exists(terp):
-- terp = join(empath, mname, '__terp__.py')
--
-- if os.path.exists(terp):
-- yield mname, join(empath, mname)
-- else:
-- print "Module %s specified, but no valid path." % mname
-- except Exception:
-- pass
--
--def data_files():
-- '''Build list of data files to be installed'''
-- files = []
-- if os.name == 'nt':
-- os.chdir('bin')
-- for (dp, dn, names) in os.walk('addons'):
-- files.append((dp, map(lambda x: join('bin', dp, x), names)))
-- os.chdir('..')
-- #for root, _, names in os.walk(join('bin','addons')):
-- # files.append((root, [join(root, name) for name in names]))
-- for root, _, names in os.walk('doc'):
-- files.append((root, [join(root, name) for name in names]))
-- #for root, _, names in os.walk('pixmaps'):
-- # files.append((root, [join(root, name) for name in names]))
-- files.append(('.', [join('bin', 'import_xml.rng'),]))
-- else:
-- man_directory = join('share', 'man')
-- files.append((join(man_directory, 'man1'), ['man/openerp-server.1']))
-- files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5']))
--
-- doc_directory = join('share', 'doc', 'openerp-server-%s' % version)
-- files.append((doc_directory, filter(isfile, glob.glob('doc/*'))))
-- files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'),
-- filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*'))))
-- files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'),
-- filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*'))))
--
-- openerp_site_packages = join(get_python_lib(prefix=''), 'openerp-server')
--
-- files.append((openerp_site_packages, [join('bin', 'import_xml.rng'),]))
--
-- if sys.version_info[0:2] == (2,5):
-- files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'),
-- join('python25-compat','SimpleXMLRPCServer.py'),
-- join('python25-compat','SocketServer.py')]))
--
-- for addonname, add_path in find_addons():
-- addon_path = join(get_python_lib(prefix=''), 'openerp-server','addons', addonname)
-- for root, dirs, innerfiles in os.walk(add_path):
-- innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles)
-- if innerfiles:
-- res = os.path.normpath(join(addon_path, root.replace(join(add_path), '.')))
-- files.extend(((res, map(lambda fil: join(root, fil),
-- innerfiles)),))
--
-- return files
--
--f = file('openerp-server','w')
--f.write("""#!/bin/sh
--echo "Error: the content of this file should have been replaced during "
--echo "installation\n"
--exit 1
--""")
--f.close()
--
--def find_package_dirs():
-- package_dirs = {'openerp-server': 'bin'}
-- for mod, path in find_addons():
-- package_dirs['openerp-server.addons.' + mod] = path
-- return package_dirs
--
--class openerp_server_install(install):
-- def run(self):
-- # create startup script
-- start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\
-- % (join(self.install_libbase, "openerp-server"), sys.executable)
-- # write script
-- f = open('openerp-server', 'w')
-- f.write(start_script)
-- f.close()
-- install.run(self)
--
--
--
-
- setup(name = name,
- version = version,
-@@ -213,20 +46,9 @@
- author_email = author_email,
- classifiers = filter(None, classifiers.split("\n")),
- license = license,
-- data_files = data_files(),
-- cmdclass = {
-- 'install' : openerp_server_install,
-- },
-- scripts = ['openerp-server'],
-- packages = [
-- '.'.join(['openerp-server'] + package.split('.')[1:])
-- for package in find_packages()
-- ],
-+ packages = ['openerp6-server'],
-+ package_dir = {'openerp6-server': 'bin'},
- include_package_data = True,
-- package_data = {
-- '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'],
-- },
-- package_dir = find_package_dirs(),
- install_requires = [
- 'lxml',
- 'mako',
-@@ -244,34 +66,5 @@
- extras_require={
- 'SSL' : ['pyopenssl'],
- },
-- **py2exe_keywords
- )
-
--if has_py2exe:
-- # Sometime between pytz-2008a and pytz-2008i common_timezones started to
-- # include only names of zones with a corresponding data file in zoneinfo.
-- # pytz installs the zoneinfo directory tree in the same directory
-- # as the pytz/__init__.py file. These data files are loaded using
-- # pkg_resources.resource_stream. py2exe does not copy this to library.zip so
-- # resource_stream can't find the files and common_timezones is empty when
-- # read in the py2exe executable.
-- # This manually copies zoneinfo into the zip. See also
-- # http://code.google.com/p/googletransitdatafeed/issues/detail?id=121
-- import pytz
-- import zipfile
-- # Make sure the layout of pytz hasn't changed
-- assert (pytz.__file__.endswith('__init__.pyc') or
-- pytz.__file__.endswith('__init__.py')), pytz.__file__
-- zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo')
-- # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib'
-- disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__))
-- zipfile_path = os.path.join(py2exe_keywords['options']['py2exe']['dist_dir'], 'library.zip')
-- z = zipfile.ZipFile(zipfile_path, 'a')
--
-- for absdir, directories, filenames in os.walk(zoneinfo_dir):
-- assert absdir.startswith(disk_basedir), (absdir, disk_basedir)
-- zip_dir = absdir[len(disk_basedir):]
-- for f in filenames:
-- z.write(os.path.join(absdir, f), os.path.join(zip_dir, f))
--
-- z.close()
Modified: packages/openerp6/trunk/debian/patches/series
===================================================================
--- packages/openerp6/trunk/debian/patches/series 2011-11-29 02:19:54 UTC (rev 7873)
+++ packages/openerp6/trunk/debian/patches/series 2011-11-29 20:06:02 UTC (rev 7874)
@@ -1,4 +1,3 @@
-debian_setup.patch
bin-env-script.patch
manpage-whatis.patch
fix-yaml-import.patch
Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules 2011-11-29 02:19:54 UTC (rev 7873)
+++ packages/openerp6/trunk/debian/rules 2011-11-29 20:06:02 UTC (rev 7874)
@@ -10,16 +10,18 @@
%:
dh $@ --with python2
-override_dh_auto_install:
- dh_auto_install -- --install-lib /usr/share/$(SERVER)
+override_dh_auto_clean override_dh_auto_configure:
+override_dh_auto_build override_dh_auto_install:
+override_dh_auto_test:
override_dh_installdirs:
- dh_installdirs /var/lib/$(SERVER)/filestore /var/lib/$(SERVER)/backup /var/log/$(SERVER)
+ dh_installdirs /var/lib/$(SERVER)/filestore /var/lib/$(SERVER)/backup /var/log/$(SERVER) /usr/share/$(SERVER)/
override_dh_install:
- cp debian/local/config debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER).conf.tpl
- cp -r pixmaps debian/$(SERVER)/usr/share/$(SERVER)
dh_install
+ cd debian/$(SERVER)/usr/share/$(SERVER)/ && \
+ mv config $(SERVER).conf.tpl && \
+ mv bin $(SERVER)
override_dh_installchangelogs:
dh_installchangelogs doc/Changelog
@@ -32,7 +34,7 @@
override_dh_fixperms:
dh_fixperms
find debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/addons -type f -print0 | xargs -0 chmod 0644
- find debian/$(DEB_SOURCE)/usr/share/$(SERVER)/$(SERVER)/addons -name "*.sh" -print0 | xargs -0 chmod 0755
+ find debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/addons -name "*.sh" -print0 | xargs -0 chmod 0755
chmod 755 debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/openerp-server.py
# You can specify local checkout, e.g.
More information about the Python-apps-commits
mailing list