From 06c2346da5f871fe885e075152dfa41cb6f9b024 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 30 Aug 2017 09:08:49 +0200 Subject: [REF] win32: move to WinPython... Purpose: for multiple reasons (bytecode change in python 3.6, missing files for some packages, py2exe is unmaintained ...) the py2exe solution cannot be used anymore. Odoo for windows will now use a portable Python that will be shipped with the Windows installer. For that purpose, a Winpython 3.6.2 is used. In order to build the Windows installer, a Winpython dir with all the Odoo requirements fullfilled, must exists on the build system (qemu-kvm VM). * nsis installer: - Only the python dir is used to avoid packaging too much stuffs - better compression level - starts the Odoo service using nssm - bump to V11 * change the default win10 build vm path * print a warning when uncomplete addon move * try to force remove of addon path: when the addons are moved to Odoo/addons, it happens that the destination already exists. In that case, the source addon was not deleted, resulting in a uneeded file duplication. * fix version string to avoid invalid chars in windows service * Add requirements adpated for WinPython * package.py now shows the traceback when a build fails * verify that a file exists before publishing * debuild now creates an .xz file instead of .gz * package: use logging module * kvm CPU that works with older versions. * fix a pexpect encoding bug * fix the version to remove special chars '~' which is not appreciated by windows services [REM] win32setup: Remove win32 python service Purpose: Before this commit, the win32 service was managed by an executable builded from those two files with the help of py2xe. The win32 service is now managed by nssm which starts Odoo and therefore, those files are not needed anymore. --- odoo/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'odoo/release.py') diff --git a/odoo/release.py b/odoo/release.py index 81059d81bf1..89acf263116 100644 --- a/odoo/release.py +++ b/odoo/release.py @@ -34,4 +34,4 @@ author = 'OpenERP S.A.' author_email = 'info@odoo.com' license = 'LGPL-3' -nt_service_name = "odoo-server-" + series +nt_service_name = "odoo-server-" + series.replace('~','-') -- cgit v1.2.3 From 1e1e2b4f6053b8f8b3381846c27fa59ad56019f7 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 3 Oct 2017 19:19:57 +0200 Subject: [REL] 11.0 --- odoo/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'odoo/release.py') diff --git a/odoo/release.py b/odoo/release.py index 89acf263116..ec1a04da27e 100644 --- a/odoo/release.py +++ b/odoo/release.py @@ -12,7 +12,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA, # properly comparable using normal operarors, for example: # (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2) # (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0) -version_info = (10, 'saas~18', 0, FINAL, 0, '') +version_info = (11, 0, 0, FINAL, 0, '') version = '.'.join(str(s) for s in version_info[:2]) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') + version_info[5] series = serie = major_version = '.'.join(str(s) for s in version_info[:2]) -- cgit v1.2.3