Commits

Darrell Schiebel authored 264cf627e2f
include xml-casa changes which are more recent [CAS-14309]

casatasks/setup.py

Modified
435 435 moduledir = os.path.join(libdir,"casatasks")
436 436 xmldir = os.path.join(moduledir,"__xml__")
437 437
438 438 copy_tree('src',moduledir)
439 439
440 440 print("generating task python files...")
441 441 if tools_config is not None:
442 442 proc = Popen( [tools_config['build.compiler.xml-casa'], "output-task=%s" % moduledir, "-task"] + xml_files,
443 443 stdout=subprocess.PIPE )
444 444 else:
445 - xml_jar_file = 'xml-casa-assembly-1.85.jar'
445 + xml_jar_file = 'xml-casa-assembly-1.86.jar'
446 446 xml_jar_url = 'http://casa.nrao.edu/download/devel/xml-casa/java/%s' % xml_jar_file
447 447 xml_jar_path = os.path.abspath(os.path.join( 'java', xml_jar_file))
448 448 self.xml_jar_fetch(xml_jar_path, xml_jar_url)
449 449 proc = Popen(['java', '-jar', xml_jar_path, '-task', 'output-task=%s' % moduledir] + xml_files, stdout=subprocess.PIPE)
450 450
451 451 (output, error) = pipe_decode(proc.communicate( ))
452 452
453 453 exit_code = proc.wait( )
454 454
455 455 if exit_code != 0:

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut