diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfdebian | 2 | ||||
| -rw-r--r-- | setup/package.dffedora | 2 | ||||
| -rw-r--r-- | setup/package.dfsrc | 2 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 1 | ||||
| -rw-r--r-- | setup/win32/Makefile | 11 |
5 files changed, 10 insertions, 8 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index f99d6552b7c..82a70dd8dce 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -17,7 +17,6 @@ RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ apt-get install \ adduser \ - node-less \ postgresql \ postgresql-client \ python3 \ @@ -30,6 +29,7 @@ RUN apt-get update -qq && \ python3-html2text \ python3-pil \ python3-jinja2 \ + python3-libsass \ python3-lxml \ python3-mako \ python3-mock \ diff --git a/setup/package.dffedora b/setup/package.dffedora index c6273c6e6ff..1ee83e0767d 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -7,7 +7,6 @@ MAINTAINER Odoo S.A. <info@odoo.com> RUN dnf update -d 0 -e 0 -y && \ dnf install -d 0 -e 0 \ babel \ - nodejs-less \ pychart \ pyparsing \ python3-babel \ @@ -46,6 +45,7 @@ RUN dnf update -d 0 -e 0 -y && \ python3-werkzeug \ python3-xlwt \ python3-xlrd \ + libsass \ pytz \ postgresql \ postgresql-server \ diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 0f23aea4f5b..d4f424a041f 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -20,7 +20,7 @@ RUN apt-get update -qq && \ postgresql-server-dev-all \ postgresql-client \ adduser \ - node-less \ + libsass \ libxml2-dev \ libxslt1-dev \ libldap2-dev \ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 54b1b5cd56f..1c9df706cd4 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -59,3 +59,4 @@ KillMode=mixed [Install] WantedBy=multi-user.target EOF +pip3 install libsass diff --git a/setup/win32/Makefile b/setup/win32/Makefile index 2efa1db6f69..3644d7fe0db 100644 --- a/setup/win32/Makefile +++ b/setup/win32/Makefile @@ -5,12 +5,10 @@ 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 +WINPY_DIR=/cygdrive/c/odoobuild/WinPython/python-3.6.2 default: allinone @@ -27,8 +25,11 @@ server_clean: rm -rf $(SERVER_DIRECTORY)/.cyg* allinone: server_clean - #(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE)) - #(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE)) + cp $(SERVER_DIRECTORY)/requirements.txt $(WINPY_DIR)/ + -(cd $(WINPY_DIR) && ./python.exe -m pip install --upgrade pip) + -(cd $(WINPY_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC}" ; done) + -(cd $(WINPY_DIR) && Scripts/pip3.exe freeze) + rm $(WINPY_DIR)/requirements.txt (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) |