jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a few options to the mkdist.py script for building the distribution tarball

Browse source
This commit is contained in:
William S Fulton 2019-04-08 07:57:39 +01:00
commit 3d99cc6b2f
1 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Tools/mkdist.py
View file

@ -12,20 +12,24 @@ def failed():
print "mkdist.py failed to complete" print "mkdist.py failed to complete"
sys.exit(2) sys.exit(2)
import argparse
parser = argparse.ArgumentParser(description="Build a SWIG distribution tarball swig-x.y.z.tar.gz")
parser.add_argument("version", help="version string in format x.y.z")
parser.add_argument("-b", "--branch", required=False, default="master", help="git branch name to create tarball from [master]")
parser.add_argument("-f", "--force-tag", required=False, action="store_true", help="force tag (replace git tag if it already exists)")
parser.add_argument("-s", "--skip-checks", required=False, action="store_true", help="skip checks (that local and remote repos are in sync)")
args = parser.parse_args()
try: version = args.version
version = sys.argv[1] branch = args.branch
dirname = "swig-" + version dirname = "swig-" + version
branch = sys.argv[2] force_tag = args.force_tag
except: skip_checks = args.skip_checks
print "Usage: mkdist.py version branch, where version should be x.y.z and branch is normally 'master'"
sys.exit(1)
if sys.version_info[0:2] < (2, 7): if sys.version_info[0:2] < (2, 7):
print "Error: Python 2.7 is required" print "Error: Python 2.7 is required"
sys.exit(3) sys.exit(3)
# Check name matches normal unix conventions # Check name matches normal unix conventions
if string.lower(dirname) != dirname: if string.lower(dirname) != dirname:
print "directory name ("+dirname+") should be in lowercase" print "directory name ("+dirname+") should be in lowercase"
@ -43,7 +47,7 @@ os.system("rm -f "+dirname+".tar")
# Grab the code from git # Grab the code from git
print "Checking git repository is in sync with remote repository" print "Checking there are no local changes in git repo"
os.system("git remote update origin") == 0 or failed() os.system("git remote update origin") == 0 or failed()
command = ["git", "status", "--porcelain", "-uno"] command = ["git", "status", "--porcelain", "-uno"]
out = subprocess.check_output(command) out = subprocess.check_output(command)
@ -53,17 +57,19 @@ if out.strip() != "":
print out print out
sys.exit(3) sys.exit(3)
command = ["git", "log", "--oneline", branch + "..origin/" + branch] if not skip_checks:
out = subprocess.check_output(command) print "Checking git repository is in sync with remote repository"
if out.strip() != "": command = ["git", "log", "--oneline", branch + "..origin/" + branch]
out = subprocess.check_output(command)
if out.strip() != "":
print "Remote repository has additional modifications to local repository" print "Remote repository has additional modifications to local repository"
print " ".join(command) print " ".join(command)
print out print out
sys.exit(3) sys.exit(3)
command = ["git", "log", "--oneline", "origin/" + branch + ".." + branch] command = ["git", "log", "--oneline", "origin/" + branch + ".." + branch]
out = subprocess.check_output(command) out = subprocess.check_output(command)
if out.strip() != "": if out.strip() != "":
print "Local repository has modifications not pushed to the remote repository" print "Local repository has modifications not pushed to the remote repository"
print "These should be pushed and checked that they pass Continuous Integration testing before continuing" print "These should be pushed and checked that they pass Continuous Integration testing before continuing"
print " ".join(command) print " ".join(command)
@ -72,7 +78,9 @@ if out.strip() != "":
print "Tagging release" print "Tagging release"
tag = "'rel-" + version + "'" tag = "'rel-" + version + "'"
os.system("git tag -a -m " + tag + " " + tag) == 0 or failed() force = "-f " if force_tag else ""
print("force {}".format(force))
os.system("git tag -a -m " + tag + " " + force + tag) == 0 or failed()
outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/" outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/"
print "Grabbing tagged release git repository using 'git archive' into " + outdir print "Grabbing tagged release git repository using 'git archive' into " + outdir