|
|
|
@ -145,12 +145,27 @@ else:
|
|
|
|
|
files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zonenhw")
|
|
|
|
|
for file in files:
|
|
|
|
|
sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
|
|
|
|
|
destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zonew"
|
|
|
|
|
destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zonenhw")] + ".zone"
|
|
|
|
|
if needUpdateLogRemoveDest(log, sourceFile, destFile):
|
|
|
|
|
callParallelProcess([ ZoneElevation, sourceFile, destFile, "--land", land, "--heightmap", heightMap1, "--zfactor", LigoExportZFactor1, "--heightmap2", heightMap2, "--zfactor2", LigoExportZFactor2 ])
|
|
|
|
|
flushParallelProcesses()
|
|
|
|
|
printLog(log, "")
|
|
|
|
|
|
|
|
|
|
printLog(log, ">>> Re-weld zone with heightmap <<<")
|
|
|
|
|
if ZoneWelder == "":
|
|
|
|
|
toolLogFail(log, ZoneWelderTool, ToolSuffix)
|
|
|
|
|
elif ExecTimeout == "":
|
|
|
|
|
toolLogFail(log, ExecTimeoutTool, ToolSuffix)
|
|
|
|
|
else:
|
|
|
|
|
mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
|
|
|
|
|
files = findFiles(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory, "", ".zone")
|
|
|
|
|
for file in files:
|
|
|
|
|
sourceFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + file
|
|
|
|
|
destFile = ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/" + os.path.basename(file)[0:-len(".zone")] + ".zonew"
|
|
|
|
|
if needUpdateLogRemoveDest(log, sourceFile, destFile):
|
|
|
|
|
subprocess.call([ ExecTimeout, str(ZoneBuildWeldTimeout), ZoneWelder, sourceFile, destFile ])
|
|
|
|
|
printLog(log, "")
|
|
|
|
|
|
|
|
|
|
log.close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|