diff --git a/data/layout.xml b/data/layout.xml index 8b717b4..48b3a22 100644 --- a/data/layout.xml +++ b/data/layout.xml @@ -685,9 +685,24 @@ Roboto Font License: - + - + + + @@ -696,7 +711,8 @@ Roboto Font License: "- [OSX] Fix: fixed permissions issue preventing to import images "/> - + diff --git a/scripts/manifest-version.py b/scripts/manifest-version.py index 3bd2221..e71335d 100644 --- a/scripts/manifest-version.py +++ b/scripts/manifest-version.py @@ -8,11 +8,6 @@ branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).rstrip().dec shorthash = check_output(["git", "log", "--pretty=format:%h", "-n 1"]).rstrip().decode("utf-8") revcount = int(check_output(["git", "rev-list", "--count", "HEAD"])) tag = check_output(["git", "describe", "--tags", "--abbrev=0"]).rstrip().decode("utf-8") - -if (len(sys.argv) < 2) - print "Version generation failed, target not specified. Define release/debug." - exit(0) - config = sys.argv[2].lower() version = "%s.%d (%s-%s-%s)" % (tag, revcount, shorthash, branch, config)