Merge branch 'release-2.0-nightly' into release-2.0

util/createBinaryDistr.py

@@ -1,4 +1,4 @@
-#/usr/bin/python
+#!/usr/bin/python
 # @file    createBinaryDistr.py
 # @author  David Zemon
 # @project PropWare
@@ -17,6 +17,7 @@
 import subprocess
 from time import sleep
 from shutil import copy2
+import argparse
 
 from propwareImporter import importAll
 import propwareUtils
@@ -29,13 +30,12 @@ class CreateBinaryDistr:
                             "jpg", "lang", "pdf", "png"]
     BLACKLISTED_DIRECTORIES = ["docs", ".idea", ".settings", ".git", propwareUtils.DOWNLOADS_DIRECTORY]
     BRANCHES = ["master", "development", "release-2.0", "release-2.0-nightly"]
+    TAGS = ["v1.1", "v1.2", "v2.0-beta1"]
     CURRENT_SUGGESTION = "release-2.0"
 
     def __init__(self):
-        CreateBinaryDistr.BRANCHES.sort()
         self.successes = []
 
-    def run(self):
         propwareUtils.checkProperWorkingDirectory()
 
         # Import all extra libraries
@@ -45,22 +45,29 @@ def run(self):
         os.chdir("..")
         CreateBinaryDistr.cleanOldArchives()
 
+    def run(self, branches, areTags=False):
+        assert (isinstance(branches, list))
+        assert (isinstance(areTags, bool))
+
+        branches.sort()
+        self.successes = []
+
         try:
-            for branch in CreateBinaryDistr.BRANCHES:
-                self.runInBranch(branch)
+            for branch in branches:
+                self.runInBranch(branch, areTags)
         except Exception as e:
             print(e, file=sys.stderr)
         finally:
             CreateBinaryDistr.attemptCleanExit()
 
-        self.printSummary()
+        self.printSummary(branches)
 
-    def runInBranch(self, branch):
+    def runInBranch(self, branch, isTag):
         # Clean any leftover crud
         CreateBinaryDistr.clean()
 
         # Attempt to checkout the next branch
-        if 0 == CreateBinaryDistr.checkout(branch):
+        if 0 == CreateBinaryDistr.checkout(branch, isTag):
             # Compile the static libraries and example projects
             CreateBinaryDistr.compile()
 
@@ -111,18 +118,21 @@ def clean():
                 raise e
 
     @staticmethod
-    def checkout(branch):
+    def checkout(branch, isTag=False):
+        assert (isinstance(isTag, bool))
+
         try:
             subprocess.check_output(["git", "checkout", branch])
         except subprocess.CalledProcessError:
             print("Failed to checkout " + branch, file=sys.stderr)
             return 1
 
-        try:
-            subprocess.check_output(["git", "pull"])
-        except subprocess.CalledProcessError:
-            print("Failed to pull latest sources", file=sys.stderr)
-            return 1
+        if not isTag:
+            try:
+                subprocess.check_output(["git", "pull"])
+            except subprocess.CalledProcessError:
+                print("Failed to pull latest sources", file=sys.stderr)
+                return 1
 
         return 0
 
@@ -154,15 +164,15 @@ def attemptCleanExit():
             print("Caused by: " + str(e), file=sys.stderr)
             print(e.output.decode(), file=sys.stderr)
 
-    def printSummary(self):
+    def printSummary(self, branches):
         # Let the stdout and stderr buffers catch up
         sleep(1)
 
         print("\n\nSummary:")
         self.successes.sort()
         for branch in self.successes:
             print("\tPASS: " + branch)
-        for branch in CreateBinaryDistr.BRANCHES:
+        for branch in branches:
             if branch not in self.successes:
                 print("\tFAIL: " + branch)
 
@@ -176,5 +186,14 @@ def __str__(self):
 
 
 if "__main__" == __name__:
+    parser = argparse.ArgumentParser(description="Create binary distributions of all branches (and optionally tags too)"
+                                                 " of PropWare")
+    parser.add_argument("--tags", action="store_true",
+                        help="Create binary distributions for all tagged commits as well")
+    args = parser.parse_args()
+
     runMe = CreateBinaryDistr()
-    runMe.run()
+    runMe.run(CreateBinaryDistr.BRANCHES)
+
+    if args.tags:
+        runMe.run(CreateBinaryDistr.TAGS, True)

util/importLibpropeller.py

@@ -1,4 +1,4 @@
-#/usr/bin/python
+#!/usr/bin/python
 # @file    importLibpropeller.py
 # @author  David Zemon
 # @project PropWare

util/propgcc-map-sizes.py

@@ -1,4 +1,4 @@
-#/usr/bin/python
+#!/usr/bin/python
 # File:    ${file}
 # Author:  David Zemon
 # Project: PropWare

util/propwareImporter.py

@@ -1,4 +1,4 @@
-#/usr/bin/python
+#!/usr/bin/python
 # File:    ${file}
 # Author:  David Zemon
 # Project: PropWare

util/propwareUtils.py

@@ -1,4 +1,4 @@
-#/usr/bin/python
+#!/usr/bin/python
 # File:    ${file}
 # Author:  David Zemon
 # Project: PropWare