lp-mailman

Merge ~cjwatson/lp-mailman:fix-tarball into lp-mailman:master

  1. Git
  2. lp:~cjwatson/lp-mailman
  3. fix-tarball
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b3803a193afa8e7867384dc39c0cb9deef6de340
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/lp-mailman:fix-tarball
Merge into: lp-mailman:master
Diff against target: 54 lines (+8/-2)
3 files modified
.gitignore (+1/-0)
Makefile (+4/-2)
utilities/build-tarball (+3/-0)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+452251@code.launchpad.net

Commit message

Make deployment tarball more complete

Description of the change

The tarball we were building omitted the actual Mailman code, and so failed to build on deployed systems; it was also constructed in such a way that we ended up trying to pull the dependencies repository again unnecessarily. This change produces tarballs that we can actually deploy.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.gitignore b/.gitignore
index 6e60468..4893d7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ callgrind.out.*
35!logs/README.txt35!logs/README.txt
36/logs36/logs
37/wheels37/wheels
38/.bootstrapped
diff --git a/Makefile b/Makefile
index ad7ce32..edb8961 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ PY=$(WD)/bin/py
8PYTHONPATH:=$(WD)/lib:${PYTHONPATH}8PYTHONPATH:=$(WD)/lib:${PYTHONPATH}
9VERBOSITY=-vv9VERBOSITY=-vv
1010
11DEPENDENCY_REPO ?= lp:~launchpad/lp-mailman/+git/dependencies11DEPENDENCY_REPO ?= https://git.launchpad.net/~launchpad/lp-mailman/+git/dependencies
12DEPENDENCY_DIR ?= $(WD)/download-cache12DEPENDENCY_DIR ?= $(WD)/download-cache
1313
14# virtualenv and pip fail if setlocale fails, so force a valid locale.14# virtualenv and pip fail if setlocale fails, so force a valid locale.
@@ -86,7 +86,8 @@ build: compile
86# Create or update $(DEPENDENCY_DIR) if possible. If the directory exists86# Create or update $(DEPENDENCY_DIR) if possible. If the directory exists
87# but isn't a git repository, then assume that we're doing a deployment and87# but isn't a git repository, then assume that we're doing a deployment and
88# have already been provided with a suitable dependencies directory.88# have already been provided with a suitable dependencies directory.
89bootstrap:89bootstrap: .bootstrapped
90.bootstrapped:
90 if [ -d $(DEPENDENCY_DIR)/.git ]; then \91 if [ -d $(DEPENDENCY_DIR)/.git ]; then \
91 git -C $(DEPENDENCY_DIR) pull; \92 git -C $(DEPENDENCY_DIR) pull; \
92 elif [ -d $(DEPENDENCY_DIR) ]; then \93 elif [ -d $(DEPENDENCY_DIR) ]; then \
@@ -95,6 +96,7 @@ bootstrap:
95 git clone $(DEPENDENCY_REPO) $(DEPENDENCY_DIR); \96 git clone $(DEPENDENCY_REPO) $(DEPENDENCY_DIR); \
96 fi97 fi
97 utilities/update-sourcecode98 utilities/update-sourcecode
99 touch $@
98100
99# LP_SOURCEDEPS_PATH should point to the sourcecode directory, but we101# LP_SOURCEDEPS_PATH should point to the sourcecode directory, but we
100# want the parent directory where the download-cache and env directories102# want the parent directory where the download-cache and env directories
diff --git a/utilities/build-tarball b/utilities/build-tarball
index 0bb7df0..3ca78b8 100755
--- a/utilities/build-tarball
+++ b/utilities/build-tarball
@@ -27,6 +27,9 @@ echo "Creating deployment tarball in $output_dir"
27mkdir -p "$output_dir"27mkdir -p "$output_dir"
28(28(
29 git ls-files | sed 's,^,./,'29 git ls-files | sed 's,^,./,'
30 bzr ls -d sourcecode/mailman -R | sed 's,^,./sourcecode/mailman/,'
31 # Deployments shouldn't bootstrap again.
32 echo ./.bootstrapped
30 echo ./version-info.py33 echo ./version-info.py
31 find ./wheels/ -name \*.whl -print34 find ./wheels/ -name \*.whl -print
32) | sort >"$output_dir/.files"35) | sort >"$output_dir/.files"

Subscribers

People subscribed via source and target branches