diff options
| author | Christophe Monniez <moc@odoo.com> | 2017-08-30 09:08:49 +0200 |
|---|---|---|
| committer | Christophe Monniez <moc@odoo.com> | 2017-10-03 12:01:53 +0200 |
| commit | 06c2346da5f871fe885e075152dfa41cb6f9b024 (patch) | |
| tree | 46b82dab672c4262e822cc112d0239746686679e /setup/win32/Makefile | |
| parent | 938ae8358545c41ea959cbfd8cd80201daaec31a (diff) | |
[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.
Diffstat (limited to 'setup/win32/Makefile')
| -rw-r--r-- | setup/win32/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setup/win32/Makefile b/setup/win32/Makefile index c0d33c904b1..2efa1db6f69 100644 --- a/setup/win32/Makefile +++ b/setup/win32/Makefile @@ -10,7 +10,7 @@ LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME} -LAUNCH_MAKENSIS=/cygdrive/c/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi +LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi default: allinone @@ -27,8 +27,8 @@ server_clean: rm -rf $(SERVER_DIRECTORY)/.cyg* allinone: server_clean - (cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE)) - (cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE)) + #(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE)) + #(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE)) (cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS)) (cd $(SERVER_DIRECTORY)/setup/win32 && mkdir -p $(FILES_DIRECTORY)) (cd $(SERVER_DIRECTORY)/setup/win32 && cp openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe) |