X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/05537e76088cc171e78ffa582b215bedce1b7c44..f5fc2c7cd2999eb0af27dffb9d99b594940d463f:/mass_build.py

diff --git a/mass_build.py b/mass_build.py
index 3615dd6..814fa3e 100755
--- a/mass_build.py
+++ b/mass_build.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # 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
@@ -28,7 +28,7 @@ class Project:
 		# VCS
 		vcsName = config['vcs']
 		if vcsName == 'git':
-			self.vcs = vcs.Git(self.sourceFolder(), config['url'], config['version'])
+			self.vcs = vcs.Git(self.sourceFolder(), config)
 		elif vcsName == 'svn':
 			self.vcs = vcs.SVN(self.sourceFolder(), config['url'])
 		else:
@@ -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",
@@ -69,12 +69,14 @@ parser.add_argument("--no-update",
 parser.add_argument("--resume-from", metavar='PROJECT',
                     dest="resume_from",
                     help="From the projects specified, continue building with this one (i.e., remove all projects before this one from the list - this never adds new projects)")
+parser.add_argument("--check-versions",
+                    action="store_true", dest="version_check",
+                    help="Check the repositories for newer tags, if possible (does not perform any building steps)")
 parser.add_argument("projects",  metavar='PROJECT', nargs='*',
                     help="Manually specify projects or folders to be built (project names take precedence)")
 args = parser.parse_args()
-# sanitize
 if args.reset_source and not args.update:
-	raise Exception("When no update is performed, no reset to the given version can be done either")
+	raise Exception("Can not reset sources without doing an update")
 
 # load config
 config = imp.load_source('config', args.config).__dict__
@@ -139,11 +141,15 @@ if args.resume_from is not None:
 # and do it!
 for project in workProjects:
 	try:
-		if args.update:
-			print "Updating project",project.sourceFolder()
-			project.vcs.update(forceVersion=args.reset_source)
-		print "Building project",project.sourceFolder()
-		project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)
+		if args.version_check:
+			print "Checking project",project.sourceFolder()
+			project.vcs.checkVersions()
+		else:
+			if args.update:
+				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()
+			project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)
 		print
 	except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
 		print >> sys.stderr