X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/7e9392d1b724df00869c018b3ed9aabc6d2dc5a4..b1a7ca874f864a9ddda2d97eaa188e1935d1300d:/mass_build.py

diff --git a/mass_build.py b/mass_build.py
index 1732565..88db907 100755
--- a/mass_build.py
+++ b/mass_build.py
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # 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, importlib.machinery
 import argparse, os, sys, subprocess
 from collections import OrderedDict
 
@@ -57,7 +57,7 @@ parser.add_argument("-c, --config",
 parser.add_argument("--reconfigure",
                     action="store_true", dest="reconfigure",
                     help="Force configuration to be run")
-parser.add_argument("--wait-after-config",
+parser.add_argument("-w", "--wait-after-config",
                     action="store_true", dest="wait_after_config",
                     help="Wait for user confirmation after configuration is finished")
 parser.add_argument("--reset-source",
@@ -75,10 +75,16 @@ parser.add_argument("--check-versions",
 parser.add_argument("projects",  metavar='PROJECT', nargs='*',
                     help="Manually specify projects or folders to be built (project names take precedence)")
 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
+old_val = sys.dont_write_bytecode
+sys.dont_write_bytecode = True
+config = importlib.machinery.SourceFileLoader('config', args.config).load_module().__dict__
+sys.dont_write_bytecode = old_val
+
+# initialise variables holding the configuration
 allProjects = OrderedDict() # all projects
 allFolders = {} # all folders
 workProjects = [] # projects we work on
@@ -121,7 +127,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
@@ -140,22 +146,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")