diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-15 20:39:10 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-15 20:39:10 +0100 |
| commit | 15f686eef60e716869f6a07069dc0d8f9a3c4f08 (patch) | |
| tree | 13452a9c11e4fd6835619beb52eccfd4360d9af5 /setup | |
| parent | f1e999d33ebfb249eb0bbfa9e99f903a18842278 (diff) | |
| parent | 468dab6748ad43865567444380abe52fb4c7a56d (diff) | |
[MERGE] forward port branch 11.0 up to 468dab6748a
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/win32/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/setup/win32/Makefile b/setup/win32/Makefile index 2efa1db6f69..06d7dc9e84d 100644 --- a/setup/win32/Makefile +++ b/setup/win32/Makefile @@ -5,9 +5,6 @@ include Makefile.servicename SERVER_DIRECTORY=../.. FILES_DIRECTORY=release -LAUNCH_PY2EXE_SERVICE=/cygdrive/c/python${PYTHON_VERSION}/python.exe win32_setup.py py2exe -LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe - MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME} LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi @@ -27,8 +24,6 @@ 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_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) |