diff --git a/.project b/.project
new file mode 100644
index 0000000..e329c3f
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ Common Build Scripts
+
+
+
+
+
+ org.python.pydev.PyDevBuilder
+
+
+
+
+
+ org.python.pydev.pythonNature
+
+
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 0000000..d111c07
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,8 @@
+
+
+
+/${PROJECT_DIR_NAME}
+
+python interpreter
+python35
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..1174a06
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//versionnumbering/versioninfo.py=utf-8
diff --git a/README.md b/README.md
deleted file mode 100644
index e69de29..0000000
diff --git a/build/eclipsebuild/eclipsebuild.gsh b/build/eclipsebuild/eclipsebuild.gsh
new file mode 100644
index 0000000..26ed411
--- /dev/null
+++ b/build/eclipsebuild/eclipsebuild.gsh
@@ -0,0 +1,42 @@
+// Build and export files
+def doBuild(apps) {
+ for (appInfo in apps ) {
+ build = appInfo[0]
+ project = appInfo[1]
+ variants = appInfo[2]
+ exportpath = appInfo[3]
+ if (build) {
+ for (build_variant in variants) {
+ retry(3) { // Eclipse occasionally raises exceptions (rather than the builds failing)
+ if (isUnix()) {
+ sh "${BUILD_COMMAND} -build ${project}/${build_variant}"
+ }
+ else {
+ bat "%BUILD_COMMAND% -build ${project}/${build_variant}"
+ }
+ }
+ if (exportpath) {
+ echo "Export path at: ${exportpath}"
+ script {
+ env.destFolder = "${WORKSPACE}/export/${build_variant}/${project}"
+ env.srcFile = "${WORKSPACE}/${exportpath}"
+ env.srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}")
+ }
+ dir (env.destFolder) {
+ if (exportpath) {
+ echo "Copy ${srcFileExpanded} to ${destFolder}"
+ if (isUnix()) {
+ sh 'cp \"${srcFileExpanded}\" ${destFolder}'
+ }
+ else {
+ bat 'copy \"%srcFileExpanded%\" %destFolder%'
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+return this;
\ No newline at end of file
diff --git a/differences/.project b/differences/.project
new file mode 100644
index 0000000..75af0fc
--- /dev/null
+++ b/differences/.project
@@ -0,0 +1,17 @@
+
+
+ Release_difference
+
+
+
+
+
+ org.python.pydev.PyDevBuilder
+
+
+
+
+
+ org.python.pydev.pythonNature
+
+
diff --git a/differences/.pydevproject b/differences/.pydevproject
new file mode 100644
index 0000000..c3434da
--- /dev/null
+++ b/differences/.pydevproject
@@ -0,0 +1,8 @@
+
+
+
+/${PROJECT_DIR_NAME}
+
+python 3.0
+Default
+
diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py
new file mode 100644
index 0000000..a778892
--- /dev/null
+++ b/differences/show_release_differences.py
@@ -0,0 +1,214 @@
+'''
+showreleasedifferences -- shortdesc
+
+showreleasedifferences generates a version folder with a common set of version information files in it
+
+@author: dan
+
+@copyright: 2017 Global Inkjet Systems Ltd. All rights reserved.
+'''
+import subprocess
+import os
+import sys
+import re
+
+from argparse import ArgumentParser
+from argparse import RawDescriptionHelpFormatter
+
+__all__ = []
+__version__ = 0.1
+__date__ = '2017-11-29'
+__updated__ = '2017-11-29'
+
+gitExecutable = os.getenv("GIT_EXECUTABLE", default="git")
+
+class GitException(Exception):
+ def __init__(self, message):
+ self.message = message
+
+ def __repr__(self):
+ return self.message
+
+def makeFolder(versionfolder):
+ print("Creating folder (if not already there): {0}".format(versionfolder))
+ os.makedirs(versionfolder, exist_ok = True)
+
+def printDivider(outfh, times = 1, length = 100):
+ for _ in range(times):
+ outfh.write("{0}\n".format("*" * length))
+
+TABSIZE = 4
+def printTabbed(outfh, string, tabs = 0):
+ outfh.write("{0}{1}\n".format(" " * (TABSIZE * tabs), string))
+
+def getGitLogDifferences(outfh, gitrootfolder, previousRelease, currentRelease, tripledot = False):
+ if tripledot:
+ releaseExpression = previousRelease + "..." + currentRelease
+ else:
+ releaseExpression = previousRelease + ".." + currentRelease
+ currentdir = os.getcwd()
+ os.chdir(gitrootfolder)
+ gitlog = []
+ printTabbed(outfh, "Executing: {0} {1} {2} {3}".format(gitExecutable, "log", "--oneline", releaseExpression))
+ proc = subprocess.Popen([gitExecutable, "log", "--oneline", releaseExpression], stdout=subprocess.PIPE)
+ while True:
+ line = proc.stdout.readline()
+ if line:
+ linestring = line.decode('utf-8').rstrip()
+ gitlog.append(linestring)
+ #printTabbed(outfh, linestring, 1)
+ else:
+ break
+ proc.wait()
+ if proc.returncode > 0:
+ raise GitException("Git executable returned an error")
+ os.chdir(currentdir)
+ return gitlog
+
+jiraprojectpattern = {
+ 'GIS' : ( re.compile("^.* +(?:[gG][iI][sS][ _-]*|[tT]rac \#*|\#\s*)(\d+):*(.*)$"),
+ re.compile('^(\S*) Revert " *GIS-(\d+):* (.*)"$'),
+ ),
+ 'IMB': ( re.compile("^.* +(?:[Ii][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
+ re.compile('^(\S*) Revert " *IMB-(\d+):* (.*)"$'),
+ ),
+ }
+
+mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$")
+
+def processLog(gitlog, jirakeyprefix):
+ reverts = []
+ merges = {}
+ other = []
+ numbered = {}
+ (expectedpattern, revertpattern) = jiraprojectpattern[jirakeyprefix]
+ for line in gitlog:
+ expectedmatch = expectedpattern.match(line)
+ revertmatch = revertpattern.match(line)
+ mergematch = mergepattern.match(line)
+ if expectedmatch == None and revertmatch == None and mergematch == None:
+ other.append(line)
+ if revertmatch:
+ gisnumber = jirakeyprefix + "-" + revertmatch.group(2)
+ description = revertmatch.group(3)
+ reverts.append("Revert: {0} {1}".format(gisnumber, description))
+ if mergematch:
+ merge = mergematch.group(2)
+ if not merge in merges:
+ merges[merge] = 1
+ else:
+ merges[merge] += 1
+ if expectedmatch:
+ gisnumber = jirakeyprefix + "-" + expectedmatch.group(1)
+ description = expectedmatch.group(2)
+ if not gisnumber in numbered:
+ numbered[gisnumber] = []
+ numbered[gisnumber].append(description)
+ return (reverts, merges, other, numbered)
+
+def showDifferences(differences, jirakeyprefix, outfh):
+ (revertslog, mergeslog, otherlog, numberedlog) = differences
+ printDivider(outfh)
+ printTabbed(outfh, jirakeyprefix + "-Numbers Log:")
+ for (gisnumber, descriptions) in sorted(numberedlog.items()):
+ printTabbed(outfh, gisnumber, 1)
+ descriptions = numberedlog[gisnumber];
+ for description in descriptions:
+ printTabbed(outfh, description, 2)
+ printDivider(outfh)
+ printTabbed(outfh, "Revert log:")
+ for reversion in sorted(revertslog):
+ printTabbed(outfh, reversion, 1)
+ printDivider(outfh)
+ printTabbed(outfh, "Merges log:")
+ for merge in sorted(mergeslog):
+ printTabbed(outfh, merge, 1)
+ printDivider(outfh)
+ printTabbed(outfh, "Other log:")
+ for other in sorted(otherlog):
+ printTabbed(outfh, other, 1)
+
+def main(argv=None): # IGNORE:C0111
+ '''Command line options.'''
+
+ if argv is None:
+ argv = sys.argv
+ else:
+ sys.argv.extend(argv)
+
+ program_name = os.path.basename(sys.argv[0])
+ program_version = "v%s" % __version__
+ program_build_date = str(__updated__)
+ program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date)
+ program_shortdesc = __import__('__main__').__doc__.split("\n")[1]
+ program_license = '''%s
+
+ Created by dan on %s.
+ Copyright 2017 Global Inkjet Systems Ltd. All rights reserved.
+
+ Distributed on an "AS IS" basis without warranties
+ or conditions of any kind, either express or implied.
+
+USAGE
+''' % (program_shortdesc, str(__date__))
+
+ try:
+ # Setup argument parser
+ parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter)
+ parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]")
+ parser.add_argument("-s", "--sourceversion", dest="sourceversion", action="store", default="origin/master", help="source version branch or tag to discover compare against [default: %(default)s]")
+ parser.add_argument("-p", "--previousversion", dest="previousversion", action="store", default="origin/master", help="source branch or tag to compare with [default: %(default)s]")
+ parser.add_argument("-j", "--jirakeyprefix", dest="jirakeyprefix", action="store", default="GIS", help="jira key prefix [default: %(default)s]")
+ parser.add_argument("-o", "--outputoptions", dest="outputoptions", action="store", default="", help="output options: Can be: opposite notcommon [default: %(default)s]")
+ parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="", help="version folder where differences file stored [default: %(default)s]")
+
+ # Process arguments
+ args = parser.parse_args()
+
+ try:
+ gitrootfolder = args.gitrootfolder
+ sourceversion = args.sourceversion
+ previousversion = args.previousversion
+ jirakeyprefix = args.jirakeyprefix
+ outputoptions = args.outputoptions
+ versionfolder = args.versionfolder
+
+ print("Git root:", gitrootfolder, "Source version:", sourceversion, "Previous source version:", previousversion)
+ print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", versionfolder)
+
+ if versionfolder:
+ makeFolder(versionfolder)
+ outfh = open(os.path.join(versionfolder, "differences.txt"), 'w')
+ else:
+ outfh = sys.stdout
+
+ printDivider(outfh, times = 4)
+ printTabbed(outfh, "Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(gitrootfolder, previousversion, sourceversion))
+ gitlog = getGitLogDifferences(outfh, gitrootfolder, previousversion, sourceversion)
+ showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
+ if 'opposite' in outputoptions.lower():
+ printDivider(outfh, times = 4)
+ printTabbed(outfh, "Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(gitrootfolder, sourceversion, previousversion))
+ gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion)
+ showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
+ if 'notcommon' in outputoptions.lower():
+ printDivider(outfh, times = 4)
+ printTabbed(outfh, "Looking for changes that are not common to {1} or {2} at path: {0}".format(gitrootfolder, sourceversion, previousversion))
+ gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion, tripledot = True)
+ showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
+
+ if versionfolder:
+ outfh.close()
+ return 0
+ except Exception as e:
+ print("Error while determining differences:", e.__repr__())
+ return 1
+
+ except Exception as e:
+ indent = len(program_name) * " "
+ print(program_name + ": " + repr(e) + "\n")
+ print(indent + " for help use --help")
+ return 2
+
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/test.gsh b/test.gsh
new file mode 100644
index 0000000..23fcfc0
--- /dev/null
+++ b/test.gsh
@@ -0,0 +1,7 @@
+// Methods in this file will end up as object methods on the object that load returns.
+def lookAtThis(String whoAreYou) {
+ echo "Look at this, ${whoAreYou}! You loaded this from another file!"
+}
+
+return this;
+
diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py
new file mode 100644
index 0000000..59b5225
--- /dev/null
+++ b/versionnumbering/versioninfo.py
@@ -0,0 +1,202 @@
+# encoding: utf-8
+'''
+versionnumbering -- shortdesc
+
+versionnumbering generates a version folder with a common set of version information files in it
+
+@author: dan
+
+@copyright: 2017 Global Inkjet Systems Ltd. All rights reserved.
+'''
+import os
+import sys
+import shutil
+import subprocess
+
+from argparse import ArgumentParser
+from argparse import RawDescriptionHelpFormatter
+
+__all__ = []
+__version__ = 0.1
+__date__ = '2017-11-29'
+__updated__ = '2017-11-29'
+
+gitExecutable = os.getenv("GIT_EXECUTABLE", default="git")
+
+def resetFolder(versionfolder):
+ print("Removing folders and contents of: {0}".format(versionfolder))
+ try:
+ shutil.rmtree(versionfolder)
+ except FileNotFoundError:
+ pass
+
+ print("Creating folder: {0}".format(versionfolder))
+ os.makedirs(versionfolder)
+
+def getGitRevision(gitrootpath, basenumber):
+ cwd = os.getcwd()
+
+ path = os.path.expanduser(gitrootpath)
+ print("Changing current working directory to: {0}".format(path))
+ os.chdir(path)
+
+ print("Determining revision info using git command: {0}".format(gitExecutable))
+ completed = subprocess.run([gitExecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE)
+ print("Command {0} returned: {1}".format(completed.args, completed.returncode))
+ changecount = completed.stdout.decode("utf-8").strip()
+ print("Change count: {0}".format(changecount))
+ adjustedchangecount = int(changecount) + int(basenumber)
+ print("Adjusted change count: {0}".format(adjustedchangecount))
+
+ print("Determining current revision info using git command: {0}".format(gitExecutable))
+ completed = subprocess.run([gitExecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE)
+ print("Command {0} returned: {1}".format(completed.args, completed.returncode))
+ revision = completed.stdout.decode("utf-8").strip()
+ print("Revision: {0}".format(revision))
+
+ print("Determining remote info using git command: {0}".format(gitExecutable))
+ completed = subprocess.run([gitExecutable, "remote", "show", "origin"], stdout=subprocess.PIPE)
+ print("Command {0} returned: {1}".format(completed.args, completed.returncode))
+ remoteinfo = completed.stdout.decode("utf-8")
+ print("Remote info: {0}".format(remoteinfo))
+
+ os.chdir(cwd)
+ print("Restored current working directory to: {0}".format(cwd))
+
+ return (adjustedchangecount, revision, remoteinfo)
+
+def getVersionPrefix(sourcebranch):
+ print("Determining version number prefix from source branch name: {0}".format(sourcebranch))
+
+ defaultversionprefix = "1.30000.0."
+ splits = sourcebranch.split('/')
+ if len(splits) < 1:
+ print("Source branch name is invalid. Defaulting to: {0}".format(defaultversionprefix))
+ return defaultversionprefix
+
+ sourcebranch = splits[-1]
+
+ if sourcebranch.lower().endswith("master"): # Special case
+ return "1.20000.0."
+
+ splits = sourcebranch.split('.')
+ versionprefix = ""
+ if len(splits) < 1:
+ print("This source branch name has no decimal points in its name so defaulting to: {0}".format(defaultversionprefix))
+ versionprefix = defaultversionprefix
+ else:
+ splitnumbercount = 0
+ for split in splits:
+ if split.isdigit():
+ versionprefix += split + "."
+ splitnumbercount += 1
+ else:
+ break
+ if splitnumbercount > 2:
+ break
+ if splitnumbercount == 0:
+ print("No leading numbers were found in source branch name so defaulting to: {0}".format(defaultversionprefix))
+ versionprefix = defaultversionprefix
+ elif splitnumbercount == 1:
+ versionprefix += "0.0."
+ elif splitnumbercount == 2:
+ versionprefix += "0."
+
+ print("Determined version prefix to be: {0}".format(versionprefix))
+ return versionprefix
+
+def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, remoteinfo, buildnumber, buildstamp):
+ with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f:
+ f.write(buildjobname)
+
+ with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f:
+ f.write(versionprefix)
+
+ with open(os.path.join(versionfolder, "revision.txt"), 'w') as f:
+ f.write(gitrevision)
+
+ with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f:
+ f.write(remoteinfo)
+
+ with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f:
+ f.write(buildnumber)
+
+ with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f:
+ f.write(buildstamp)
+
+ buildstampcommasep = buildstamp.replace(".", ",")
+ with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f:
+ f.write(buildstampcommasep)
+
+def main(argv=None): # IGNORE:C0111
+ '''Command line options.'''
+
+ if argv is None:
+ argv = sys.argv
+ else:
+ sys.argv.extend(argv)
+
+ program_name = os.path.basename(sys.argv[0])
+ program_version = "v%s" % __version__
+ program_build_date = str(__updated__)
+ program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date)
+ program_shortdesc = __import__('__main__').__doc__.split("\n")[1]
+ program_license = '''%s
+
+ Created by dan on %s.
+ Copyright 2017 Global Inkjet Systems Ltd. All rights reserved.
+
+ Distributed on an "AS IS" basis without warranties
+ or conditions of any kind, either express or implied.
+
+USAGE
+''' % (program_shortdesc, str(__date__))
+
+ try:
+ # Setup argument parser
+ parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter)
+ parser.add_argument("-s", "--sourcebranch", dest="sourcebranch", action="store", default="origin/master", help="source branch name to discover version number [default: %(default)s]")
+ parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]")
+ parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]")
+ parser.add_argument("-b", "--baseversionnumber", dest="baseversionnumber", action="store", default=int(1000), help="base git version number [default: %(default)s]")
+ parser.add_argument("-j", "--buildjobname", dest="buildjobname", action="store", default="-", help="build job name [default: %(default)s]")
+ parser.add_argument("-n", "--buildnumber", dest="buildnumber", action="store", default="1", help="build number [default: %(default)s]")
+
+ # Process arguments
+ args = parser.parse_args()
+
+ try:
+ sourcebranch = args.sourcebranch
+ versionfolder = args.versionfolder
+ gitrootfolder = args.gitrootfolder
+ baseversionnumber = args.baseversionnumber
+ buildjobname = args.buildjobname
+ buildnumber = args.buildnumber
+
+ print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder)
+ print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber)
+
+ resetFolder(versionfolder)
+
+ (gitrevisioncount, gitrevision, remoteinfo) = getGitRevision(gitrootfolder, baseversionnumber)
+
+ versionprefix = getVersionPrefix(sourcebranch)
+
+ buildstamp = versionprefix + str(gitrevisioncount)
+ print("Build stamp is: {0}".format(buildstamp))
+
+ writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, remoteinfo, buildnumber, buildstamp)
+
+ return 0
+ except Exception as e:
+ print("Error while creating version info:", e.__repr__())
+ return 1
+
+ except Exception as e:
+ indent = len(program_name) * " "
+ print(program_name + ": " + repr(e) + "\n")
+ print(indent + " for help use --help")
+ return 2
+
+if __name__ == "__main__":
+ sys.exit(main())