casa / casa6 / 04ca0b3ca20

Commits

Ville Suoranta authored 04ca0b3ca20 Merge 05 Dec 2019

Merge pull request #40 in CASA/casa6 from CAS-12795 to master

* commit '9318dd3ac81ec34af6c1ca3bc5d30e8dc69a17d2': (31 commits)
  Remove plotms from build.conf
  Fix casatasks version
  Move version.cc generation
  Fix branch sort
  Move version header generation
  Add version.cc to genmake
  Remove errant substitution
  Add dot before dev element of the wheel
  Pad version from command line
  Add build.conf
  Fix casatasks/setup.py bugs
  Update casatasks setup script with tagless option
  Add identifier for tagless builds
  Fix feature element
  Add four element version number to casatasks
  Added missing micro element
  Update casatasks version script
  Update setup.py.in and toolversion.h.in for four element version
  Add self reflection for the tag selection
  Fix release branch resolution
  ...

casa5/gcwrap/tools/utils/utils_cmpt.cc

Modified


523 523	bool utils::compare_version(const string& comparitor, const std::vector<int>& vec) {
524 524	return VersionInfo::compare(comparitor,vec);
525 525	}
526 526
527 527	std::vector<int>
528 528	utils::toolversion( ) {
529 529	std::vector<int> result = {
530 530	#ifdef CASATOOLS
531 531	ToolVersionInfo::major( ),
532 532	ToolVersionInfo::minor( ),
533 +	ToolVersionInfo::patch( ),
534 +	ToolVersionInfo::feature( ),
533 535	#endif
534 536	};
535 537	return result;
536 538	}
537 539
538 540	std::string
539 541	utils::toolversion_string( ) {
540 542	#ifdef CASATOOLS
541 543	return ToolVersionInfo::version( );
542 544	#else

casa6

Commits

Jira Issues

Add shortcut