Преглед изворни кода

[core] Fix PIP_MODULES installation on build system

Ying Chen пре 4 година
родитељ
комит
3442808749
1 измењених фајлова са 5 додато и 1 уклоњено
  1. 5 1
      Makefile

+ 5 - 1
Makefile

@@ -147,9 +147,13 @@ $(BLD_DIR_ENV)/stamp:
 desktop: parent-pom
 # END DEV ONLY >>>>
 desktop: virtual-env
-	@if [ "$(PYTHON_VER)" = "python2.7" ] && [ "$(MAKECMDGOALS)" = "apps" ]; then \
+	# Normally dev only do "make apps", but build system is calling "make apps docs"
+	@if [ "$(PYTHON_VER)" = "python2.7" ] && [ "$(findstring apps,$(MAKECMDGOALS))" = "apps" ]; then \
+	  echo "--- start installing PIP_MODULES"; \
 	  $(ENV_PIP) install --upgrade pip; \
 	  $(ENV_PIP) install $(PIP_MODULES); \
+	  echo "--- done installing PIP_MODULES"; \
+	else echo "--- skip installing PIP_MODULES"; \
 	fi
 	@$(MAKE) -C desktop