D3544: packaging: move builddeb into contrib/packaging/

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Sat May 12 17:19:25 EDT 2018


indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3544

AFFECTED FILES
  Makefile
  contrib/builddeb
  contrib/packaging/builddeb
  contrib/packaging/dockerdeb

CHANGE DETAILS

diff --git a/contrib/packaging/dockerdeb b/contrib/packaging/dockerdeb
--- a/contrib/packaging/dockerdeb
+++ b/contrib/packaging/dockerdeb
@@ -27,8 +27,8 @@
             sh -c "cd /mnt/$dn && make clean && make local"
 fi
 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
-  sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME $@"
-contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME
+  sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
+contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean"
diff --git a/contrib/builddeb b/contrib/packaging/builddeb
rename from contrib/builddeb
rename to contrib/packaging/builddeb
--- a/contrib/builddeb
+++ b/contrib/packaging/builddeb
@@ -4,7 +4,7 @@
 #
 # Tested on Jessie (stable as of original script authoring.)
 
-. $(dirname $0)/packaging/packagelib.sh
+. $(dirname $0)/packagelib.sh
 
 BUILD=1
 CLEANUP=1
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -204,10 +204,10 @@
 	  "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg
 
 deb:
-	contrib/builddeb
+	contrib/packaging/builddeb
 
 ppa:
-	contrib/builddeb --source-only
+	contrib/packaging/builddeb --source-only
 
 contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
 	sed "s/__CODENAME__/$*/" $< > $@



To: indygreg, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list