launchpad-reviewers team mailing list archive

[Ines Almeida <mp+446168@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/txpkgupload:update-build-tarball-command into txpkgupload:master.

Commit message:
Reactor build-tarball in makefile

Instead of excluding files/directories to build the tarball, we select the wanted ones

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/txpkgupload/+git/txpkgupload/+merge/446168
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/txpkgupload:update-build-tarball-command into txpkgupload:master.

diff --git a/Makefile b/Makefile
index 313b16e..b356b8f 100644
--- a/Makefile
+++ b/Makefile
@@ -109,14 +109,15 @@ build-tarball:
 	$(PIP) wheel -f $(DEPENDENCY_DIR) --no-index -w $(WHEELS) \
 		-r bootstrap-requirements.txt -r requirements.txt
 	mkdir -p $(TARBALL_BUILD_DIR)
-	tar -czf $(TARBALL_BUILD_PATH) \
-		--exclude-vcs \
-		--exclude __pycache__ \
-		--exclude build \
-		--exclude dist \
-		--exclude charm \
-		--exclude env \
-		./
+	(
+		git ls-files | sed 's,^,./,'
+		echo ./version-info.py
+		find $(WHEELS) -name \*.whl -print
+	) | sort >"$(TARBALL_BUILD_DIR)/.files"
+
+	# Create the tarball.
+	tar -czf $(TARBALL_BUILD_PATH) --no-recursion \
+		--files-from "$(TARBALL_BUILD_DIR)/.files"
 
 
 .PHONY: publish-tarball