Commit 00981561 authored by Gabriel Monnerat's avatar Gabriel Monnerat

rename REAME to REAME.txt. Add CHANGES.txt. Remove all attributes not used in cloudooo.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@37963 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4f97caf7
1.0.8
=====
- Remove entry points, treat those as ordinary files.
- Search all script files using pkg_resources.
...@@ -75,16 +75,6 @@ def application(global_config, **local_config): ...@@ -75,16 +75,6 @@ def application(global_config, **local_config):
cloudooo_path_tmp_dir = path.join(path_dir_run_cloudooo, 'tmp') cloudooo_path_tmp_dir = path.join(path_dir_run_cloudooo, 'tmp')
if not path.exists(cloudooo_path_tmp_dir): if not path.exists(cloudooo_path_tmp_dir):
mkdir(cloudooo_path_tmp_dir) mkdir(cloudooo_path_tmp_dir)
# it extracts the path of cloudooo scripts from pkg_resources
cloudooo_resources = pkg_resources.get_distribution('cloudooo')
console_scripts = cloudooo_resources.get_entry_map()['console_scripts']
unomimemapper_bin = path.join(path.dirname(executable),
console_scripts["unomimemapper"].name)
unoconverter_bin = path.join(path.dirname(executable),
console_scripts["unoconverter"].name)
openoffice_tester_bin = path.join(path.dirname(executable),
console_scripts["openoffice_tester"].name)
# The Xvfb will run in the same local of the OpenOffice # The Xvfb will run in the same local of the OpenOffice
application_hostname = local_config.get('application_hostname') application_hostname = local_config.get('application_hostname')
openoffice_port = int(local_config.get('openoffice_port')) openoffice_port = int(local_config.get('openoffice_port'))
...@@ -103,11 +93,7 @@ def application(global_config, **local_config): ...@@ -103,11 +93,7 @@ def application(global_config, **local_config):
path_dir_run_cloudooo, path_dir_run_cloudooo,
local_config.get('virtual_display_id'), local_config.get('virtual_display_id'),
local_config.get('office_bin_path'), local_config.get('office_bin_path'),
local_config.get('uno_path'), local_config.get('uno_path'))
unoconverter_bin=unoconverter_bin,
python_path=executable,
unomimemapper_bin=unomimemapper_bin,
openoffice_tester_bin=openoffice_tester_bin)
openoffice.start() openoffice.start()
monitor.load(local_config) monitor.load(local_config)
...@@ -118,15 +104,11 @@ def application(global_config, **local_config): ...@@ -118,15 +104,11 @@ def application(global_config, **local_config):
# Load all filters # Load all filters
openoffice.acquire() openoffice.acquire()
mimemapper.loadFilterList(application_hostname, mimemapper.loadFilterList(application_hostname,
openoffice_port, openoffice_port)
unomimemapper_bin=unomimemapper_bin,
python_path=executable)
openoffice.release() openoffice.release()
from manager import Manager from manager import Manager
timeout_response = int(local_config.get('timeout_response')) timeout_response = int(local_config.get('timeout_response'))
kw = dict(timeout=timeout_response, kw = dict(timeout=timeout_response)
unoconverter_bin=unoconverter_bin,
python_path=executable)
cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw) cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw)
return WSGIXMLRPCApplication(instance=cloudooo_manager) return WSGIXMLRPCApplication(instance=cloudooo_manager)
from setuptools import setup, find_packages from setuptools import setup, find_packages
from os import path
version = '1.0.7' version = '1.0.8'
folder_path = path.abspath(path.dirname(__file__)) + "/cloudooo"
long_description = "%s\n%s" % (open(path.join(folder_path, "README.txt")).read(),
open(path.join(folder_path, "CHANGES.txt")).read())
setup(name='cloudooo', setup(name='cloudooo',
version=version, version=version,
description="XML-RPC openoffice document convertion server", description="XML-RPC openoffice document convertion server",
long_description=open("./cloudooo/README").read(), long_description=long_description,
classifiers=["Topic :: System :: Networking", classifiers=["Topic :: System :: Networking",
"Topic :: System :: Operating System Kernels :: Linux", "Topic :: System :: Operating System Kernels :: Linux",
"Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment