From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
cbuild makes this tar file as does the github-release script, just have
it in one place.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
buildlib/cbuild | 55 ++++++++++++++++++++++++++++++++---------
buildlib/github-release | 7 +-----
2 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/buildlib/cbuild b/buildlib/cbuild
index 2bd869cc28cbe1..7b0b9a9de0ed44 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -510,21 +510,12 @@ def get_tar_file(args,tarfn,pandoc_prebuilt=False):
# When the OS does not support pandoc we got through the extra step to
# build pandoc output in the travis container and include it in the
- # tar. This is similar to what buildlib/github-release does.
+ # tar.
if not args.use_prebuilt_pandoc:
subprocess.check_call(["buildlib/cbuild","make","travis","docs"]);
- tmp_tarfn = os.path.join(os.path.dirname(tarfn),"tmp.tar");
- get_tar_file(args,tmp_tarfn,False);
-
- subprocess.check_call([
- "tar",
- "-rf",tmp_tarfn,
- "build-travis/pandoc-prebuilt/",
- "--xform","s|build-travis/pandoc-prebuilt|%sbuildlib/pandoc-prebuilt|g"%(prefix)]);
- with open(tarfn,"w") as F:
- subprocess.check_call(["gzip","-9c",tmp_tarfn],stdout=F);
- os.unlink(tmp_tarfn);
+ cmd_make_dist_tar(argparse.Namespace(BUILD="build-travis",tarfn=tarfn,
+ script_pwd="",tag=None));
def run_rpm_build(args,spec_file,env):
with open(spec_file,"r") as F:
@@ -904,6 +895,45 @@ def cmd_build_images(args):
tmpdir]);
docker_cmd(args,*opts);
+# -------------------------------------------------------------------------
+def args_make_dist_tar(parser):
+ parser.add_argument("BUILD",help="Path to the build directory")
+ parser.add_argument("--tarfn",help="Output TAR filename")
+ parser.add_argument("--tag",help="git tag to sanity check against")
+def cmd_make_dist_tar(args):
+ """Make the standard distribution tar. The BUILD argument must point to a build
+ output directory that has pandoc-prebuilt"""
+ ver = get_version();
+
+ if not args.tarfn:
+ args.tarfn = "%s-%s.tar.gz"%(project,ver)
+
+ # The tag name and the cmake file must match.
+ if args.tag:
+ assert args.tag == "v" + ver;
+
+ with private_tmp(args) as tmpdir:
+ tmp_tarfn = os.path.join(tmpdir,"tmp.tar");
+
+ prefix = "%s-%s/"%(project,get_version());
+ subprocess.check_call(["git","archive",
+ "--prefix",prefix,
+ "--output",tmp_tarfn,
+ "HEAD"]);
+
+ # Mangle the paths and append the prebuilt stuff to the tar file
+ if args.BUILD:
+ subprocess.check_call([
+ "tar",
+ "-C",os.path.join(args.script_pwd,args.BUILD,"pandoc-prebuilt"),
+ "-rf",tmp_tarfn,
+ "./",
+ "--xform",r"s|^\.|%sbuildlib/pandoc-prebuilt|g"%(prefix)]);
+
+ assert args.tarfn.endswith(".gz") or args.tarfn.endswith(".tgz");
+ with open(os.path.join(args.script_pwd,args.tarfn),"w") as F:
+ subprocess.check_call(["gzip","-9c",tmp_tarfn],stdout=F);
+
# -------------------------------------------------------------------------
def args_docker_gc(parser):
pass;
@@ -944,6 +974,7 @@ if __name__ == '__main__':
# This script must always run from the top of the git tree, and a git
# checkout is mandatory.
git_top = subprocess.check_output(["git","rev-parse","--show-toplevel"]).strip();
+ args.script_pwd = os.getcwd();
os.chdir(git_top);
args.func(args);
diff --git a/buildlib/github-release b/buildlib/github-release
index f95d40f5ee51ee..8fc536fb8b1074 100755
--- a/buildlib/github-release
+++ b/buildlib/github-release
@@ -3,10 +3,5 @@
set -e
if [[ $TRAVIS_TAG == v* ]] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
- # Let's create release for vX tags only.
- # Strip the v from the TRAVIS_TAG for our prefix and output items
- REL_TAG=`echo $TRAVIS_TAG | sed -e 's/^v//'`
- git archive --prefix rdma-core-$REL_TAG/ --output rdma-core-$REL_TAG.tar $TRAVIS_TAG
- tar -rf rdma-core-$REL_TAG.tar build-travis/pandoc-prebuilt/ --xform "s|build-travis/pandoc-prebuilt|rdma-core-$REL_TAG/buildlib/pandoc-prebuilt|g"
- gzip -9 rdma-core-$REL_TAG.tar
+ buildlib/cbuild make-dist-tar --tag "$TRAVIS_TAG" build-travis
fi
--
2.21.0
