projects
/
mass-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set CMAKE_PREFIX_PATH environment variable during build, so that cmake finds the...
[mass-build.git]
/
mass_build.py
diff --git
a/mass_build.py
b/mass_build.py
index 096d9a5834377a090fd5fb5c34fac5dada8b5654..800917d558bd3c6db6c9023fa8f4af0629cc5b89 100755
(executable)
--- a/
mass_build.py
+++ b/
mass_build.py
@@
-40,6
+40,9
@@
parser.add_argument("-c, --config",
parser.add_argument("--reconfigure",
action="store_true", dest="reconfigure",
help="Force configuration to be run")
parser.add_argument("--reconfigure",
action="store_true", dest="reconfigure",
help="Force configuration to be run")
+parser.add_argument("--wait-after-config",
+ action="store_true", dest="wait_after_config",
+ help="Wait for user confirmation after configuration is finished")
parser.add_argument("--reset-source",
action="store_true", dest="reset_source",
help="Reset sourcecode to the given version (removes local changes!)")
parser.add_argument("--reset-source",
action="store_true", dest="reset_source",
help="Reset sourcecode to the given version (removes local changes!)")
@@
-123,7
+126,7
@@
for project in workProjects:
print "Updating project",project.sourceFolder()
project.vcs.update(forceVersion=args.reset_source)
print "Building project",project.sourceFolder()
print "Updating project",project.sourceFolder()
project.vcs.update(forceVersion=args.reset_source)
print "Building project",project.sourceFolder()
- project.buildSystem.build(reconfigure=args.reconfigure)
+ 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
print
except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
print >> sys.stderr