X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/dcc5ee50d6903bfb5316927c0f64b3b351199a28..2d7dbfca0da3fb29cd8578a2e2fd66b698fe3a3d:/mass_build.py?ds=inline

diff --git a/mass_build.py b/mass_build.py
index 814fa3e..c5f4ddd 100755
--- a/mass_build.py
+++ b/mass_build.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
 # Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
 #
@@ -16,10 +16,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import vcs, build_system, imp
+import vcs, build_system
 import argparse, os, sys, subprocess
 from collections import OrderedDict
 
+# helper funcrions
+def load_module(name, path, write_bytecode = False):
+	import importlib.machinery
+	old_val = sys.dont_write_bytecode
+	sys.dont_write_bytecode = not write_bytecode
+	module = importlib.machinery.SourceFileLoader(name, path).load_module()
+	sys.dont_write_bytecode = old_val
+	return module
+
 # an entire Project
 class Project:
 	def __init__(self, folder, config):
@@ -51,7 +60,7 @@ class Project:
 
 # read command-line arguments
 parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')
-parser.add_argument("-c, --config",
+parser.add_argument("-c", "--config",
                     dest="config", default="mass-build.conf",
                     help="mass-build config file")
 parser.add_argument("--reconfigure",
@@ -78,9 +87,10 @@ args = parser.parse_args()
 if args.reset_source and not args.update:
 	raise Exception("Can not reset sources without doing an update")
 
-# load config
-config = imp.load_source('config', args.config).__dict__
-os.remove(args.config+'c') # remove compiled python file
+# load config as dictionary
+config = vars(load_module('config', args.config))
+
+# initialise variables holding the configuration
 allProjects = OrderedDict() # all projects
 allFolders = {} # all folders
 workProjects = [] # projects we work on
@@ -123,7 +133,7 @@ if args.projects:
 		else:
 			raise Exception("Project or folder %s does not exist" % name)
 else:
-	workProjects = allProjects.values() # all the projects
+	workProjects = list(allProjects.values()) # all the projects
 # apply the "resume from"
 if args.resume_from is not None:
 	# find project index
@@ -142,22 +152,22 @@ if args.resume_from is not None:
 for project in workProjects:
 	try:
 		if args.version_check:
-			print "Checking project",project.sourceFolder()
+			print("Checking project",project.sourceFolder())
 			project.vcs.checkVersions()
 		else:
 			if args.update:
-				print "Updating project",project.sourceFolder()
+				print("Updating project",project.sourceFolder())
 				project.vcs.update(mode = vcs.MODE_RESET if args.reset_source else vcs.MODE_REBASE)
-			print "Building project",project.sourceFolder()
+			print("Building project",project.sourceFolder())
 			project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)
-		print
+		print()
 	except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
-		print >> sys.stderr
-		print >> sys.stderr
+		print(file=sys.stderr)
+		print(file=sys.stderr)
 		if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string
-			print >> sys.stderr, "Interruped by user while processing %s" % (project.name)
+			print("Interruped by user while processing %s" % (project.name), file=sys.stderr)
 		else:
-			print >> sys.stderr, "Error while processing %s: %s" % (project.name, str(e))
-		print >> sys.stderr
+			print("Error while processing %s: %s" % (project.name, str(e)), file=sys.stderr)
+		print(file=sys.stderr)
 		sys.exit(1)
-print "All operations successfully completed"
+print("All operations successfully completed")