[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#100820 X-original-commit: 8c175db Signed-off-by: Christophe Monniez (moc) <[email protected]>
akretion · Sep 22, 2022 · 6d56544 · 6d56544
1 parent 5268c94
commit 6d56544
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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))