[tryton-debian-vcs] tryton-neso branch upstream created. 754bdb5f2c3bedbdb18e57ccb0fe11a6abd845c0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:58 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-neso.git;a=commitdiff;h=754bdb5f2c3bedbdb18e57ccb0fe11a6abd845c0
commit 754bdb5f2c3bedbdb18e57ccb0fe11a6abd845c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:47 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 14afd6f..8d3ccf5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2c8639b..ccf8b70 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: neso
-Version: 2.8.0
+Version: 3.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -14,11 +14,19 @@ Classifier: Environment :: X11 Applications :: GTK
Classifier: Framework :: Tryton
Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-Classifier: Operating System :: OS Independent
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
+Classifier: Natural Language :: Slovak
+Classifier: Natural Language :: Slovenian
+Classifier: Natural Language :: Japanese
+Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/bin/neso b/bin/neso
index 957b1b5..9c443e6 100755
--- a/bin/neso
+++ b/bin/neso
@@ -3,7 +3,6 @@
#this repository contains the full copyright notices and license terms.
import sys
import os
-import logging
import time
import threading
import xmlrpclib
@@ -48,7 +47,7 @@ if os.name == 'mac' or \
os.environ['GTK_IM_MODULE_FILE'] = immodules
import gtk
-from neso.version import *
+from neso.version import VERSION
for i in ('tryton', 'trytond'):
try:
@@ -57,7 +56,7 @@ for i in ('tryton', 'trytond'):
if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
continue
- except: # Exception with py2exe
+ except: # Exception with py2exe
pass
# try for py2exe
DIR = os.path.join(os.path.abspath(os.path.normpath(
@@ -103,7 +102,6 @@ from trytond.pool import Pool
Pool.start()
from trytond.protocols.dispatcher import dispatch
-from trytond.backend import Database
from trytond.exceptions import UserError, UserWarning, NotLogged, \
ConcurrencyException
@@ -130,7 +128,7 @@ class LocalProxy(xmlrpclib.ServerProxy):
try:
return dispatch(*args)
except (UserError, UserWarning, NotLogged,
- ConcurrencyException), exception:
+ ConcurrencyException), exception:
raise TrytonServerError(*exception.args)
except Exception:
tb_s = ''
@@ -163,6 +161,8 @@ class LocalProxy(xmlrpclib.ServerProxy):
rpc.ServerProxy = LocalProxy
CRON_RUNNING = True
+
+
def cron():
threads = {}
while CRON_RUNNING:
@@ -194,6 +194,7 @@ CLIENT_CONFIG.__setitem__('login.port', 8000, config=False)
from tryton.gui.window.dbcreate import DBCreate
_DBCreate_run = DBCreate.run
+
def DBCreate_run(self):
self.entry_serverpasswd.set_text('admin')
self.event_show_button_create(self.dialog, None)
@@ -204,6 +205,7 @@ DBCreate.run = DBCreate_run
from tryton.gui.window.dbdumpdrop import DBBackupDrop
_DBBackupDrop_run = DBBackupDrop.run
+
def DBBackupDrop_run(self):
self.entry_serverpasswd.set_text('admin')
self.event_show_button_ok(self.dialog, None)
@@ -215,6 +217,7 @@ DBBackupDrop.run = DBBackupDrop_run
from tryton.gui.window.dbrestore import DBRestore
_DBRestore_run = DBRestore.run
+
def DBRestore_run(self):
self.entry_server_password.set_text('admin')
self.event_show_button_restore(self.dialog, None)
@@ -222,8 +225,7 @@ def DBRestore_run(self):
DBRestore.run = DBRestore_run
-from tryton.common import refresh_dblist, DBProgress
-import tryton.common as common
+from tryton.common import refresh_dblist
from tryton.gui.window.dblogin import DBLogin
from tryton.exceptions import TrytonError
@@ -255,6 +257,7 @@ def DBLogin_run(self):
xoptions=gtk.FILL)
else:
dbname = None
+
def db_create(button):
dia = DBCreate('localhost', 8000)
dbname = dia.run()
@@ -263,7 +266,7 @@ def DBLogin_run(self):
xoptions=gtk.FILL)
self.database_combo.show()
dbstore.append((dbname,))
- self.database_combo.set_active(len(dbstore)-1)
+ self.database_combo.set_active(len(dbstore) - 1)
image = gtk.Image()
image.set_from_stock('tryton-new', gtk.ICON_SIZE_BUTTON)
create_button = gtk.Button(u'Create')
@@ -289,7 +292,6 @@ def DBLogin_run(self):
self.dialog.destroy()
if res != gtk.RESPONSE_OK:
rpc.logout()
- from tryton.gui.main import Main
raise TrytonError('QueryCanceled')
return result
diff --git a/neso.desktop b/neso.desktop
index dd288d0..635bd4d 100644
--- a/neso.desktop
+++ b/neso.desktop
@@ -6,10 +6,13 @@ GenericName=Standalone Client/Server for the Tryton Application Platform
GenericName[ca_ES]=Client/Servidor autònom per l'aplicació Tryton
GenericName[de]=Autonomer Client/Server für die Tryton Applikationsplattform
GenericName[es_ES]=Cliente/Servidor autónomo para la aplicación Tryton
+GenericName[sl]=Samostojni odjemalec/strežnik za aplikacijsko platformo Tryton
Comment=Run Tryton
Comment[ca_ES]=Inicia Tryton
Comment[de]=Tryton starten
Comment[es_ES]=Iniciar Tryton
+Comment[sl]=Zaženi Tryton
+Keywords=Business;Management;Enterprise;ERP;Framework;
Exec=neso
Icon=neso-icon
Terminal=false
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 2c8639b..ccf8b70 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: neso
-Version: 2.8.0
+Version: 3.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -14,11 +14,19 @@ Classifier: Environment :: X11 Applications :: GTK
Classifier: Framework :: Tryton
Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-Classifier: Operating System :: OS Independent
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
+Classifier: Natural Language :: Slovak
+Classifier: Natural Language :: Slovenian
+Classifier: Natural Language :: Japanese
+Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
index 8d44da0..760a721 100644
--- a/neso.egg-info/SOURCES.txt
+++ b/neso.egg-info/SOURCES.txt
@@ -11,6 +11,7 @@ german.nsh
neso.desktop
setup.nsi
setup.py
+slovenian.nsh
spanish.nsh
bin/neso
neso/__init__.py
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index 13b2aed..0352f99 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 2.8, < 2.8
-trytond >= 2.8, < 2.9
\ No newline at end of file
+tryton >= 3.0, < 3.0
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 7d7b4ea..d1a04b8 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.8.0"
+VERSION = "3.0.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index b2c1281..a0ce214 100644
--- a/setup.py
+++ b/setup.py
@@ -6,11 +6,36 @@ from setuptools import setup, find_packages
import os
import sys
import glob
+import re
+
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
args = {}
+
+languages = (
+ 'bg_BG',
+ 'ca_ES',
+ 'cs_CZ',
+ 'de_DE',
+ 'es_AR',
+ 'es_CO',
+ 'es_ES',
+ 'fr_FR',
+ 'ja_JP',
+ 'lt_LT',
+ 'nl_NL',
+ 'ru_RU',
+ 'sl_SI',
+ )
+
+
+def all_languages():
+ for lang in languages:
+ yield lang
+ yield lang.split('_')[0]
+
data_files = []
if os.name == 'nt':
@@ -18,12 +43,13 @@ if os.name == 'nt':
args['windows'] = [{
'script': os.path.join('bin', 'neso'),
- 'icon_resources': [(1, os.path.join('share', 'pixmaps', 'neso', 'neso.ico'))],
+ 'icon_resources': [
+ (1, os.path.join('share', 'pixmaps', 'neso', 'neso.ico'))],
}]
args['options'] = {
'py2exe': {
'optimize': 0,
- 'bundle_files': 3, #don't bundle because gtk doesn't support it
+ 'bundle_files': 3, # don't bundle because gtk doesn't support it
'packages': [
'encodings',
'gtk',
@@ -68,8 +94,7 @@ if os.name == 'nt':
manifest = read('Microsoft.VC90.CRT.manifest')
args['windows'][0]['other_resources'] = [(24, 1, manifest)]
-elif os.name == 'mac' \
- or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
+elif sys.platform == 'darwin':
import py2app
from modulegraph.find_modules import PY_SUFFIXES
PY_SUFFIXES.append('')
@@ -81,7 +106,7 @@ elif os.name == 'mac' \
'gobject, gio, gtk.keysyms, pkg_resources, ConfigParser, '
'xmlrpclib, decimal, uuid, '
'dateutil, psycopg2, zipfile, sqlite3, '
- 'csv, pydoc, pydot, BeautifulSoup, '
+ 'csv, pydoc, pydot, '
'vobject, vatnumber, suds, email, cPickle, sha, '
'contextlib, gtk_osxapplication, ldap, simplejson'),
'packages': ('xml, logging, lxml, genshi, DAV, pytz, email, '
@@ -97,7 +122,6 @@ elif os.name == 'mac' \
},
}
-
execfile(os.path.join('neso', 'version.py'))
major_version, minor_version, _ = VERSION.split('.', 2)
major_version = int(major_version)
@@ -106,11 +130,10 @@ minor_version = int(minor_version)
dist = setup(name=PACKAGE,
version=VERSION,
description='Standalone Client/Server for the Tryton Application Platform',
- author='B2CK',
- author_email='info at b2ck.com',
+ author='Tryton',
url=WEBSITE,
- download_url='http://downloads.tryton.org/' + \
- VERSION.rsplit('.', 1)[0] + '/',
+ download_url=('http://downloads.tryton.org/' +
+ VERSION.rsplit('.', 1)[0] + '/'),
packages=find_packages(),
data_files=data_files,
scripts=['bin/neso'],
@@ -120,15 +143,23 @@ dist = setup(name=PACKAGE,
'Framework :: Tryton',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Operating System :: OS Independent',
+ 'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
+ 'Natural Language :: Slovak',
+ 'Natural Language :: Slovenian',
+ 'Natural Language :: Japanese',
+ 'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=[
'tryton >= %s.%s, < %s.%s' % (major_version, minor_version,
@@ -137,7 +168,8 @@ dist = setup(name=PACKAGE,
major_version, minor_version + 1),
],
**args
-)
+ )
+
def findFiles(topDir, pattern):
import fnmatch
@@ -146,40 +178,41 @@ def findFiles(topDir, pattern):
if fnmatch.fnmatch(filename, pattern):
yield os.path.join(dirpath, filename)
+
def copy_trytons(dist_dir):
- from py_compile import compile
- for i in ('tryton', 'trytond'):
- if os.path.isdir(os.path.join(dist_dir, i)):
- shutil.rmtree(os.path.join(dist_dir, i))
- shutil.copytree(os.path.join(os.path.dirname(__file__), i),
- os.path.join(dist_dir, i))
- for j in ('.hg', 'dist', 'build', i + '.egg-info'):
- if os.path.isdir(os.path.join(dist_dir, i, j)):
- shutil.rmtree(os.path.join(dist_dir, i, j))
- for j in ('.hgtags', '.hgignore'):
- if os.path.isfile(os.path.join(dist_dir, i, j)):
- os.remove(os.path.join(dist_dir, i, j))
- for file in glob.iglob(os.path.join(dist_dir, i, '*.exe')):
- os.remove(file)
- for file in glob.iglob(os.path.join(dist_dir, i, '*.dmg')):
- os.remove(file)
- for file in findFiles(os.path.join(dist_dir, i), '*.py'):
- if file.endswith('__tryton__.py'):
- continue
- print "byte-compiling %s to %s" % (file,
- file[len(dist_dir) + len(os.sep):] + \
- (__debug__ and 'c' or 'o'))
- compile(file, None, file[len(dist_dir) + len(os.sep):] + \
- (__debug__ and 'c' or 'o'), True)
- os.remove(file)
- for j in ('.hg', 'dist', 'build', i + '.egg-info'):
- for dir in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
- 'modules', '*', j)):
- shutil.rmtree(dir)
- for j in ('.hgtags', '.hgignore'):
- for file in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
- 'modules', '*', j)):
- os.remove(file)
+ from py_compile import compile
+ for i in ('tryton', 'trytond'):
+ if os.path.isdir(os.path.join(dist_dir, i)):
+ shutil.rmtree(os.path.join(dist_dir, i))
+ shutil.copytree(os.path.join(os.path.dirname(__file__), i),
+ os.path.join(dist_dir, i))
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ if os.path.isdir(os.path.join(dist_dir, i, j)):
+ shutil.rmtree(os.path.join(dist_dir, i, j))
+ for j in ('.hgtags', '.hgignore'):
+ if os.path.isfile(os.path.join(dist_dir, i, j)):
+ os.remove(os.path.join(dist_dir, i, j))
+ for file in glob.iglob(os.path.join(dist_dir, i, '*.exe')):
+ os.remove(file)
+ for file in glob.iglob(os.path.join(dist_dir, i, '*.dmg')):
+ os.remove(file)
+ for file in findFiles(os.path.join(dist_dir, i), '*.py'):
+ if file.endswith('__tryton__.py'):
+ continue
+ print "byte-compiling %s to %s" % (file,
+ file[len(dist_dir) + len(os.sep):]
+ + (__debug__ and 'c' or 'o'))
+ compile(file, None, file[len(dist_dir) + len(os.sep):]
+ + (__debug__ and 'c' or 'o'), True)
+ os.remove(file)
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ for dir in glob.iglob(os.path.join(
+ dist_dir, 'trytond', 'trytond', 'modules', '*', j)):
+ shutil.rmtree(dir)
+ for j in ('.hgtags', '.hgignore'):
+ for file in glob.iglob(os.path.join(
+ dist_dir, 'trytond', 'trytond', 'modules', '*', j)):
+ os.remove(file)
if os.name == 'nt':
def find_gtk_dir():
@@ -192,7 +225,8 @@ if os.name == 'nt':
return None
def find_makensis():
- for directory in os.environ['PATH'].split(';'):
+ default_path = os.path.join(os.environ['PROGRAMFILES'], 'NSIS')
+ for directory in os.environ['PATH'].split(';') + [default_path]:
if not os.path.isdir(directory):
continue
path = os.path.join(directory, 'makensis.exe')
@@ -232,12 +266,16 @@ if os.name == 'nt':
os.path.join(dist_dir, 'etc'))
from subprocess import Popen, PIPE
- query_loaders = Popen(os.path.join(gtk_dir,'bin','gdk-pixbuf-query-loaders'),
- stdout=PIPE).stdout.read()
- query_loaders = query_loaders.replace(gtk_dir.replace(os.sep, '/') + '/', '')
- loaders = open(os.path.join(dist_dir, 'etc', 'gtk-2.0', 'gdk-pixbuf.loaders'), 'w')
- loaders.writelines([line + "\n" for line in query_loaders.split(os.linesep)])
- loaders.close()
+ query_loaders = Popen(os.path.join(gtk_dir, 'bin',
+ 'gdk-pixbuf-query-loaders'), stdout=PIPE).stdout.read()
+ query_loaders = query_loaders.replace(
+ gtk_dir.replace(os.sep, '/') + '/', '')
+
+ loaders_path = os.path.join(dist_dir, 'etc', 'gtk-2.0',
+ 'gdk-pixbuf.loaders')
+ with open(loaders_path, 'w') as loaders:
+ loaders.writelines([line + "\n" for line in
+ query_loaders.split(os.linesep)])
if os.path.isdir(os.path.join(dist_dir, 'lib')):
shutil.rmtree(os.path.join(dist_dir, 'lib'))
@@ -248,14 +286,17 @@ if os.name == 'nt':
if os.path.isfile(file):
shutil.copy(file, dist_dir)
- for lang in ('de', 'es', 'fr'):
+ for lang in all_languages():
if os.path.isdir(os.path.join(dist_dir, 'share', 'locale', lang)):
shutil.rmtree(os.path.join(dist_dir, 'share', 'locale', lang))
- shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
- os.path.join(dist_dir, 'share', 'locale', lang))
-
- if os.path.isdir(os.path.join(dist_dir, 'share', 'themes', 'MS-Windows')):
- shutil.rmtree(os.path.join(dist_dir, 'share', 'themes', 'MS-Windows'))
+ if os.path.isdir(os.path.join(gtk_dir, 'share', 'locale', lang)):
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
+ os.path.join(dist_dir, 'share', 'locale', lang))
+
+ if os.path.isdir(os.path.join(dist_dir, 'share', 'themes',
+ 'MS-Windows')):
+ shutil.rmtree(os.path.join(dist_dir, 'share', 'themes',
+ 'MS-Windows'))
shutil.copytree(os.path.join(gtk_dir, 'share', 'themes', 'MS-Windows'),
os.path.join(dist_dir, 'share', 'themes', 'MS-Windows'))
@@ -265,8 +306,11 @@ if os.name == 'nt':
Popen([makensis, "/DVERSION=" + VERSION,
str(os.path.join(os.path.dirname(__file__),
'setup.nsi'))]).wait()
-elif os.name == 'mac' \
- or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
+ else:
+ print "makensis.exe not found: installers can not be created, "\
+ "skip setup.nsi"
+elif sys.platform == 'darwin':
+
def find_gtk_dir():
for directory in os.environ['PATH'].split(':'):
if not os.path.isdir(directory):
@@ -282,11 +326,13 @@ elif os.name == 'mac' \
from itertools import chain
from glob import iglob
gtk_dir = find_gtk_dir()
- gtk_binary_version = Popen(['pkg-config', '--variable=gtk_binary_version',
- 'gtk+-2.0'], stdout=PIPE).stdout.read().strip()
+ gtk_binary_version = Popen(['pkg-config',
+ '--variable=gtk_binary_version', 'gtk+-2.0'],
+ stdout=PIPE).stdout.read().strip()
dist_dir = dist.command_obj['py2app'].dist_dir
- resources_dir = os.path.join(dist_dir, 'neso.app', 'Contents', 'Resources')
+ resources_dir = os.path.join(dist_dir, 'neso.app', 'Contents',
+ 'Resources')
copy_trytons(resources_dir)
@@ -299,70 +345,90 @@ elif os.name == 'mac' \
query_pango = Popen(os.path.join(gtk_dir, 'bin', 'pango-querymodules'),
stdout=PIPE).stdout.read()
- query_pango = query_pango.replace(gtk_dir, '@executable_path/../Resources')
- pango_modules = open(os.path.join(resources_dir, 'pango.modules'), 'w')
- pango_modules.write(query_pango)
- pango_modules.close()
-
- pangorc = open(os.path.join(resources_dir, 'pangorc'), 'w')
- pangorc.write('[Pango]\n')
- pangorc.write('ModuleFiles=./pango.modules\n')
- pangorc.close()
-
- if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders')):
- shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders'))
- shutil.copytree(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
- 'loaders'), os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders'))
- if not os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines')):
- os.makedirs(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines'))
- shutil.copyfile(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
- 'engines', 'libclearlooks.so'), os.path.join(gtk_2_dist_dir,
- gtk_binary_version, 'engines', 'libclearlooks.so'))
-
- query_loaders = Popen(os.path.join(gtk_dir,'bin','gdk-pixbuf-query-loaders'),
- stdout=PIPE).stdout.read()
- query_loaders = query_loaders.replace(gtk_dir, '@executable_path/../Resources')
- loaders = open(os.path.join(resources_dir, 'gdk-pixbuf.loaders'), 'w')
- loaders.write(query_loaders)
- loaders.close()
-
- if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules')):
- shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules'))
- shutil.copytree(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
- 'immodules'), os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules'))
-
- query_immodules = Popen(os.path.join(gtk_dir, 'bin', 'gtk-query-immodules-2.0'),
- stdout=PIPE).stdout.read()
- query_immodules = query_immodules.replace(gtk_dir, '@executable_path/../Resources')
- immodules = open(os.path.join(resources_dir, 'gtk.immodules'), 'w')
- immodules.write(query_immodules)
- immodules.close()
+ query_pango = query_pango.replace(gtk_dir,
+ '@executable_path/../Resources')
+ pango_modules_path = os.path.join(resources_dir, 'pango.modules')
+ with open(pango_modules_path, 'w') as pango_modules:
+ pango_modules.write(query_pango)
+
+ with open(os.path.join(resources_dir, 'pangorc'), 'w') as pangorc:
+ pangorc.write('[Pango]\n')
+ pangorc.write('ModuleFiles=./pango.modules\n')
+
+ if not os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'engines')):
+ os.makedirs(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'engines'))
+ shutil.copyfile(os.path.join(gtk_dir, 'lib', 'gtk-2.0',
+ gtk_binary_version, 'engines', 'libclearlooks.so'),
+ os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines',
+ 'libclearlooks.so'))
+
+ query_loaders = Popen(os.path.join(gtk_dir, 'bin',
+ 'gdk-pixbuf-query-loaders'), stdout=PIPE).stdout.read()
+ loader_dir, = re.findall('# LoaderDir = (.*)', query_loaders)
+ loader_pkg = (loader_dir.replace(os.path.join(gtk_dir, 'lib'),
+ '').split(os.path.sep)[-3])
+ loader_dist_dir = os.path.join(resources_dir, 'lib', loader_pkg,
+ gtk_binary_version, 'loaders')
+ if os.path.isdir(loader_dist_dir):
+ shutil.rmtree(loader_dist_dir)
+ if os.path.isdir(loader_dir):
+ shutil.copytree(loader_dir, loader_dist_dir)
+ query_loaders = query_loaders.replace(gtk_dir,
+ '@executable_path/../Resources')
+
+ loaders_path = os.path.join(resources_dir, 'gdk-pixbuf.loaders')
+ with open(loaders_path, 'w') as loaders:
+ loaders.write(query_loaders)
+
+ if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'immodules')):
+ shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'immodules'))
+ shutil.copytree(os.path.join(gtk_dir, 'lib', 'gtk-2.0',
+ gtk_binary_version, 'immodules'), os.path.join(gtk_2_dist_dir,
+ gtk_binary_version, 'immodules'))
+
+ query_immodules = Popen(os.path.join(gtk_dir, 'bin',
+ 'gtk-query-immodules-2.0'), stdout=PIPE).stdout.read()
+ query_immodules = query_immodules.replace(gtk_dir,
+ '@executable_path/../Resources')
+
+ immodules_path = os.path.join(resources_dir, 'gtk.immodules')
+ with open(immodules_path, 'w') as immodules:
+ immodules.write(query_immodules)
shutil.copy(os.path.join(gtk_dir, 'share', 'themes', 'Clearlooks',
'gtk-2.0', 'gtkrc'), os.path.join(resources_dir, 'gtkrc'))
- for lang in ('de', 'es', 'fr', 'ru'):
- if os.path.isdir(os.path.join(resources_dir, 'share', 'locale', lang)):
- shutil.rmtree(os.path.join(resources_dir, 'share', 'locale', lang))
- shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
- os.path.join(resources_dir, 'share', 'locale', lang))
+ for lang in all_languages():
+ if os.path.isdir(os.path.join(resources_dir, 'share', 'locale',
+ lang)):
+ shutil.rmtree(os.path.join(resources_dir, 'share', 'locale',
+ lang))
+ if os.path.isdir(os.path.join(gtk_dir, 'share', 'locale', lang)):
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
+ os.path.join(resources_dir, 'share', 'locale', lang))
# fix pathes within shared libraries
for library in chain(
- iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders', '*.so')),
- iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines', '*.so')),
- iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules', '*.so')),
- iglob(os.path.join(pango_dist_dir,'*','modules','*.so'))):
+ iglob(os.path.join(loader_dist_dir, '*.so')),
+ iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'engines', '*.so')),
+ iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version,
+ 'immodules', '*.so')),
+ iglob(os.path.join(pango_dist_dir, '*', 'modules', '*.so'))):
libs = [lib.split('(')[0].strip()
- for lib in Popen(['otool', '-L', library],
- stdout=PIPE).communicate()[0].splitlines()
- if 'compatibility' in lib]
+ for lib in Popen(['otool', '-L', library],
+ stdout=PIPE).communicate()[0].splitlines()
+ if 'compatibility' in lib]
libs = dict(((lib, None) for lib in libs if gtk_dir in lib))
for lib in libs.keys():
fixed = lib.replace(gtk_dir + '/lib',
- '@executable_path/../Frameworks')
+ '@executable_path/../Frameworks')
Popen(['install_name_tool', '-change', lib, fixed,
- library]).wait()
+ library]).wait()
for file in ('CHANGELOG', 'COPYRIGHT', 'LICENSE', 'README'):
shutil.copyfile(os.path.join(os.path.dirname(__file__), file),
@@ -372,5 +438,5 @@ elif os.name == 'mac' \
+ '.dmg')
if os.path.isfile(dmg_file):
os.remove(dmg_file)
- Popen(['hdiutil', 'create', dmg_file, '-volname', 'Neso ' +
- VERSION, '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
+ Popen(['hdiutil', 'create', dmg_file, '-volname', 'Neso '
+ + VERSION, '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
diff --git a/slovenian.nsh b/slovenian.nsh
new file mode 100644
index 0000000..63b5cc3
--- /dev/null
+++ b/slovenian.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_SLOVENIAN}
+
+LangString LicenseText ${CURLANG} "Neso je izdan pod licenco GNU General Public License, kot jo je objavila Free Software Foundation, bodisi pod razlièico 3 ali (po va¹i izbiri) katerokoli poznej¹o razlièico. Licenco pozorno preberite. Kliknite Naprej za nadaljevanje."
+LangString LicenseNext ${CURLANG} "&Naprej"
+LangString PreviousInstall ${CURLANG} "Prosimo, da odstranite prej¹njo namestitev Nesa"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "Namestitev neso.exe in ostalih potrebnih datotek"
+LangString SecStartMenuName ${CURLANG} "Bli¾njici v zaèetnem meniju in na namizju"
+LangString SecStartMenuDesc ${CURLANG} "Ustvari bli¾njici v zaèetnem meniju in na namizju"
commit 7284dbd994ae2fc397cd1ec9e0a594f1c9d95136
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:38:30 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index ac0c541..14afd6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 93f6b51..6e81425 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index 74f57f6..2c8639b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: neso
-Version: 2.6.0
+Version: 2.8.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -19,5 +19,6 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/neso.desktop b/neso.desktop
index db00ca8..dd288d0 100644
--- a/neso.desktop
+++ b/neso.desktop
@@ -3,9 +3,13 @@ Version=1.0
Type=Application
Name=Neso
GenericName=Standalone Client/Server for the Tryton Application Platform
+GenericName[ca_ES]=Client/Servidor autònom per l'aplicació Tryton
GenericName[de]=Autonomer Client/Server für die Tryton Applikationsplattform
+GenericName[es_ES]=Cliente/Servidor autónomo para la aplicación Tryton
Comment=Run Tryton
+Comment[ca_ES]=Inicia Tryton
Comment[de]=Tryton starten
+Comment[es_ES]=Iniciar Tryton
Exec=neso
Icon=neso-icon
Terminal=false
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 74f57f6..2c8639b 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: neso
-Version: 2.6.0
+Version: 2.8.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -19,5 +19,6 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index e806dea..13b2aed 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 2.6, < 2.6
-trytond >= 2.6, < 2.7
\ No newline at end of file
+tryton >= 2.8, < 2.8
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index aba3a81..7d7b4ea 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.6.0"
+VERSION = "2.8.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 69b3f9f..b2c1281 100644
--- a/setup.py
+++ b/setup.py
@@ -125,7 +125,8 @@ dist = setup(name=PACKAGE,
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
commit 89ef5041f9acc3a320d8406301bb7c705345851a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:54:04 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9576681..ac0c541 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index fc8818a..93f6b51 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2012 Cédric Krier.
Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index d2598ac..74f57f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,16 +1,17 @@
Metadata-Version: 1.0
Name: neso
-Version: 2.4.0
+Version: 2.6.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
+Download-URL: http://downloads.tryton.org/2.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: X11 Applications :: GTK
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Operating System :: OS Independent
diff --git a/catalan.nsh b/catalan.nsh
new file mode 100644
index 0000000..f510eac
--- /dev/null
+++ b/catalan.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_CATALAN}
+
+LangString LicenseText ${CURLANG} "Neso està alliberat sota la llicència «GNU General Public License» publicada per la Free Software Foundation, o bé la versió 3 de la llicència, o (sota la vostra elecció) qualsevol versió posterior. Llegiu detingudament la llicència. Premeu «Següent» per continuar."
+LangString LicenseNext ${CURLANG} "&Següent"
+LangString PreviousInstall ${CURLANG} "Desinstal·leu la versió anterior de Neso"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "Instal·la neso.exe i altres fitxers necessaris"
+LangString SecStartMenuName ${CURLANG} "Accessos directes al menú d'inici i a l'escriptori"
+LangString SecStartMenuDesc ${CURLANG} "Crea accessos directes al menú d'inici i a l'escriptori"
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index d2598ac..74f57f6 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,16 +1,17 @@
Metadata-Version: 1.0
Name: neso
-Version: 2.4.0
+Version: 2.6.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
+Download-URL: http://downloads.tryton.org/2.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: X11 Applications :: GTK
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Operating System :: OS Independent
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
index 5a57c4a..8d44da0 100644
--- a/neso.egg-info/SOURCES.txt
+++ b/neso.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+catalan.nsh
english.nsh
french.nsh
german.nsh
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index 313d290..e806dea 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 2.4, < 2.4
-trytond >= 2.4, < 2.5
\ No newline at end of file
+tryton >= 2.6, < 2.6
+trytond >= 2.6, < 2.7
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 715d880..aba3a81 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.4.0"
+VERSION = "2.6.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 6535914..69b3f9f 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ if os.name == 'nt':
'csv',
'lxml',
'pydoc',
- 'DAV',
+ 'pywebdav',
'pydot',
'vobject',
'pkg_resources',
@@ -56,6 +56,9 @@ if os.name == 'nt':
'contextlib',
'gio',
'simplejson',
+ 'polib',
+ 'SimpleXMLRPCServer',
+ 'SimpleHTTPServer',
],
}
}
@@ -114,6 +117,7 @@ dist = setup(name=PACKAGE,
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: X11 Applications :: GTK',
+ 'Framework :: Tryton',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Operating System :: OS Independent',
commit 4d454cc4b7e1cb123c73f967a66d5689bdaf60b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:10 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 35fca25..9576681 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
Version 2.2.0 - 2011-10-25
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a474ed..fc8818a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009-2011 Cédric Krier.
Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2009-2011 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index 5926283..d2598ac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: neso
-Version: 2.2.1
+Version: 2.4.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/bin/neso b/bin/neso
index fc0c8dc..957b1b5 100755
--- a/bin/neso
+++ b/bin/neso
@@ -21,8 +21,10 @@ except:
# True only if running as a py2exe app
if os.name == 'nt' and hasattr(sys, "frozen"):
- sys.stdout = open(os.devnull, 'w')
- sys.stderr = open(os.devnull, 'w')
+ if not ('-v' in sys.argv or '--verbose' in sys.argv or
+ '-l' in sys.argv or '--log-level' in sys.argv):
+ sys.stdout = open(os.devnull, 'w')
+ sys.stderr = open(os.devnull, 'w')
etc = os.path.join(os.path.dirname(sys.executable), 'etc')
os.environ['GTK2_RC_FILES'] = os.path.join(etc, 'gtk-2.0', 'gtkrc')
os.environ['GDK_PIXBUF_MODULE_FILE'] = os.path.join(etc, 'gtk-2.0',
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 5926283..d2598ac 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: neso
-Version: 2.2.1
+Version: 2.4.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index 47b6dae..313d290 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 2.2, < 2.2
-trytond >= 2.2, < 2.3
\ No newline at end of file
+tryton >= 2.4, < 2.4
+trytond >= 2.4, < 2.5
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index b785d0a..715d880 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.2.1"
+VERSION = "2.4.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/spanish.nsh b/spanish.nsh
index f08a297..99502da 100644
--- a/spanish.nsh
+++ b/spanish.nsh
@@ -8,10 +8,10 @@
!endif
!define CURLANG ${LANG_SPANISH}
-LangString LicenseText ${CURLANG} "Neso es liberado bajo la licencia GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. Por favor, lea cuidadosamente la licencia. Haga clic en Siguiente para continuar."
+LangString LicenseText ${CURLANG} "Neso está liberado bajo la licencia «GNU General Public License» publicada por la Free Software Foundation, o bien la versión 3 de la licencia, o (a su elección) cualquier versión posterior. Lea cuidadosamente la licencia. Pulse «Siguiente» para continuar."
LangString LicenseNext ${CURLANG} "&Siguiente"
-LangString PreviousInstall ${CURLANG} "Por favor, desinstalar la anterior instalación Neso"
+LangString PreviousInstall ${CURLANG} "Desinstale la instalación anterior de Neso"
LangString SecNesoName ${CURLANG} "Neso"
LangString SecNesoDesc ${CURLANG} "Instalar neso.exe y otros archivos necesarios"
-LangString SecStartMenuName ${CURLANG} "Menú Inicio y los accesos directos del escritorio"
+LangString SecStartMenuName ${CURLANG} "Accesos directos en el menú de inicio y en el escritorio"
LangString SecStartMenuDesc ${CURLANG} "Crear accesos directos en el menú de inicio y en el escritorio"
commit 5ee6ce9d4ee8b02a443cf8a5575e8b10f956165d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 13:35:54 2011 +0100
Adding upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3029407..35fca25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8acbb3b..5926283 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: neso
-Version: 2.2.0
+Version: 2.2.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/bin/neso b/bin/neso
index 444155e..fc0c8dc 100755
--- a/bin/neso
+++ b/bin/neso
@@ -131,7 +131,7 @@ class LocalProxy(xmlrpclib.ServerProxy):
ConcurrencyException), exception:
raise TrytonServerError(*exception.args)
except Exception:
- tbs = ''
+ tb_s = ''
for line in traceback.format_exception(*sys.exc_info()):
try:
line = line.encode('utf-8', 'ignore')
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 8acbb3b..5926283 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: neso
-Version: 2.2.0
+Version: 2.2.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/neso/version.py b/neso/version.py
index e42b8e9..b785d0a 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.2.0"
+VERSION = "2.2.1"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index b1d5665..6535914 100644
--- a/setup.py
+++ b/setup.py
@@ -20,9 +20,6 @@ if os.name == 'nt':
'script': os.path.join('bin', 'neso'),
'icon_resources': [(1, os.path.join('share', 'pixmaps', 'neso', 'neso.ico'))],
}]
- json = ['json']
- if sys.version_info < (2, 6):
- json = ['simplejson']
args['options'] = {
'py2exe': {
'optimize': 0,
@@ -51,7 +48,6 @@ if os.name == 'nt':
'pydoc',
'DAV',
'pydot',
- 'BeautifulSoup',
'vobject',
'pkg_resources',
'vatnumber',
@@ -59,17 +55,15 @@ if os.name == 'nt':
'email',
'contextlib',
'gio',
- ] + json,
+ 'simplejson',
+ ],
}
}
args['zipfile'] = 'library.zip'
- if sys.version_info < (2, 6):
- data_files.append(('', ['msvp71.dll']))
- else:
- data_files.append(('', ['msvcr90.dll', 'msvcp90.dll', 'msvcm90.dll']))
- manifest = read('Microsoft.VC90.CRT.manifest')
- args['windows'][0]['other_resources'] = [(24, 1, manifest)]
+ data_files.append(('', ['msvcr90.dll', 'msvcp90.dll', 'msvcm90.dll']))
+ manifest = read('Microsoft.VC90.CRT.manifest')
+ args['windows'][0]['other_resources'] = [(24, 1, manifest)]
elif os.name == 'mac' \
or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
@@ -77,9 +71,6 @@ elif os.name == 'mac' \
from modulegraph.find_modules import PY_SUFFIXES
PY_SUFFIXES.append('')
args['app'] = [os.path.join('bin', 'neso')]
- json = 'json'
- if sys.version_info < (2, 6):
- json = 'simplejson'
args['options'] = {
'py2app': {
'argv_emulation': True,
@@ -89,8 +80,7 @@ elif os.name == 'mac' \
'dateutil, psycopg2, zipfile, sqlite3, '
'csv, pydoc, pydot, BeautifulSoup, '
'vobject, vatnumber, suds, email, cPickle, sha, '
- 'contextlib, gtk_osxapplication, ldap, '
- + json),
+ 'contextlib, gtk_osxapplication, ldap, simplejson'),
'packages': ('xml, logging, lxml, genshi, DAV, pytz, email, '
'relatorio'),
'excludes': 'tryton, trytond',
commit ac02e27f92344bc402613071d9b89f731456d358
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:33 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 548a60c..3029407 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-25
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-28
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index eba162e..f0f35ac 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,6 @@ include CHANGELOG
include setup.nsi
include neso.desktop
include *.nsh
+include share/pixmaps/neso/*.svg
include share/pixmaps/neso/*.ico
+include share/pixmaps/neso/*.icns
diff --git a/PKG-INFO b/PKG-INFO
index 07cb30a..8acbb3b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 2.0.0
+Version: 2.2.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/bin/neso b/bin/neso
index 0dcd1b9..444155e 100755
--- a/bin/neso
+++ b/bin/neso
@@ -6,6 +6,8 @@ import os
import logging
import time
import threading
+import xmlrpclib
+import traceback
import gobject
@@ -84,7 +86,7 @@ VERSION_DATA_DIR = os.path.join(DATA_DIR, VERSION.rsplit('.', 1)[0])
if not os.path.isdir(VERSION_DATA_DIR):
os.mkdir(VERSION_DATA_DIR, 0700)
-CONFIG.options['netrpc'] = False
+CONFIG.options['jsonrpc'] = False
CONFIG.options['xmlrpc'] = False
CONFIG.options['webdav'] = False
CONFIG.options['db_type'] = 'sqlite'
@@ -100,103 +102,81 @@ Pool.start()
from trytond.protocols.dispatcher import dispatch
from trytond.backend import Database
+from trytond.exceptions import UserError, UserWarning, NotLogged, \
+ ConcurrencyException
import tryton.rpc as rpc
+from tryton.exceptions import TrytonServerError
+
+
+class LocalProxy(xmlrpclib.ServerProxy):
+
+ def __init__(self, host, port, database='', verbose=0,
+ fingerprints=None, ca_certs=None):
+ self.__host = host
+ self.__port = port
+ self.__database = database
+ self.__verbose = verbose
+
+ def __request(self, methodname, params):
+ method_list = methodname.split('.')
+ object_type = method_list[0]
+ object_name = '.'.join(method_list[1:-1])
+ method = method_list[-1]
+ args = (self.__host, self.__port, 'local', self.__database, params[0],
+ params[1], object_type, object_name, method) + tuple(params[2:])
+ try:
+ return dispatch(*args)
+ except (UserError, UserWarning, NotLogged,
+ ConcurrencyException), exception:
+ raise TrytonServerError(*exception.args)
+ except Exception:
+ tbs = ''
+ for line in traceback.format_exception(*sys.exc_info()):
+ try:
+ line = line.encode('utf-8', 'ignore')
+ except Exception:
+ continue
+ tb_s += line
+ for path in sys.path:
+ tb_s = tb_s.replace(path, '')
+ raise TrytonServerError(str(sys.exc_value), tb_s)
+
+ def __repr__(self):
+ return "<LocalProxy for %s>" % self.__database
+
+ __str__ = __repr__
+
+ def close(self):
+ pass
-def db_list(host, port):
- Database._memory_database = None
- return dispatch('127.0.0.1', 8070, 'local', None, None, None, 'common', 'db',
- 'list')
-
-rpc.db_list = db_list
-
-def db_exec(host, port, method, *args):
- Database._memory_database = None
- args = ('127.0.0.1', 8070, 'local', None, None, None, 'common', 'db', method) \
- + args
- return dispatch(*args)
-
-rpc.db_exec = db_exec
-
-def server_version(host, port):
- return dispatch('127.0.0.1', 8070, 'local', None, None, None, 'common', None,
- 'version')
-rpc.server_version = server_version
-
-def login(username, password, host, port, database):
- res = dispatch('127.0.0.1', 8070, 'local', database, username, password,
- 'common', 'db', 'login')
- if not res:
- rpc._USER = 0
- rpc._SESSION = ''
- return -2
- rpc._USER = res[0]
- rpc._USERNAME = username
- rpc._SESSION = res[1]
- rpc._DATABASE = database
- rpc.context_reload()
- return 1
-
-rpc.login = login
-
-def logout():
- if rpc._SOCK and rpc._USER:
- dispatch('127.0.0.1', 8070, 'local', rpc._DATABASE, rpc._USERNAME,
- rpc._SESSION, 'common', 'db', 'logout')
- rpc._USER = 0
- rpc._USERNAME = ''
- rpc._SESSION = ''
- rpc._DATABASE = ''
- rpc._VIEW_CACHE = {}
- rpc.SECURE = False
-
-rpc.logout = logout
-
-def _execute(blocking, *args):
- logging.getLogger('rpc.request').info(repr((args)))
- key = False
- if len(args) >= 6 and args[1] == 'fields_view_get':
- key = str(args)
- if key in rpc._VIEW_CACHE and rpc._VIEW_CACHE[key][0]:
- args = args[:]
- args = args + (rpc._VIEW_CACHE[key][0],)
- res = rpc._SEMAPHORE.acquire(blocking)
- if not res:
- return
- try:
- result = dispatch(*(('127.0.0.1', 8070, 'local', rpc._DATABASE,
- rpc._USER, rpc._SESSION) + args))
- finally:
- rpc._SEMAPHORE.release()
- if key:
- if result is True and key in rpc._VIEW_CACHE:
- result = rpc._VIEW_CACHE[key][1]
- else:
- rpc._VIEW_CACHE[key] = (result['md5'], result)
- logging.getLogger('rpc.result').debug(repr(result))
- return result
-
-rpc._execute = _execute
+ @property
+ def ssl(self):
+ return False
-class _SOCK(object):
- hostname = 'localhost'
- host = '127.0.0.1'
- port = 8070
+ def __getattr__(self, name):
+ # Override to force to use LocalProxy.__request
+ return xmlrpclib._Method(self.__request, name)
-rpc._SOCK = _SOCK()
+rpc.ServerProxy = LocalProxy
CRON_RUNNING = True
def cron():
+ threads = {}
while CRON_RUNNING:
for dbname in Pool.database_list():
+ thread = threads.get(dbname)
+ if thread and thread.is_alive():
+ continue
pool = Pool(dbname)
if 'ir.cron' not in pool.object_name_list():
continue
cron_obj = pool.get('ir.cron')
thread = threading.Thread(
- target=cron_obj.pool_jobs,
+ target=cron_obj.run,
args=(dbname,), kwargs={})
thread.start()
+ threads[dbname] = thread
for i in xrange(60):
time.sleep(1)
if not CRON_RUNNING:
@@ -207,48 +187,46 @@ thread.start()
from tryton.config import CONFIG as CLIENT_CONFIG
CLIENT_CONFIG.__setitem__('login.host', False, config=False)
CLIENT_CONFIG.__setitem__('login.server', 'localhost', config=False)
-CLIENT_CONFIG.__setitem__('login.port', '8070', config=False)
+CLIENT_CONFIG.__setitem__('login.port', 8000, config=False)
from tryton.gui.window.dbcreate import DBCreate
_DBCreate_run = DBCreate.run
-def DBCreate_run(self, parent):
+def DBCreate_run(self):
self.entry_serverpasswd.set_text('admin')
self.event_show_button_create(self.dialog, None)
- return _DBCreate_run(self, parent)
+ return _DBCreate_run(self)
DBCreate.run = DBCreate_run
from tryton.gui.window.dbdumpdrop import DBBackupDrop
_DBBackupDrop_run = DBBackupDrop.run
-def DBBackupDrop_run(self, parent):
+def DBBackupDrop_run(self):
self.entry_serverpasswd.set_text('admin')
- self.entry_server_connection.set_text('127.0.0.1:8070')
-
- liststore = gtk.ListStore(str)
- self.combo_database.set_model(liststore)
- self.refreshlist(None, self.combo_database, self.combo_database_label,
- self.db_progressbar, '127.0.0.1', 8070)
self.event_show_button_ok(self.dialog, None)
- return _DBBackupDrop_run(self, parent)
+ self.button_ok.set_sensitive(True)
+ return _DBBackupDrop_run(self)
DBBackupDrop.run = DBBackupDrop_run
from tryton.gui.window.dbrestore import DBRestore
_DBRestore_run = DBRestore.run
-def DBRestore_run(self, parent):
+def DBRestore_run(self):
self.entry_server_password.set_text('admin')
self.event_show_button_restore(self.dialog, None)
- return _DBRestore_run(self, parent)
+ return _DBRestore_run(self)
DBRestore.run = DBRestore_run
-from tryton.common import refresh_dblist
+from tryton.common import refresh_dblist, DBProgress
+import tryton.common as common
from tryton.gui.window.dblogin import DBLogin
+from tryton.exceptions import TrytonError
+
-def DBLogin_run(self, parent):
+def DBLogin_run(self):
self.combo_profile.destroy()
self.profile_button.destroy()
self.expander.destroy()
@@ -264,7 +242,7 @@ def DBLogin_run(self, parent):
self.database_combo.pack_start(cell, True)
self.database_combo.add_attribute(cell, 'text', 0)
- dbs = refresh_dblist('127.0.0.1', '8070')
+ dbs = refresh_dblist('localhost', 8000)
if dbs:
current_db = CLIENT_CONFIG['login.db']
for idx, dbname in enumerate(dbs):
@@ -276,8 +254,8 @@ def DBLogin_run(self, parent):
else:
dbname = None
def db_create(button):
- dia = DBCreate('127.0.0.1', 8070)
- dbname = dia.run(self.dialog)
+ dia = DBCreate('localhost', 8000)
+ dbname = dia.run()
button.hide()
self.table_main.attach(self.database_combo, 1, 3, 1, 2,
xoptions=gtk.FILL)
@@ -303,16 +281,14 @@ def DBLogin_run(self, parent):
db_name = dbstore[database][0]
CLIENT_CONFIG['login.db'] = db_name
result = (self.entry_login.get_text(),
- self.entry_password.get_text(), '127.0.0.1', 8070, db_name)
+ self.entry_password.get_text(), 'localhost', 8000, db_name)
+ self.parent.present()
+ self.dialog.destroy()
if res != gtk.RESPONSE_OK:
- parent.present()
- self.dialog.destroy()
rpc.logout()
from tryton.gui.main import Main
- raise Exception('QueryCanceled')
- parent.present()
- self.dialog.destroy()
+ raise TrytonError('QueryCanceled')
return result
DBLogin.run = DBLogin_run
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 07cb30a..8acbb3b 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 2.0.0
+Version: 2.2.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
index 01b31eb..5a57c4a 100644
--- a/neso.egg-info/SOURCES.txt
+++ b/neso.egg-info/SOURCES.txt
@@ -19,4 +19,6 @@ neso.egg-info/SOURCES.txt
neso.egg-info/dependency_links.txt
neso.egg-info/requires.txt
neso.egg-info/top_level.txt
+share/pixmaps/neso/neso-icon.svg
+share/pixmaps/neso/neso.icns
share/pixmaps/neso/neso.ico
\ No newline at end of file
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index 65fce96..47b6dae 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 2.0, < 2.0
-trytond >= 2.0, < 2.1
\ No newline at end of file
+tryton >= 2.2, < 2.2
+trytond >= 2.2, < 2.3
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 0104e0c..e42b8e9 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "2.0.0"
+VERSION = "2.2.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/share/pixmaps/neso/neso-icon.svg b/share/pixmaps/neso/neso-icon.svg
new file mode 100644
index 0000000..95d8cad
--- /dev/null
+++ b/share/pixmaps/neso/neso-icon.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="256"
+ height="256"
+ id="svg2589"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="tryton-icon.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0">
+ <title
+ id="title3104">Tryton</title>
+ <defs
+ id="defs2591">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2597" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="-750.71428"
+ inkscape:cy="62.857143"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="1024"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ width="256px"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata2594">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Tryton</dc:title>
+ <cc:license
+ rdf:resource="" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Bertrand Chenal</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-279.10535,-220.03895)">
+ <g
+ id="g2381"
+ transform="matrix(1.921664,0,0,1.921664,-257.24135,-202.80203)">
+ <path
+ inkscape:export-ydpi="86.470001"
+ inkscape:export-xdpi="86.470001"
+ inkscape:export-filename="/home/bch/icon.png"
+ sodipodi:nodetypes="ccccccccc"
+ id="path5301"
+ d="M 412.32323,322.16409 C 412.32308,343.04264 401.11709,353.40648 378.70516,353.25522 L 314.22867,353.25522 C 290.81311,353.25522 279.10535,343.19424 279.10535,323.07157 L 279.10535,251.3573 C 279.10535,230.4784 290.5622,220.03895 313.47599,220.03895 L 378.20338,220.03895 C 400.94981,220.03895 412.32308,230.55402 412.32323,251.58418 L 412.32323,322.16409"
+ style="font-size:108.87190247px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#1b2019;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Kimberley;-inkscape-font-specification:Kimberley" />
+ <path
+ inkscape:export-ydpi="86.470001"
+ inkscape:export-xdpi="86.470001"
+ inkscape:export-filename="/home/bch/icon.png"
+ style="fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.26842833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 288.99559,308.25172 C 292.09127,306.62574 297.88176,309.27449 300.50383,313.51767 C 302.8549,317.3218 314.76561,320.8627 318.98603,319.01203 C 321.80229,317.77783 322.51333,316.21366 322.73386,310.76695 C 323.1489,300.52359 320.84164,292.50281 313.37161,278.2244 C 309.62279,271.05845 305.69461,263.13385 304.64264,260.61737 C 303.59041,258.09966 300.75374,253.65582 298.33896,250.74177 C 293.19987,244.54382 293.04031,242.85028 297.25792,239.25469 C 303.57321,233.87143 314.24172,242.58579 311.93884,251.24628 C 310.80553,255.50895 312.98129,261.72677 320.18712,274.81699 C 328.73746,290.35035 337.40333,296.64235 342.57881,291.07544 C 343.9159,289.63767 345.57564,281.61605 347.10513,269.19866 C 349.40596,250.52245 349.39427,249.40476 346.86039,245.64991 C 342.47996,239.15809 346.61048,232.42164 353.54234,234.75155 C 360.53122,237.10014 365.09058,246.60512 360.71056,249.69411 C 358.76707,251.06431 358.13893,255.04878 357.25718,271.60031 C 356.12669,292.82409 356.98183,298.50462 361.73718,301.35982 C 365.96354,303.89702 367.43339,303.38127 376.34297,296.21369 C 385.79672,288.60995 389.68322,283.6885 389.93287,279.00589 C 390.16497,274.65077 393.05085,272.32083 397.65098,272.77605 C 400.58326,273.06708 401.89245,274.03055 403.53149,277.10171 C 406.87815,283.37342 405.91932,287.35835 400.8189,288.37652 C 396.66266,289.20529 389.52267,298.40471 378.53882,317.08095 C 366.94063,336.80192 364.39846,338.85614 351.40019,339.01368 C 346.05671,339.07751 338.58094,337.29897 320.98194,331.77309 C 308.14802,327.74219 295.98135,324.244 293.94456,323.9969 C 286.58526,323.10803 282.9191,311.44518 288.99559,308.25172 z"
+ id="path5303" />
+ </g>
+ </g>
+</svg>
diff --git a/share/pixmaps/neso/neso.icns b/share/pixmaps/neso/neso.icns
new file mode 100644
index 0000000..b501666
Binary files /dev/null and b/share/pixmaps/neso/neso.icns differ
commit b66ed294672d91a2056251331a3e1927a09a67e3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:13:28 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index c4bbca8..548a60c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-28
* Bug fixes (see mercurial logs for details)
Version 1.8.0 - 2010-11-01
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..3a474ed 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index b9a9990..07cb30a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.8.1
+Version: 2.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/bin/neso b/bin/neso
index 55965e8..0dcd1b9 100755
--- a/bin/neso
+++ b/bin/neso
@@ -7,6 +7,8 @@ import logging
import time
import threading
+import gobject
+
try:
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', 'neso')))
@@ -19,6 +21,12 @@ except:
if os.name == 'nt' and hasattr(sys, "frozen"):
sys.stdout = open(os.devnull, 'w')
sys.stderr = open(os.devnull, 'w')
+ etc = os.path.join(os.path.dirname(sys.executable), 'etc')
+ os.environ['GTK2_RC_FILES'] = os.path.join(etc, 'gtk-2.0', 'gtkrc')
+ os.environ['GDK_PIXBUF_MODULE_FILE'] = os.path.join(etc, 'gtk-2.0',
+ 'gdk-pixbuf.loaders')
+ os.environ['GTK_IM_MODULE_FILE'] = os.path.join(etc, 'gtk-2.0',
+ 'gtk.immodules')
if os.name == 'mac' or \
(hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
@@ -68,7 +76,8 @@ from tryton.config import get_home_dir
DATA_DIR = os.path.join(os.path.abspath(os.path.normpath(
os.path.dirname(sys.argv[0]))), '.neso')
if not os.path.isdir(DATA_DIR):
- DATA_DIR = os.path.join(get_home_dir(), '.neso')
+ DATA_DIR = os.path.join(unicode(get_home_dir(),
+ sys.getfilesystemencoding()), '.neso')
if not os.path.isdir(DATA_DIR):
os.mkdir(DATA_DIR, 0700)
VERSION_DATA_DIR = os.path.join(DATA_DIR, VERSION.rsplit('.', 1)[0])
@@ -220,7 +229,7 @@ def DBBackupDrop_run(self, parent):
liststore = gtk.ListStore(str)
self.combo_database.set_model(liststore)
self.refreshlist(None, self.combo_database, self.combo_database_label,
- '127.0.0.1', 8070)
+ self.db_progressbar, '127.0.0.1', 8070)
self.event_show_button_ok(self.dialog, None)
return _DBBackupDrop_run(self, parent)
@@ -236,6 +245,78 @@ def DBRestore_run(self, parent):
DBRestore.run = DBRestore_run
+from tryton.common import refresh_dblist
+from tryton.gui.window.dblogin import DBLogin
+
+def DBLogin_run(self, parent):
+ self.combo_profile.destroy()
+ self.profile_button.destroy()
+ self.expander.destroy()
+ self.label_host.destroy()
+ self.entry_host.destroy()
+ self.label_database.destroy()
+ self.entry_database.destroy()
+ self.profile_label.set_text('Database')
+ dbstore = gtk.ListStore(gobject.TYPE_STRING)
+ self.database_combo = gtk.ComboBox()
+ self.database_combo.set_model(dbstore)
+ cell = gtk.CellRendererText()
+ self.database_combo.pack_start(cell, True)
+ self.database_combo.add_attribute(cell, 'text', 0)
+
+ dbs = refresh_dblist('127.0.0.1', '8070')
+ if dbs:
+ current_db = CLIENT_CONFIG['login.db']
+ for idx, dbname in enumerate(dbs):
+ dbstore.append((dbname,))
+ if current_db == dbname:
+ self.database_combo.set_active(idx)
+ self.table_main.attach(self.database_combo, 1, 3, 1, 2,
+ xoptions=gtk.FILL)
+ else:
+ dbname = None
+ def db_create(button):
+ dia = DBCreate('127.0.0.1', 8070)
+ dbname = dia.run(self.dialog)
+ button.hide()
+ self.table_main.attach(self.database_combo, 1, 3, 1, 2,
+ xoptions=gtk.FILL)
+ self.database_combo.show()
+ dbstore.append((dbname,))
+ self.database_combo.set_active(len(dbstore)-1)
+ image = gtk.Image()
+ image.set_from_stock('tryton-new', gtk.ICON_SIZE_BUTTON)
+ create_button = gtk.Button(u'Create')
+ create_button.set_image(image)
+ create_button.connect('clicked', db_create)
+ self.table_main.attach(create_button, 1, 3, 1, 2, xoptions=gtk.FILL)
+
+ self.dialog.show_all()
+ self.dialog.reshow_with_initial_size()
+ res, result = None, ('', '', '', '', '')
+ while not (res in (gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT)
+ or (res == gtk.RESPONSE_OK and all(result))):
+ self.database_combo.grab_focus()
+ res = self.dialog.run()
+ database = self.database_combo.get_active()
+ if database != -1:
+ db_name = dbstore[database][0]
+ CLIENT_CONFIG['login.db'] = db_name
+ result = (self.entry_login.get_text(),
+ self.entry_password.get_text(), '127.0.0.1', 8070, db_name)
+
+ if res != gtk.RESPONSE_OK:
+ parent.present()
+ self.dialog.destroy()
+ rpc.logout()
+ from tryton.gui.main import Main
+ raise Exception('QueryCanceled')
+ parent.present()
+ self.dialog.destroy()
+ return result
+
+DBLogin.run = DBLogin_run
+
TrytonClient.run()
CRON_RUNNING = False
thread.join()
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index b9a9990..07cb30a 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.8.1
+Version: 2.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index 750997a..65fce96 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 1.8, < 1.8
-trytond >= 1.8, < 1.9
\ No newline at end of file
+tryton >= 2.0, < 2.0
+trytond >= 2.0, < 2.1
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 9a25071..0104e0c 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.8.1"
+VERSION = "2.0.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 55f13ea..b1d5665 100644
--- a/setup.py
+++ b/setup.py
@@ -7,16 +7,14 @@ import os
import sys
import glob
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
args = {}
+data_files = []
if os.name == 'nt':
import py2exe
- origIsSystemDLL = py2exe.build_exe.isSystemDLL
- def isSystemDLL(pathname):
- if os.path.basename(pathname).lower() in ("msvcp71.dll", "dwmapi.dll"):
- return 0
- return origIsSystemDLL(pathname)
- py2exe.build_exe.isSystemDLL = isSystemDLL
args['windows'] = [{
'script': os.path.join('bin', 'neso'),
@@ -55,16 +53,24 @@ if os.name == 'nt':
'pydot',
'BeautifulSoup',
'vobject',
- 'ldap',
'pkg_resources',
'vatnumber',
'suds',
'email',
'contextlib',
+ 'gio',
] + json,
}
}
args['zipfile'] = 'library.zip'
+
+ if sys.version_info < (2, 6):
+ data_files.append(('', ['msvp71.dll']))
+ else:
+ data_files.append(('', ['msvcr90.dll', 'msvcp90.dll', 'msvcm90.dll']))
+ manifest = read('Microsoft.VC90.CRT.manifest')
+ args['windows'][0]['other_resources'] = [(24, 1, manifest)]
+
elif os.name == 'mac' \
or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
import py2app
@@ -113,6 +119,7 @@ dist = setup(name=PACKAGE,
download_url='http://downloads.tryton.org/' + \
VERSION.rsplit('.', 1)[0] + '/',
packages=find_packages(),
+ data_files=data_files,
scripts=['bin/neso'],
classifiers=[
'Development Status :: 5 - Production/Stable',
commit e359841b4ae5930644d611024d14f3af19b3f166
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 11:46:32 2011 +0100
Adding upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0444178..c4bbca8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
* Add test for a .neso data directory in neso directory
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a474ed..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index 9451661..b9a9990 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.8.0
+Version: 1.8.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 9451661..b9a9990 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.8.0
+Version: 1.8.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/neso/version.py b/neso/version.py
index e88d14e..9a25071 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.8.0"
+VERSION = "1.8.1"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 7417f20..55f13ea 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ if os.name == 'nt':
'vatnumber',
'suds',
'email',
+ 'contextlib',
] + json,
}
}
@@ -82,6 +83,7 @@ elif os.name == 'mac' \
'dateutil, psycopg2, zipfile, sqlite3, '
'csv, pydoc, pydot, BeautifulSoup, '
'vobject, vatnumber, suds, email, cPickle, sha, '
+ 'contextlib, gtk_osxapplication, ldap, '
+ json),
'packages': ('xml, logging, lxml, genshi, DAV, pytz, email, '
'relatorio'),
@@ -89,6 +91,7 @@ elif os.name == 'mac' \
'frameworks': 'librsvg-2.2.dylib',
'plist': {
'CFBundleIdentifier': 'org.tryton.neso',
+ 'CFBundleName': 'Neso',
},
'iconfile': os.path.join('share', 'pixmaps', 'neso',
'neso.icns'),
@@ -367,5 +370,5 @@ elif os.name == 'mac' \
+ '.dmg')
if os.path.isfile(dmg_file):
os.remove(dmg_file)
- Popen(['hdiutil', 'create', dmg_file, '-volname', '"Neso ' +
- VERSION + '"', '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
+ Popen(['hdiutil', 'create', dmg_file, '-volname', 'Neso ' +
+ VERSION, '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
commit 0f15ac596fef701f04405eb8d37b78508e29c049
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 19:57:46 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 24205f1..0444178 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+* Add test for a .neso data directory in neso directory
+
Version 1.6.0 - 2010-05-15
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 80a8392..9451661 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.6.0
+Version: 1.8.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/bin/neso b/bin/neso
index bb183aa..55965e8 100755
--- a/bin/neso
+++ b/bin/neso
@@ -6,7 +6,6 @@ import os
import logging
import time
import threading
-import gtk
try:
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
@@ -21,37 +20,44 @@ if os.name == 'nt' and hasattr(sys, "frozen"):
sys.stdout = open(os.devnull, 'w')
sys.stderr = open(os.devnull, 'w')
-from neso.version import *
-
-try:
- for i in ('tryton', 'trytond'):
- DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', i, i)))
- if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-except:
- try:
- for i in ('tryton', 'trytond'):
- # try for py2exe
- DIR = os.path.join(os.path.abspath(os.path.normpath(
- os.path.dirname(sys.argv[0]))), i, i)
- if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
- except:
- pass
-
if os.name == 'mac' or \
(hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
resources = os.path.join(os.path.dirname(sys.argv[0]), '..', 'Resources')
gtkrc = os.path.join(resources, 'gtkrc')
pixbuf_loader = os.path.join(resources, 'gdk-pixbuf.loaders')
pangorc = os.path.join(resources, 'pangorc')
+ immodules = os.path.join(resources, 'gtk.immodules')
if os.path.isdir(resources):
os.environ['GTK2_RC_FILES'] = gtkrc
os.environ['GTK_EXE_PREFIX'] = resources
os.environ['GTK_DATA_PREFIX'] = resources
os.environ['GDK_PIXBUF_MODULE_FILE'] = pixbuf_loader
os.environ['PANGO_RC_FILE'] = pangorc
+ os.environ['GTK_IM_MODULE_FILE'] = immodules
+
+import gtk
+from neso.version import *
+
+for i in ('tryton', 'trytond'):
+ try:
+ DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', i, i)))
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+ continue
+ except: # Exception with py2exe
+ pass
+ # try for py2exe
+ DIR = os.path.join(os.path.abspath(os.path.normpath(
+ os.path.dirname(sys.argv[0]))), i, i)
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+ continue
+ # try for py2app
+ DIR = os.path.join(os.path.abspath(os.path.normpath(
+ os.path.dirname(sys.argv[0]))), '..', 'Resources', i, i)
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
import tryton.client
TrytonClient = tryton.client.TrytonClient()
@@ -59,9 +65,12 @@ TrytonClient = tryton.client.TrytonClient()
from trytond.config import CONFIG
from tryton.config import get_home_dir
-DATA_DIR = os.path.join(get_home_dir(), '.neso')
+DATA_DIR = os.path.join(os.path.abspath(os.path.normpath(
+ os.path.dirname(sys.argv[0]))), '.neso')
if not os.path.isdir(DATA_DIR):
- os.mkdir(DATA_DIR, 0700)
+ DATA_DIR = os.path.join(get_home_dir(), '.neso')
+ if not os.path.isdir(DATA_DIR):
+ os.mkdir(DATA_DIR, 0700)
VERSION_DATA_DIR = os.path.join(DATA_DIR, VERSION.rsplit('.', 1)[0])
if not os.path.isdir(VERSION_DATA_DIR):
os.mkdir(VERSION_DATA_DIR, 0700)
@@ -167,8 +176,9 @@ class _SOCK(object):
rpc._SOCK = _SOCK()
+CRON_RUNNING = True
def cron():
- while True:
+ while CRON_RUNNING:
for dbname in Pool.database_list():
pool = Pool(dbname)
if 'ir.cron' not in pool.object_name_list():
@@ -178,7 +188,10 @@ def cron():
target=cron_obj.pool_jobs,
args=(dbname,), kwargs={})
thread.start()
- time.sleep(60)
+ for i in xrange(60):
+ time.sleep(1)
+ if not CRON_RUNNING:
+ break
thread = threading.Thread(target=cron)
thread.start()
@@ -224,4 +237,6 @@ def DBRestore_run(self, parent):
DBRestore.run = DBRestore_run
TrytonClient.run()
-sys.exit()
+CRON_RUNNING = False
+thread.join()
+sys.exit(0)
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 80a8392..9451661 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.6.0
+Version: 1.8.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index d96c63f..750997a 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 1.6, < 1.6
-trytond >= 1.6, < 1.7
\ No newline at end of file
+tryton >= 1.8, < 1.8
+trytond >= 1.8, < 1.9
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 9fc6799..e88d14e 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.6.0"
+VERSION = "1.8.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 758a88d..7417f20 100644
--- a/setup.py
+++ b/setup.py
@@ -58,11 +58,43 @@ if os.name == 'nt':
'ldap',
'pkg_resources',
'vatnumber',
+ 'suds',
'email',
] + json,
}
}
args['zipfile'] = 'library.zip'
+elif os.name == 'mac' \
+ or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
+ import py2app
+ from modulegraph.find_modules import PY_SUFFIXES
+ PY_SUFFIXES.append('')
+ args['app'] = [os.path.join('bin', 'neso')]
+ json = 'json'
+ if sys.version_info < (2, 6):
+ json = 'simplejson'
+ args['options'] = {
+ 'py2app': {
+ 'argv_emulation': True,
+ 'includes': ('pygtk, gtk, glib, cairo, pango, pangocairo, atk, '
+ 'gobject, gio, gtk.keysyms, pkg_resources, ConfigParser, '
+ 'xmlrpclib, decimal, uuid, '
+ 'dateutil, psycopg2, zipfile, sqlite3, '
+ 'csv, pydoc, pydot, BeautifulSoup, '
+ 'vobject, vatnumber, suds, email, cPickle, sha, '
+ + json),
+ 'packages': ('xml, logging, lxml, genshi, DAV, pytz, email, '
+ 'relatorio'),
+ 'excludes': 'tryton, trytond',
+ 'frameworks': 'librsvg-2.2.dylib',
+ 'plist': {
+ 'CFBundleIdentifier': 'org.tryton.neso',
+ },
+ 'iconfile': os.path.join('share', 'pixmaps', 'neso',
+ 'neso.icns'),
+ },
+ }
+
execfile(os.path.join('neso', 'version.py'))
major_version, minor_version, _ = VERSION.split('.', 2)
@@ -102,6 +134,48 @@ dist = setup(name=PACKAGE,
**args
)
+def findFiles(topDir, pattern):
+ import fnmatch
+ for dirpath, dirnames, filenames in os.walk(topDir):
+ for filename in filenames:
+ if fnmatch.fnmatch(filename, pattern):
+ yield os.path.join(dirpath, filename)
+
+def copy_trytons(dist_dir):
+ from py_compile import compile
+ for i in ('tryton', 'trytond'):
+ if os.path.isdir(os.path.join(dist_dir, i)):
+ shutil.rmtree(os.path.join(dist_dir, i))
+ shutil.copytree(os.path.join(os.path.dirname(__file__), i),
+ os.path.join(dist_dir, i))
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ if os.path.isdir(os.path.join(dist_dir, i, j)):
+ shutil.rmtree(os.path.join(dist_dir, i, j))
+ for j in ('.hgtags', '.hgignore'):
+ if os.path.isfile(os.path.join(dist_dir, i, j)):
+ os.remove(os.path.join(dist_dir, i, j))
+ for file in glob.iglob(os.path.join(dist_dir, i, '*.exe')):
+ os.remove(file)
+ for file in glob.iglob(os.path.join(dist_dir, i, '*.dmg')):
+ os.remove(file)
+ for file in findFiles(os.path.join(dist_dir, i), '*.py'):
+ if file.endswith('__tryton__.py'):
+ continue
+ print "byte-compiling %s to %s" % (file,
+ file[len(dist_dir) + len(os.sep):] + \
+ (__debug__ and 'c' or 'o'))
+ compile(file, None, file[len(dist_dir) + len(os.sep):] + \
+ (__debug__ and 'c' or 'o'), True)
+ os.remove(file)
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ for dir in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
+ 'modules', '*', j)):
+ shutil.rmtree(dir)
+ for j in ('.hgtags', '.hgignore'):
+ for file in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
+ 'modules', '*', j)):
+ os.remove(file)
+
if os.name == 'nt':
def find_gtk_dir():
for directory in os.environ['PATH'].split(';'):
@@ -121,13 +195,6 @@ if os.name == 'nt':
return path
return None
- import fnmatch
- def findFiles(topDir, pattern):
- for dirpath, dirnames, filenames in os.walk(topDir):
- for filename in filenames:
- if fnmatch.fnmatch(filename, pattern):
- yield os.path.join(dirpath, filename)
-
if 'py2exe' in dist.commands:
import shutil
import pytz
@@ -152,37 +219,7 @@ if os.name == 'nt':
z.write(os.path.join(absdir, f), os.path.join(zip_dir, f))
z.close()
- from py_compile import compile
- for i in ('tryton', 'trytond'):
- if os.path.isdir(os.path.join(dist_dir, i)):
- shutil.rmtree(os.path.join(dist_dir, i))
- shutil.copytree(os.path.join(os.path.dirname(__file__), i),
- os.path.join(dist_dir, i))
- for j in ('.hg', 'dist', 'build', i + '.egg-info'):
- if os.path.isdir(os.path.join(dist_dir, i, j)):
- shutil.rmtree(os.path.join(dist_dir, i, j))
- for j in ('.hgtags', '.hgignore'):
- if os.path.isfile(os.path.join(dist_dir, i, j)):
- os.remove(os.path.join(dist_dir, i, j))
- for file in glob.iglob(os.path.join(dist_dir, i, '*.exe')):
- os.remove(file)
- for file in findFiles(os.path.join(dist_dir, i), '*.py'):
- if file.endswith('__tryton__.py'):
- continue
- print "byte-compiling %s to %s" % (file,
- file[len(dist_dir) + len(os.sep):] + \
- (__debug__ and 'c' or 'o'))
- compile(file, None, file[len(dist_dir) + len(os.sep):] + \
- (__debug__ and 'c' or 'o'), True)
- os.remove(file)
- for j in ('.hg', 'dist', 'build', i + '.egg-info'):
- for dir in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
- 'modules', '*', j)):
- shutil.rmtree(dir)
- for j in ('.hgtags', '.hgignore'):
- for file in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
- 'modules', '*', j)):
- os.remove(file)
+ copy_trytons(dist_dir)
if os.path.isdir(os.path.join(dist_dir, 'etc')):
shutil.rmtree(os.path.join(dist_dir, 'etc'))
@@ -223,3 +260,112 @@ if os.name == 'nt':
Popen([makensis, "/DVERSION=" + VERSION,
str(os.path.join(os.path.dirname(__file__),
'setup.nsi'))]).wait()
+elif os.name == 'mac' \
+ or (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
+ def find_gtk_dir():
+ for directory in os.environ['PATH'].split(':'):
+ if not os.path.isdir(directory):
+ continue
+ for file in ('gtk-demo',):
+ if os.path.isfile(os.path.join(directory, file)):
+ return os.path.dirname(directory)
+ return None
+
+ if 'py2app' in dist.commands:
+ import shutil
+ from subprocess import Popen, PIPE
+ from itertools import chain
+ from glob import iglob
+ gtk_dir = find_gtk_dir()
+ gtk_binary_version = Popen(['pkg-config', '--variable=gtk_binary_version',
+ 'gtk+-2.0'], stdout=PIPE).stdout.read().strip()
+
+ dist_dir = dist.command_obj['py2app'].dist_dir
+ resources_dir = os.path.join(dist_dir, 'neso.app', 'Contents', 'Resources')
+
+ copy_trytons(resources_dir)
+
+ gtk_2_dist_dir = os.path.join(resources_dir, 'lib', 'gtk-2.0')
+ pango_dist_dir = os.path.join(resources_dir, 'lib', 'pango')
+
+ if os.path.isdir(pango_dist_dir):
+ shutil.rmtree(pango_dist_dir)
+ shutil.copytree(os.path.join(gtk_dir, 'lib', 'pango'), pango_dist_dir)
+
+ query_pango = Popen(os.path.join(gtk_dir, 'bin', 'pango-querymodules'),
+ stdout=PIPE).stdout.read()
+ query_pango = query_pango.replace(gtk_dir, '@executable_path/../Resources')
+ pango_modules = open(os.path.join(resources_dir, 'pango.modules'), 'w')
+ pango_modules.write(query_pango)
+ pango_modules.close()
+
+ pangorc = open(os.path.join(resources_dir, 'pangorc'), 'w')
+ pangorc.write('[Pango]\n')
+ pangorc.write('ModuleFiles=./pango.modules\n')
+ pangorc.close()
+
+ if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders')):
+ shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders'))
+ shutil.copytree(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
+ 'loaders'), os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders'))
+ if not os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines')):
+ os.makedirs(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines'))
+ shutil.copyfile(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
+ 'engines', 'libclearlooks.so'), os.path.join(gtk_2_dist_dir,
+ gtk_binary_version, 'engines', 'libclearlooks.so'))
+
+ query_loaders = Popen(os.path.join(gtk_dir,'bin','gdk-pixbuf-query-loaders'),
+ stdout=PIPE).stdout.read()
+ query_loaders = query_loaders.replace(gtk_dir, '@executable_path/../Resources')
+ loaders = open(os.path.join(resources_dir, 'gdk-pixbuf.loaders'), 'w')
+ loaders.write(query_loaders)
+ loaders.close()
+
+ if os.path.isdir(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules')):
+ shutil.rmtree(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules'))
+ shutil.copytree(os.path.join(gtk_dir, 'lib', 'gtk-2.0', gtk_binary_version,
+ 'immodules'), os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules'))
+
+ query_immodules = Popen(os.path.join(gtk_dir, 'bin', 'gtk-query-immodules-2.0'),
+ stdout=PIPE).stdout.read()
+ query_immodules = query_immodules.replace(gtk_dir, '@executable_path/../Resources')
+ immodules = open(os.path.join(resources_dir, 'gtk.immodules'), 'w')
+ immodules.write(query_immodules)
+ immodules.close()
+
+ shutil.copy(os.path.join(gtk_dir, 'share', 'themes', 'Clearlooks',
+ 'gtk-2.0', 'gtkrc'), os.path.join(resources_dir, 'gtkrc'))
+
+ for lang in ('de', 'es', 'fr', 'ru'):
+ if os.path.isdir(os.path.join(resources_dir, 'share', 'locale', lang)):
+ shutil.rmtree(os.path.join(resources_dir, 'share', 'locale', lang))
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
+ os.path.join(resources_dir, 'share', 'locale', lang))
+
+ # fix pathes within shared libraries
+ for library in chain(
+ iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'loaders', '*.so')),
+ iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'engines', '*.so')),
+ iglob(os.path.join(gtk_2_dist_dir, gtk_binary_version, 'immodules', '*.so')),
+ iglob(os.path.join(pango_dist_dir,'*','modules','*.so'))):
+ libs = [lib.split('(')[0].strip()
+ for lib in Popen(['otool', '-L', library],
+ stdout=PIPE).communicate()[0].splitlines()
+ if 'compatibility' in lib]
+ libs = dict(((lib, None) for lib in libs if gtk_dir in lib))
+ for lib in libs.keys():
+ fixed = lib.replace(gtk_dir + '/lib',
+ '@executable_path/../Frameworks')
+ Popen(['install_name_tool', '-change', lib, fixed,
+ library]).wait()
+
+ for file in ('CHANGELOG', 'COPYRIGHT', 'LICENSE', 'README'):
+ shutil.copyfile(os.path.join(os.path.dirname(__file__), file),
+ os.path.join(dist_dir, file + '.txt'))
+
+ dmg_file = os.path.join(os.path.dirname(__file__), 'neso-' + VERSION
+ + '.dmg')
+ if os.path.isfile(dmg_file):
+ os.remove(dmg_file)
+ Popen(['hdiutil', 'create', dmg_file, '-volname', '"Neso ' +
+ VERSION + '"', '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
commit cd96fe3c2548b53bdefb658a3c8014e0050311bf
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Sat May 15 11:53:27 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index d46dbab..24205f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,5 @@
-Version 1.4.2 - 2010-02-17
-* Some bug fixes (see mercurial logs for details)
-
-Version 1.4.1 - 2009-11-25
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 - 2010-05-15
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 8ac7796..80a8392 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.2
+Version: 1.6.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/bin/neso b/bin/neso
index f90c44a..bb183aa 100755
--- a/bin/neso
+++ b/bin/neso
@@ -122,8 +122,9 @@ def login(username, password, host, port, database):
rpc.login = login
def logout():
- dispatch('127.0.0.1', 8070, 'local', rpc._DATABASE, rpc._USERNAME, rpc._SESSION,
- 'common', 'db', 'logout')
+ if rpc._SOCK and rpc._USER:
+ dispatch('127.0.0.1', 8070, 'local', rpc._DATABASE, rpc._USERNAME,
+ rpc._SESSION, 'common', 'db', 'logout')
rpc._USER = 0
rpc._USERNAME = ''
rpc._SESSION = ''
@@ -223,3 +224,4 @@ def DBRestore_run(self, parent):
DBRestore.run = DBRestore_run
TrytonClient.run()
+sys.exit()
diff --git a/neso.desktop b/neso.desktop
index 380e7a7..db00ca8 100644
--- a/neso.desktop
+++ b/neso.desktop
@@ -3,7 +3,7 @@ Version=1.0
Type=Application
Name=Neso
GenericName=Standalone Client/Server for the Tryton Application Platform
-GenericName[de]=Autonomer Client/Server für die Tryton Application Platform
+GenericName[de]=Autonomer Client/Server für die Tryton Applikationsplattform
Comment=Run Tryton
Comment[de]=Tryton starten
Exec=neso
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 8ac7796..80a8392 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.2
+Version: 1.6.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index b1aca1a..d96c63f 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 1.4.0
-trytond >= 1.4.0
\ No newline at end of file
+tryton >= 1.6, < 1.6
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/neso/version.py b/neso/version.py
index 4ff0daa..9fc6799 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.4.2"
+VERSION = "1.6.0"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index f7ce116..758a88d 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,9 @@ if os.name == 'nt':
'script': os.path.join('bin', 'neso'),
'icon_resources': [(1, os.path.join('share', 'pixmaps', 'neso', 'neso.ico'))],
}]
+ json = ['json']
+ if sys.version_info < (2, 6):
+ json = ['simplejson']
args['options'] = {
'py2exe': {
'optimize': 0,
@@ -39,7 +42,7 @@ if os.name == 'nt':
'xmlrpclib',
'xml',
'decimal',
- 'mx.DateTime',
+ 'dateutil',
'logging.handlers',
'psycopg2',
'zipfile',
@@ -54,12 +57,17 @@ if os.name == 'nt':
'vobject',
'ldap',
'pkg_resources',
- ],
+ 'vatnumber',
+ 'email',
+ ] + json,
}
}
args['zipfile'] = 'library.zip'
execfile(os.path.join('neso', 'version.py'))
+major_version, minor_version, _ = VERSION.split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
dist = setup(name=PACKAGE,
version=VERSION,
@@ -86,8 +94,10 @@ dist = setup(name=PACKAGE,
],
license='GPL-3',
install_requires=[
- 'tryton >= 1.4.0',
- 'trytond >= 1.4.0',
+ 'tryton >= %s.%s, < %s.%s' % (major_version, minor_version,
+ major_version, minor_version),
+ 'trytond >= %s.%s, < %s.%s' % (major_version, minor_version,
+ major_version, minor_version + 1),
],
**args
)
commit c657708238d6ce023d2885af9476cf62a8544c05
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 11:05:22 2010 +0100
Adding upstream version 1.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index db99e71..d46dbab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.2 - 2010-02-17
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.1 - 2009-11-25
* Some bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1ec4427..8ac7796 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.1
+Version: 1.4.2
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/bin/neso b/bin/neso
index c92d0d8..f90c44a 100755
--- a/bin/neso
+++ b/bin/neso
@@ -15,6 +15,12 @@ try:
sys.path.insert(0, os.path.dirname(DIR))
except:
pass
+
+# True only if running as a py2exe app
+if os.name == 'nt' and hasattr(sys, "frozen"):
+ sys.stdout = open(os.devnull, 'w')
+ sys.stderr = open(os.devnull, 'w')
+
from neso.version import *
try:
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 1ec4427..8ac7796 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.1
+Version: 1.4.2
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/neso/version.py b/neso/version.py
index 2299c7b..4ff0daa 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.4.1"
+VERSION = "1.4.2"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/share/pixmaps/neso/neso.ico b/share/pixmaps/neso/neso.ico
index 34e7b02..96e06f8 100644
Binary files a/share/pixmaps/neso/neso.ico and b/share/pixmaps/neso/neso.ico differ
commit 1b3b4bc811b4ec8971c7ba37db2b3d8601af50e3
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 12:42:36 2009 +0100
Adding upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..db99e71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.1 - 2009-11-25
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 6127357..1ec4427 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.0
+Version: 1.4.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/french.nsh b/french.nsh
index 92eae19..2010136 100644
--- a/french.nsh
+++ b/french.nsh
@@ -8,10 +8,10 @@
!endif
!define CURLANG ${LANG_FRENCH}
-LangString LicenseText ${CURLANG} "Neso est publié sous la GNU General Public License comme publiée par la Free Software Foundation, soit la version 3 de la License, ou (à votre choix) toute version ultérieure. S'il vous plaît lisez attentivement la license. Cliquez sur Suivant pour continuer."
+LangString LicenseText ${CURLANG} "Neso est publié sous la GNU General Public License comme publiée par la Free Software Foundation, soit la version 3 de la License, ou (à votre choix) toute version ultérieure. S'il vous plaît lisez attentivement la license. Cliquez sur Suivant pour continuer."
LangString LicenseNext ${CURLANG} "&Suivant"
-LangString PreviousInstall ${CURLANG} "Veuillez désinstaller la précédente installation de Neso"
+LangString PreviousInstall ${CURLANG} "Veuillez désinstaller la précédente installation de Neso"
LangString SecNesoName ${CURLANG} "Neso"
LangString SecNesoDesc ${CURLANG} "Installe neso.exe et d'autres fichiers requis"
-LangString SecStartMenuName ${CURLANG} "Raccourcis dans le menu Démarrer et sur le bureau"
-LangString SecStartMenuDesc ${CURLANG} "Créé les raccourcis dans le menu Démarrer et sur le bureau"
+LangString SecStartMenuName ${CURLANG} "Raccourcis dans le menu Démarrer et sur le bureau"
+LangString SecStartMenuDesc ${CURLANG} "Créé les raccourcis dans le menu Démarrer et sur le bureau"
diff --git a/german.nsh b/german.nsh
index df8edc6..445b603 100644
--- a/german.nsh
+++ b/german.nsh
@@ -8,10 +8,10 @@
!endif
!define CURLANG ${LANG_GERMAN}
-LangString LicenseText ${CURLANG} "Neso wird unter der GNU General Public License wie von der Free Software Foundation veröffentlicht freigegeben, entweder Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren Version. Bitte lesen Sie die Lizenz aufmerksam. Klicken Sie auf Weiter, um fortzufahren."
+LangString LicenseText ${CURLANG} "Neso wird unter der GNU General Public License wie von der Free Software Foundation veröffentlicht freigegeben, entweder Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren Version. Bitte lesen Sie die Lizenz aufmerksam. Klicken Sie auf Weiter, um fortzufahren."
LangString LicenseNext ${CURLANG} "&Weiter"
LangString PreviousInstall ${CURLANG} "Bitte deinstallieren Sie die vorherige Installation von Neso"
LangString SecNesoName ${CURLANG} "Neso"
-LangString SecNesoDesc ${CURLANG} "neso.exe und andere benötigte Dateien installieren"
-LangString SecStartMenuName ${CURLANG} "Startmenü und Desktop-Verknüpfungen"
-LangString SecStartMenuDesc ${CURLANG} "Verknüpfungen im Startmenü und auf dem Desktop erstellen"
+LangString SecNesoDesc ${CURLANG} "neso.exe und andere benötigte Dateien installieren"
+LangString SecStartMenuName ${CURLANG} "Startmenü und Desktop-Verknüpfungen"
+LangString SecStartMenuDesc ${CURLANG} "Verknüpfungen im Startmenü und auf dem Desktop erstellen"
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 6127357..1ec4427 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: neso
-Version: 1.4.0
+Version: 1.4.1
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/neso/version.py b/neso/version.py
index bb387c6..2299c7b 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "neso"
-VERSION = "1.4.0"
+VERSION = "1.4.1"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index c976355..f7ce116 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ if os.name == 'nt':
],
}
}
- args['zipfile'] = None
+ args['zipfile'] = 'library.zip'
execfile(os.path.join('neso', 'version.py'))
@@ -120,10 +120,28 @@ if os.name == 'nt':
if 'py2exe' in dist.commands:
import shutil
+ import pytz
+ import zipfile
+
gtk_dir = find_gtk_dir()
dist_dir = dist.command_obj['py2exe'].dist_dir
+ # pytz installs the zoneinfo directory tree in the same directory
+ # 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')
+ disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__))
+ zipfile_path = os.path.join(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()
+
from py_compile import compile
for i in ('tryton', 'trytond'):
if os.path.isdir(os.path.join(dist_dir, i)):
diff --git a/spanish.nsh b/spanish.nsh
index 5434c5a..f08a297 100644
--- a/spanish.nsh
+++ b/spanish.nsh
@@ -8,10 +8,10 @@
!endif
!define CURLANG ${LANG_SPANISH}
-LangString LicenseText ${CURLANG} "Neso es liberado bajo la licencia GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. Por favor, lea cuidadosamente la licencia. Haga clic en Siguiente para continuar."
+LangString LicenseText ${CURLANG} "Neso es liberado bajo la licencia GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. Por favor, lea cuidadosamente la licencia. Haga clic en Siguiente para continuar."
LangString LicenseNext ${CURLANG} "&Siguiente"
-LangString PreviousInstall ${CURLANG} "Por favor, desinstalar la anterior instalación Neso"
+LangString PreviousInstall ${CURLANG} "Por favor, desinstalar la anterior instalación Neso"
LangString SecNesoName ${CURLANG} "Neso"
LangString SecNesoDesc ${CURLANG} "Instalar neso.exe y otros archivos necesarios"
-LangString SecStartMenuName ${CURLANG} "Menú Inicio y los accesos directos del escritorio"
-LangString SecStartMenuDesc ${CURLANG} "Crear accesos directos en el menú de inicio y en el escritorio"
+LangString SecStartMenuName ${CURLANG} "Menú Inicio y los accesos directos del escritorio"
+LangString SecStartMenuDesc ${CURLANG} "Crear accesos directos en el menú de inicio y en el escritorio"
commit 07e9bb28087be0300340956659f7eecfa9e45fee
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 23:06:22 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3a474ed
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 B2CK SPRL.
+
+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 3 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, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..9adbe89
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,30 @@
+Installing neso
+===============
+
+Prerequisites
+-------------
+
+ * Python 2.5 or later (http://www.python.org/)
+ * tryton 1.4 or later (http://www.tryton.org/)
+ * trytond 1.4 or later (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a neso source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install neso to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, run ``bin/neso`` from where the archive was
+unpacked. You must have tryton and trytond unpacked inside neso folder.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..eba162e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include LICENSE
+include COPYRIGHT
+include README
+include INSTALL
+include TODO
+include CHANGELOG
+include setup.nsi
+include neso.desktop
+include *.nsh
+include share/pixmaps/neso/*.ico
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..6127357
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,22 @@
+Metadata-Version: 1.0
+Name: neso
+Version: 1.4.0
+Summary: Standalone Client/Server for the Tryton Application Platform
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: X11 Applications :: GTK
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..b8cf894
--- /dev/null
+++ b/README
@@ -0,0 +1,45 @@
+neso
+====
+
+The client/server of the Tryton application platform.
+A three-tiers high-level general purpose application platform
+written in Python and use SQLite as database engine.
+It is the core base of an Open Source ERP.
+It provides modularity, scalability and security.
+
+Installing
+----------
+
+See INSTALL
+
+Package Contents
+----------------
+
+ bin/
+ Script for startup.
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/bin/neso b/bin/neso
new file mode 100755
index 0000000..c92d0d8
--- /dev/null
+++ b/bin/neso
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+import sys
+import os
+import logging
+import time
+import threading
+import gtk
+
+try:
+ DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', 'neso')))
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+except:
+ pass
+from neso.version import *
+
+try:
+ for i in ('tryton', 'trytond'):
+ DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', i, i)))
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+except:
+ try:
+ for i in ('tryton', 'trytond'):
+ # try for py2exe
+ DIR = os.path.join(os.path.abspath(os.path.normpath(
+ os.path.dirname(sys.argv[0]))), i, i)
+ if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+ except:
+ pass
+
+if os.name == 'mac' or \
+ (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'):
+ resources = os.path.join(os.path.dirname(sys.argv[0]), '..', 'Resources')
+ gtkrc = os.path.join(resources, 'gtkrc')
+ pixbuf_loader = os.path.join(resources, 'gdk-pixbuf.loaders')
+ pangorc = os.path.join(resources, 'pangorc')
+ if os.path.isdir(resources):
+ os.environ['GTK2_RC_FILES'] = gtkrc
+ os.environ['GTK_EXE_PREFIX'] = resources
+ os.environ['GTK_DATA_PREFIX'] = resources
+ os.environ['GDK_PIXBUF_MODULE_FILE'] = pixbuf_loader
+ os.environ['PANGO_RC_FILE'] = pangorc
+
+import tryton.client
+TrytonClient = tryton.client.TrytonClient()
+
+from trytond.config import CONFIG
+from tryton.config import get_home_dir
+
+DATA_DIR = os.path.join(get_home_dir(), '.neso')
+if not os.path.isdir(DATA_DIR):
+ os.mkdir(DATA_DIR, 0700)
+VERSION_DATA_DIR = os.path.join(DATA_DIR, VERSION.rsplit('.', 1)[0])
+if not os.path.isdir(VERSION_DATA_DIR):
+ os.mkdir(VERSION_DATA_DIR, 0700)
+
+CONFIG.options['netrpc'] = False
+CONFIG.options['xmlrpc'] = False
+CONFIG.options['webdav'] = False
+CONFIG.options['db_type'] = 'sqlite'
+CONFIG.options['data_path'] = VERSION_DATA_DIR
+
+for mod in sys.modules.keys():
+ if mod.startswith('trytond.') \
+ and not mod.startswith('trytond.config'):
+ del sys.modules[mod]
+
+from trytond.pool import Pool
+Pool.start()
+
+from trytond.protocols.dispatcher import dispatch
+from trytond.backend import Database
+
+import tryton.rpc as rpc
+
+def db_list(host, port):
+ Database._memory_database = None
+ return dispatch('127.0.0.1', 8070, 'local', None, None, None, 'common', 'db',
+ 'list')
+
+rpc.db_list = db_list
+
+def db_exec(host, port, method, *args):
+ Database._memory_database = None
+ args = ('127.0.0.1', 8070, 'local', None, None, None, 'common', 'db', method) \
+ + args
+ return dispatch(*args)
+
+rpc.db_exec = db_exec
+
+def server_version(host, port):
+ return dispatch('127.0.0.1', 8070, 'local', None, None, None, 'common', None,
+ 'version')
+rpc.server_version = server_version
+
+def login(username, password, host, port, database):
+ res = dispatch('127.0.0.1', 8070, 'local', database, username, password,
+ 'common', 'db', 'login')
+ if not res:
+ rpc._USER = 0
+ rpc._SESSION = ''
+ return -2
+ rpc._USER = res[0]
+ rpc._USERNAME = username
+ rpc._SESSION = res[1]
+ rpc._DATABASE = database
+ rpc.context_reload()
+ return 1
+
+rpc.login = login
+
+def logout():
+ dispatch('127.0.0.1', 8070, 'local', rpc._DATABASE, rpc._USERNAME, rpc._SESSION,
+ 'common', 'db', 'logout')
+ rpc._USER = 0
+ rpc._USERNAME = ''
+ rpc._SESSION = ''
+ rpc._DATABASE = ''
+ rpc._VIEW_CACHE = {}
+ rpc.SECURE = False
+
+rpc.logout = logout
+
+def _execute(blocking, *args):
+ logging.getLogger('rpc.request').info(repr((args)))
+ key = False
+ if len(args) >= 6 and args[1] == 'fields_view_get':
+ key = str(args)
+ if key in rpc._VIEW_CACHE and rpc._VIEW_CACHE[key][0]:
+ args = args[:]
+ args = args + (rpc._VIEW_CACHE[key][0],)
+ res = rpc._SEMAPHORE.acquire(blocking)
+ if not res:
+ return
+ try:
+ result = dispatch(*(('127.0.0.1', 8070, 'local', rpc._DATABASE,
+ rpc._USER, rpc._SESSION) + args))
+ finally:
+ rpc._SEMAPHORE.release()
+ if key:
+ if result is True and key in rpc._VIEW_CACHE:
+ result = rpc._VIEW_CACHE[key][1]
+ else:
+ rpc._VIEW_CACHE[key] = (result['md5'], result)
+ logging.getLogger('rpc.result').debug(repr(result))
+ return result
+
+rpc._execute = _execute
+
+class _SOCK(object):
+ hostname = 'localhost'
+ host = '127.0.0.1'
+ port = 8070
+
+rpc._SOCK = _SOCK()
+
+def cron():
+ while True:
+ for dbname in Pool.database_list():
+ pool = Pool(dbname)
+ if 'ir.cron' not in pool.object_name_list():
+ continue
+ cron_obj = pool.get('ir.cron')
+ thread = threading.Thread(
+ target=cron_obj.pool_jobs,
+ args=(dbname,), kwargs={})
+ thread.start()
+ time.sleep(60)
+thread = threading.Thread(target=cron)
+thread.start()
+
+from tryton.config import CONFIG as CLIENT_CONFIG
+CLIENT_CONFIG.__setitem__('login.host', False, config=False)
+CLIENT_CONFIG.__setitem__('login.server', 'localhost', config=False)
+CLIENT_CONFIG.__setitem__('login.port', '8070', config=False)
+
+from tryton.gui.window.dbcreate import DBCreate
+_DBCreate_run = DBCreate.run
+
+def DBCreate_run(self, parent):
+ self.entry_serverpasswd.set_text('admin')
+ self.event_show_button_create(self.dialog, None)
+ return _DBCreate_run(self, parent)
+
+DBCreate.run = DBCreate_run
+
+from tryton.gui.window.dbdumpdrop import DBBackupDrop
+_DBBackupDrop_run = DBBackupDrop.run
+
+def DBBackupDrop_run(self, parent):
+ self.entry_serverpasswd.set_text('admin')
+ self.entry_server_connection.set_text('127.0.0.1:8070')
+
+ liststore = gtk.ListStore(str)
+ self.combo_database.set_model(liststore)
+ self.refreshlist(None, self.combo_database, self.combo_database_label,
+ '127.0.0.1', 8070)
+ self.event_show_button_ok(self.dialog, None)
+ return _DBBackupDrop_run(self, parent)
+
+DBBackupDrop.run = DBBackupDrop_run
+
+from tryton.gui.window.dbrestore import DBRestore
+_DBRestore_run = DBRestore.run
+
+def DBRestore_run(self, parent):
+ self.entry_server_password.set_text('admin')
+ self.event_show_button_restore(self.dialog, None)
+ return _DBRestore_run(self, parent)
+
+DBRestore.run = DBRestore_run
+
+TrytonClient.run()
diff --git a/english.nsh b/english.nsh
new file mode 100644
index 0000000..7cea603
--- /dev/null
+++ b/english.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_ENGLISH}
+
+LangString LicenseText ${CURLANG} "Neso is released under the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Please carefully read the license. Click Next to continue."
+LangString LicenseNext ${CURLANG} "&Next"
+LangString PreviousInstall ${CURLANG} "Please uninstall the previous Neso installation"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "Install neso.exe and other required files"
+LangString SecStartMenuName ${CURLANG} "Start Menu and Desktop Shortcuts"
+LangString SecStartMenuDesc ${CURLANG} "Create shortcuts in the start menu and on desktop"
diff --git a/french.nsh b/french.nsh
new file mode 100644
index 0000000..92eae19
--- /dev/null
+++ b/french.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_FRENCH}
+
+LangString LicenseText ${CURLANG} "Neso est publié sous la GNU General Public License comme publiée par la Free Software Foundation, soit la version 3 de la License, ou (à votre choix) toute version ultérieure. S'il vous plaît lisez attentivement la license. Cliquez sur Suivant pour continuer."
+LangString LicenseNext ${CURLANG} "&Suivant"
+LangString PreviousInstall ${CURLANG} "Veuillez désinstaller la précédente installation de Neso"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "Installe neso.exe et d'autres fichiers requis"
+LangString SecStartMenuName ${CURLANG} "Raccourcis dans le menu Démarrer et sur le bureau"
+LangString SecStartMenuDesc ${CURLANG} "Créé les raccourcis dans le menu Démarrer et sur le bureau"
diff --git a/german.nsh b/german.nsh
new file mode 100644
index 0000000..df8edc6
--- /dev/null
+++ b/german.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_GERMAN}
+
+LangString LicenseText ${CURLANG} "Neso wird unter der GNU General Public License wie von der Free Software Foundation veröffentlicht freigegeben, entweder Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren Version. Bitte lesen Sie die Lizenz aufmerksam. Klicken Sie auf Weiter, um fortzufahren."
+LangString LicenseNext ${CURLANG} "&Weiter"
+LangString PreviousInstall ${CURLANG} "Bitte deinstallieren Sie die vorherige Installation von Neso"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "neso.exe und andere benötigte Dateien installieren"
+LangString SecStartMenuName ${CURLANG} "Startmenü und Desktop-Verknüpfungen"
+LangString SecStartMenuDesc ${CURLANG} "Verknüpfungen im Startmenü und auf dem Desktop erstellen"
diff --git a/neso.desktop b/neso.desktop
new file mode 100644
index 0000000..380e7a7
--- /dev/null
+++ b/neso.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Neso
+GenericName=Standalone Client/Server for the Tryton Application Platform
+GenericName[de]=Autonomer Client/Server für die Tryton Application Platform
+Comment=Run Tryton
+Comment[de]=Tryton starten
+Exec=neso
+Icon=neso-icon
+Terminal=false
+Categories=Office;Finance;
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
new file mode 100644
index 0000000..6127357
--- /dev/null
+++ b/neso.egg-info/PKG-INFO
@@ -0,0 +1,22 @@
+Metadata-Version: 1.0
+Name: neso
+Version: 1.4.0
+Summary: Standalone Client/Server for the Tryton Application Platform
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: X11 Applications :: GTK
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
new file mode 100644
index 0000000..01b31eb
--- /dev/null
+++ b/neso.egg-info/SOURCES.txt
@@ -0,0 +1,22 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+english.nsh
+french.nsh
+german.nsh
+neso.desktop
+setup.nsi
+setup.py
+spanish.nsh
+bin/neso
+neso/__init__.py
+neso/version.py
+neso.egg-info/PKG-INFO
+neso.egg-info/SOURCES.txt
+neso.egg-info/dependency_links.txt
+neso.egg-info/requires.txt
+neso.egg-info/top_level.txt
+share/pixmaps/neso/neso.ico
\ No newline at end of file
diff --git a/neso.egg-info/dependency_links.txt b/neso.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/neso.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
new file mode 100644
index 0000000..b1aca1a
--- /dev/null
+++ b/neso.egg-info/requires.txt
@@ -0,0 +1,2 @@
+tryton >= 1.4.0
+trytond >= 1.4.0
\ No newline at end of file
diff --git a/neso.egg-info/top_level.txt b/neso.egg-info/top_level.txt
new file mode 100644
index 0000000..f54ed04
--- /dev/null
+++ b/neso.egg-info/top_level.txt
@@ -0,0 +1 @@
+neso
diff --git a/neso/__init__.py b/neso/__init__.py
new file mode 100644
index 0000000..c86640b
--- /dev/null
+++ b/neso/__init__.py
@@ -0,0 +1,2 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
diff --git a/neso/version.py b/neso/version.py
new file mode 100644
index 0000000..bb387c6
--- /dev/null
+++ b/neso/version.py
@@ -0,0 +1,6 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+PACKAGE = "neso"
+VERSION = "1.4.0"
+LICENSE = "GPL-3"
+WEBSITE = "http://www.tryton.org/"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.nsi b/setup.nsi
new file mode 100644
index 0000000..0c8265d
--- /dev/null
+++ b/setup.nsi
@@ -0,0 +1,151 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+;Check version
+!ifndef VERSION
+ !error "Missing VERSION! Specify it with '/DVERSION=<VERSION>'"
+!endif
+
+;Include Modern UI
+!include "MUI.nsh"
+
+;General
+Name "Neso ${VERSION}"
+OutFile "neso-setup-${VERSION}.exe"
+SetCompressor lzma
+SetCompress auto
+
+;Default installation folder
+InstallDir "$PROGRAMFILES\neso-${VERSION}"
+
+;Get installation folder from registry if available
+InstallDirRegKey HKCU "Software\neso-${VERSION}" ""
+
+BrandingText "Neso ${VERSION}"
+
+;Vista redirects $SMPROGRAMS to all users without this
+RequestExecutionLevel admin
+
+;Variables
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+;Interface Settings
+!define MUI_ABORTWARNING
+
+;Language Selection Dialog Settings
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\Modern UI Test"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+;Pages
+
+!define MUI_ICON "share\pixmaps\neso\neso.ico"
+!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(LicenseText)"
+!define MUI_LICENSEPAGE_BUTTON "$(LicenseNext)"
+
+!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+!insertmacro MUI_PAGE_INSTFILES
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+!include "english.nsh"
+!insertmacro MUI_LANGUAGE "French"
+!include "french.nsh"
+!insertmacro MUI_LANGUAGE "German"
+!include "german.nsh"
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "spanish.nsh"
+
+;Reserve Files
+
+;If you are using solid compression, files that are required before
+;the actual installation should be stored first in the data block,
+;because this will make your installer start faster.
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+;Installer Sections
+Function .onInit
+ ClearErrors
+ ReadRegStr $0 HKCU "Software\neso-${VERSION}" ""
+ IfErrors DoInstall 0
+ MessageBox MB_OK "$(PreviousInstall)"
+ Quit
+ DoInstall:
+FunctionEnd
+
+Section $(SecNesoName) SecNeso
+SectionIn 1 2 RO
+ ;Set output path to the installation directory
+ SetOutPath "$INSTDIR"
+
+ ;Put file
+ File /r "dist\*"
+ File "COPYRIGHT"
+ File "INSTALL"
+ File "LICENSE"
+ File "README"
+ File "CHANGELOG"
+
+ ;Write the installation path into the registry
+ WriteRegStr HKCU "Software\neso-${VERSION}" "" $INSTDIR
+ WriteRegStr HKLM "Software\neso-${VERSION}" "" $INSTDIR
+
+ ;Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\neso-${VERSION}" "DisplayName" "Neso ${VERSION} (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\neso-${VERSION}" "UninstallString" "$INSTDIR\uninstall.exe"
+
+ ;Create the uninstaller
+ WriteUninstaller uninstall.exe
+SectionEnd
+
+Section $(SecStartMenuName) SecStartMenu
+SectionIn 1 2
+
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetShellVarContext all
+
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Neso-${VERSION}.lnk" "$INSTDIR\neso.exe" "" "$INSTDIR\neso.exe" 0
+ CreateShortCut "$DESKTOP\Neso-${VERSION}.lnk" "$INSTDIR\neso.exe" "" "$INSTDIR\neso.exe" 0
+
+ !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+;Descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecNeso} $(SecNesoDesc)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(SecStartMenuDesc)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Section "Uninstall"
+ ;Add your stuff here
+ RMDIR /r "$INSTDIR"
+
+ ;remove registry keys
+ DeleteRegKey HKCU "Software\neso-${VERSION}"
+ DeleteRegKey HKLM "Software\neso-${VERSION}"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\neso-${VERSION}"
+
+ SetShellVarContext all
+ Delete "$DESKTOP\Neso-${VERSION}.lnk"
+
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+ StrCmp $MUI_TEMP "" noshortcuts
+ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+ Delete "$SMPROGRAMS\$MUI_TEMP\Neso-${VERSION}.lnk"
+ RMDir "$SMPROGRAMS\$MUI_TEMP"
+ noshortcuts:
+
+
+SectionEnd
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c976355
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import os
+import sys
+import glob
+
+args = {}
+
+if os.name == 'nt':
+ import py2exe
+ origIsSystemDLL = py2exe.build_exe.isSystemDLL
+ def isSystemDLL(pathname):
+ if os.path.basename(pathname).lower() in ("msvcp71.dll", "dwmapi.dll"):
+ return 0
+ return origIsSystemDLL(pathname)
+ py2exe.build_exe.isSystemDLL = isSystemDLL
+
+ args['windows'] = [{
+ 'script': os.path.join('bin', 'neso'),
+ 'icon_resources': [(1, os.path.join('share', 'pixmaps', 'neso', 'neso.ico'))],
+ }]
+ args['options'] = {
+ 'py2exe': {
+ 'optimize': 0,
+ 'bundle_files': 3, #don't bundle because gtk doesn't support it
+ 'packages': [
+ 'encodings',
+ 'gtk',
+ 'pygtk',
+ 'pytz',
+ 'atk',
+ 'pango',
+ 'pangocairo',
+ 'cairo',
+ 'ConfigParser',
+ 'xmlrpclib',
+ 'xml',
+ 'decimal',
+ 'mx.DateTime',
+ 'logging.handlers',
+ 'psycopg2',
+ 'zipfile',
+ 'sqlite3',
+ 'relatorio',
+ 'csv',
+ 'lxml',
+ 'pydoc',
+ 'DAV',
+ 'pydot',
+ 'BeautifulSoup',
+ 'vobject',
+ 'ldap',
+ 'pkg_resources',
+ ],
+ }
+ }
+ args['zipfile'] = None
+
+execfile(os.path.join('neso', 'version.py'))
+
+dist = setup(name=PACKAGE,
+ version=VERSION,
+ description='Standalone Client/Server for the Tryton Application Platform',
+ author='B2CK',
+ author_email='info at b2ck.com',
+ url=WEBSITE,
+ download_url='http://downloads.tryton.org/' + \
+ VERSION.rsplit('.', 1)[0] + '/',
+ packages=find_packages(),
+ scripts=['bin/neso'],
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: X11 Applications :: GTK',
+ 'Intended Audience :: End Users/Desktop',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Operating System :: OS Independent',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=[
+ 'tryton >= 1.4.0',
+ 'trytond >= 1.4.0',
+ ],
+ **args
+)
+
+if os.name == 'nt':
+ def find_gtk_dir():
+ for directory in os.environ['PATH'].split(';'):
+ if not os.path.isdir(directory):
+ continue
+ for file in ('gtk-demo.exe', 'gdk-pixbuf-query-loaders.exe'):
+ if os.path.isfile(os.path.join(directory, file)):
+ return os.path.dirname(directory)
+ return None
+
+ def find_makensis():
+ for directory in os.environ['PATH'].split(';'):
+ if not os.path.isdir(directory):
+ continue
+ path = os.path.join(directory, 'makensis.exe')
+ if os.path.isfile(path):
+ return path
+ return None
+
+ import fnmatch
+ def findFiles(topDir, pattern):
+ for dirpath, dirnames, filenames in os.walk(topDir):
+ for filename in filenames:
+ if fnmatch.fnmatch(filename, pattern):
+ yield os.path.join(dirpath, filename)
+
+ if 'py2exe' in dist.commands:
+ import shutil
+ gtk_dir = find_gtk_dir()
+
+ dist_dir = dist.command_obj['py2exe'].dist_dir
+
+ from py_compile import compile
+ for i in ('tryton', 'trytond'):
+ if os.path.isdir(os.path.join(dist_dir, i)):
+ shutil.rmtree(os.path.join(dist_dir, i))
+ shutil.copytree(os.path.join(os.path.dirname(__file__), i),
+ os.path.join(dist_dir, i))
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ if os.path.isdir(os.path.join(dist_dir, i, j)):
+ shutil.rmtree(os.path.join(dist_dir, i, j))
+ for j in ('.hgtags', '.hgignore'):
+ if os.path.isfile(os.path.join(dist_dir, i, j)):
+ os.remove(os.path.join(dist_dir, i, j))
+ for file in glob.iglob(os.path.join(dist_dir, i, '*.exe')):
+ os.remove(file)
+ for file in findFiles(os.path.join(dist_dir, i), '*.py'):
+ if file.endswith('__tryton__.py'):
+ continue
+ print "byte-compiling %s to %s" % (file,
+ file[len(dist_dir) + len(os.sep):] + \
+ (__debug__ and 'c' or 'o'))
+ compile(file, None, file[len(dist_dir) + len(os.sep):] + \
+ (__debug__ and 'c' or 'o'), True)
+ os.remove(file)
+ for j in ('.hg', 'dist', 'build', i + '.egg-info'):
+ for dir in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
+ 'modules', '*', j)):
+ shutil.rmtree(dir)
+ for j in ('.hgtags', '.hgignore'):
+ for file in glob.iglob(os.path.join(dist_dir, 'trytond', 'trytond',
+ 'modules', '*', j)):
+ os.remove(file)
+
+ if os.path.isdir(os.path.join(dist_dir, 'etc')):
+ shutil.rmtree(os.path.join(dist_dir, 'etc'))
+ shutil.copytree(os.path.join(gtk_dir, 'etc'),
+ os.path.join(dist_dir, 'etc'))
+
+ from subprocess import Popen, PIPE
+ query_loaders = Popen(os.path.join(gtk_dir,'bin','gdk-pixbuf-query-loaders'),
+ stdout=PIPE).stdout.read()
+ query_loaders = query_loaders.replace(gtk_dir.replace(os.sep, '/') + '/', '')
+ loaders = open(os.path.join(dist_dir, 'etc', 'gtk-2.0', 'gdk-pixbuf.loaders'), 'w')
+ loaders.writelines([line + "\n" for line in query_loaders.split(os.linesep)])
+ loaders.close()
+
+ if os.path.isdir(os.path.join(dist_dir, 'lib')):
+ shutil.rmtree(os.path.join(dist_dir, 'lib'))
+ shutil.copytree(os.path.join(gtk_dir, 'lib'),
+ os.path.join(dist_dir, 'lib'))
+
+ for file in glob.iglob(os.path.join(gtk_dir, 'bin', '*.dll')):
+ if os.path.isfile(file):
+ shutil.copy(file, dist_dir)
+
+ for lang in ('de', 'es', 'fr'):
+ if os.path.isdir(os.path.join(dist_dir, 'share', 'locale', lang)):
+ shutil.rmtree(os.path.join(dist_dir, 'share', 'locale', lang))
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
+ os.path.join(dist_dir, 'share', 'locale', lang))
+
+ if os.path.isdir(os.path.join(dist_dir, 'share', 'themes', 'MS-Windows')):
+ shutil.rmtree(os.path.join(dist_dir, 'share', 'themes', 'MS-Windows'))
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'themes', 'MS-Windows'),
+ os.path.join(dist_dir, 'share', 'themes', 'MS-Windows'))
+
+ makensis = find_makensis()
+ if makensis:
+ from subprocess import Popen
+ Popen([makensis, "/DVERSION=" + VERSION,
+ str(os.path.join(os.path.dirname(__file__),
+ 'setup.nsi'))]).wait()
diff --git a/share/pixmaps/neso/neso.ico b/share/pixmaps/neso/neso.ico
new file mode 100644
index 0000000..34e7b02
Binary files /dev/null and b/share/pixmaps/neso/neso.ico differ
diff --git a/spanish.nsh b/spanish.nsh
new file mode 100644
index 0000000..5434c5a
--- /dev/null
+++ b/spanish.nsh
@@ -0,0 +1,17 @@
+;This file is part of Tryton. The COPYRIGHT file at the top level of
+;this repository contains the full copyright notices and license terms.
+
+!verbose 3
+
+!ifdef CURLANG
+ !undef CURLANG
+!endif
+!define CURLANG ${LANG_SPANISH}
+
+LangString LicenseText ${CURLANG} "Neso es liberado bajo la licencia GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. Por favor, lea cuidadosamente la licencia. Haga clic en Siguiente para continuar."
+LangString LicenseNext ${CURLANG} "&Siguiente"
+LangString PreviousInstall ${CURLANG} "Por favor, desinstalar la anterior instalación Neso"
+LangString SecNesoName ${CURLANG} "Neso"
+LangString SecNesoDesc ${CURLANG} "Instalar neso.exe y otros archivos necesarios"
+LangString SecStartMenuName ${CURLANG} "Menú Inicio y los accesos directos del escritorio"
+LangString SecStartMenuDesc ${CURLANG} "Crear accesos directos en el menú de inicio y en el escritorio"
--
tryton-neso
More information about the tryton-debian-vcs
mailing list