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

mkdist script tweaks to support releasing from any named branch

Browse source
This commit is contained in:
William S Fulton 2014-02-08 11:08:56 +00:00
commit 3cf3be24ab
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tools/mkdist.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# This script builds a swig-x.y.z distribution. # This script builds a swig-x.y.z distribution.
# Usage : mkdist.py version, where version should be x.y.z # Usage: mkdist.py version branch, where version should be x.y.z and branch is normally 'master'
import sys import sys
import string import string
@ -16,10 +16,16 @@ def failed():
try: try:
version = sys.argv[1] version = sys.argv[1]
dirname = "swig-" + version dirname = "swig-" + version
branch = sys.argv[2]
except: except:
print "Usage: mkdist.py version, where version should be x.y.z" print "Usage: mkdist.py version branch, where version should be x.y.z and branch is normally 'master'"
sys.exit(1) sys.exit(1)
if sys.version_info[0:2] < (2, 7):
print "Error: Python 2.7 is required"
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"
@ -38,7 +44,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 git repository is in sync with remote repository"
os.system("git remote update") == 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)
if out.strip() != "": if out.strip() != "":
@ -47,7 +53,7 @@ if out.strip() != "":
print out print out
sys.exit(3) sys.exit(3)
command = ["git", "log", "--oneline", "master..origin/master"] command = ["git", "log", "--oneline", branch + "..origin/" + branch]
out = subprocess.check_output(command) out = subprocess.check_output(command)
if out.strip() != "": if out.strip() != "":
print "Remote repository has additional modifications to local repository" print "Remote repository has additional modifications to local repository"
@ -55,7 +61,7 @@ if out.strip() != "":
print out print out
sys.exit(3) sys.exit(3)
command = ["git", "log", "--oneline", "origin/master..master"] 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"