From 8c175db723ca2215526f766bb2e2c6fd08970c37 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 20 Sep 2022 14:41:31 +0000
Subject: [PATCH] [FIX] packaging: fix windows installer requirements
When building the windows installer, the requirements are installed one
by one to avoid a complete crash when a requirement is not installable
on windows.
It appears that lines that contains comments are not installed.
With this commit the comment part is properly removed from requirement
lines when calling pip.
closes odoo/odoo#100662
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
setup/win32/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup/win32/Makefile b/setup/win32/Makefile
index cf2d0c42922b..29d34a81c78e 100644
--- a/setup/win32/Makefile
+++ b/setup/win32/Makefile
@@ -28,12 +28,12 @@ server_clean:
allinone: server_clean
cp $(SERVER_DIRECTORY)/requirements.txt $(WINPY32_DIR)/
-(cd $(WINPY32_DIR) && ./python.exe -m pip install --upgrade pip)
- -(cd $(WINPY32_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC}" ; done)
+ -(cd $(WINPY32_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC%%#*}" ; done)
-(cd $(WINPY32_DIR) && Scripts/pip3.exe freeze)
rm $(WINPY32_DIR)/requirements.txt
cp $(SERVER_DIRECTORY)/requirements.txt $(WINPY64_DIR)/
-(cd $(WINPY64_DIR) && ./python.exe -m pip install --upgrade pip)
- -(cd $(WINPY64_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC}" ; done)
+ -(cd $(WINPY64_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC%%#*}" ; done)
-(cd $(WINPY64_DIR) && Scripts/pip3.exe freeze)
rm $(WINPY64_DIR)/requirements.txt
(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS))
--
GitLab