Commit c1eb7645 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Merged CoRA and feature_buster versions.

parent cccb2224
......@@ -148,9 +148,12 @@ def mysystem(x, outputDir=None):
g_log = open(outputDir + os.sep + "log.txt", "w")
return
g_log.write("From: " + os.getcwd() + "\n")
g_log.write(x + "\n")
g_log.flush()
startTime = time.time()
while os.system(x) != 0:
deltaTime = 'Took %4.1f sec: ' % (time.time() - startTime)
g_log.write(deltaTime + x + "\n")
g_log.flush()
startTime = time.time()
# Save the environment that was used for the failed command under OUTPUT_FOLDER/env.txt
if g_absOutputDir != "":
os.system('env > "' + g_absOutputDir + os.sep + 'env.txt"')
......@@ -169,6 +172,9 @@ def mysystem(x, outputDir=None):
panic("\nFailed to compile...")
else:
panic("Failed while executing:\n" + x + "\nFrom this directory:\n" + os.getcwd())
deltaTime = 'Took %4.1f sec: ' % (time.time() - startTime)
g_log.write(deltaTime + x + "\n")
g_log.flush()
def getSingleLineFromCmdOutput(cmd):
......@@ -1983,6 +1989,15 @@ def UnzipAdaCode(adaSubsystems, AdaIncludePath):
if 0 != len([c for c in name if c.isupper()]):
# panic("Ada user code must be in lower case filenames! (%s)" % name)
os.rename(root + os.sep + name, root + os.sep + name.lower())
if name == "system_structure.pr":
g_stageLog.error(
"\n=====================================================================\n"
"OpenGEODE-based development has dramatically changed (for the better)\n"
"with the introduction of Kazoo in TASTE 10. Please upgrade your project\n"
"following the guide here:\n"
" http://taste.tuxfamily.org/wiki/index.php?title=Port_a_legacy_TASTE_project_to_Kazoo\n"
"=====================================================================\n")
sys.exit(1)
mysystem("find \"%s\"/ ! -type d -exec chmod -x '{}' ';'" % baseDir)
mysystem("find \"%s\"/ -exec touch '{}' ';'" % baseDir)
mysystem("find \"%s\"/ -type f -iname '*.o' -exec rm -f '{}' ';'" % baseDir)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment