D3543: packaging: move packagelib.sh into contrib/packaging/

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


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

REVISION SUMMARY
  This required some minor path adjustments in scripts referencing
  this path.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/builddeb
  contrib/buildrpm
  contrib/packagelib.sh
  contrib/packaging/dockerdeb
  contrib/packaging/packagelib.sh

CHANGE DETAILS

diff --git a/contrib/packagelib.sh b/contrib/packaging/packagelib.sh
rename from contrib/packagelib.sh
rename to contrib/packaging/packagelib.sh
diff --git a/contrib/packaging/dockerdeb b/contrib/packaging/dockerdeb
--- a/contrib/packaging/dockerdeb
+++ b/contrib/packaging/dockerdeb
@@ -1,7 +1,7 @@
 #!/bin/bash -eu
 
 . $(dirname $0)/dockerlib.sh
-. $(dirname $0)/../packagelib.sh
+. $(dirname $0)/packagelib.sh
 
 BUILDDIR=$(dirname $0)
 export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
diff --git a/contrib/buildrpm b/contrib/buildrpm
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -7,7 +7,7 @@
 # - CentOS 5
 # - centOS 6
 
-. $(dirname $0)/packagelib.sh
+. $(dirname $0)/packaging/packagelib.sh
 
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
diff --git a/contrib/builddeb b/contrib/builddeb
--- a/contrib/builddeb
+++ b/contrib/builddeb
@@ -4,7 +4,7 @@
 #
 # Tested on Jessie (stable as of original script authoring.)
 
-. $(dirname $0)/packagelib.sh
+. $(dirname $0)/packaging/packagelib.sh
 
 BUILD=1
 CLEANUP=1



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


More information about the Mercurial-devel mailing list