Эх сурвалжийг харах

HUE-548. App tarballs contain invalid symlink to the VERSION file

bc Wong 14 жил өмнө
parent
commit
919484c30c
1 өөрчлөгдсөн 4 нэмэгдсэн , 4 устгасан
  1. 4 4
      Makefile.sdk

+ 4 - 4
Makefile.sdk

@@ -144,7 +144,7 @@ $(EXT_PY_CLEAN_TARGETS):
 ext-env-install: ext-eggs $(EXT_PY_ENV_INSTALL_TARGETS)
 	@for i in $(wildcard ext-eggs/*.egg) ; do \
 	  echo "--- Installing $$i into virtual environment" ; \
-	  $(ENV_EASY_INSTALL) -N $$i 2> /dev/null ; \
+	  $(ENV_EASY_INSTALL) -Z -N $$i 2> /dev/null ; \
 	done
 
 $(EXT_PY_ENV_INSTALL_TARGETS):
@@ -152,7 +152,7 @@ $(EXT_PY_ENV_INSTALL_TARGETS):
 	@# If there are no binary eggs, maybe this package decided
 	@# it wasn't necessary.  If the build had failed, the command that produced
 	@# the egg should have thrown an error.
-	@cd ext-py/$(CUR_EXT_PY) && [ ! -e dist ] || $(ENV_EASY_INSTALL) -N dist/*egg 2>/dev/null
+	@cd ext-py/$(CUR_EXT_PY) && [ ! -e dist ] || $(ENV_EASY_INSTALL) -Z -N dist/*egg 2>/dev/null
 	@mkdir -p $(@D) && touch $@
 
 .PHONY: clean
@@ -203,7 +203,7 @@ sdist:
 	@rm -rf $(SDIST_DIR)
 	@mkdir -p $(SDIST_DIR)
 	@# Copy sources of our app
-	@rsync -a ./ $(SDIST_DIR)/ $(SDIST_EXCLUDES)
+	@rsync --copy-unsafe-links -a ./ $(SDIST_DIR)/ $(SDIST_EXCLUDES)
 	@$(MAKE) -C $(SDIST_DIR) clean
 	@# Also make a tarball
 	@tar -C $(SDIST_DIR)/.. -czf $(SDIST_TGZ) $(APP_FULL_NAME)
@@ -221,7 +221,7 @@ bdist: ext-eggs compile
 	@rm -rf $(BDIST_DIR)
 	@mkdir -p $(BDIST_DIR)
 	@# Copy built sources of our app
-	@rsync -a ./ $(BDIST_DIR)/ $(BDIST_EXCLUDES)
+	@rsync --copy-unsafe-links -a ./ $(BDIST_DIR)/ $(BDIST_EXCLUDES)
 	@# Copy thirdparty eggs into the ext-eggs dir
 	@mkdir -p $(BDIST_DIR)/ext-eggs
 	@if test -n '$(wildcard ext-py/*/dist)' ; then \