Task #8432: use cmake for xmlgen.

install xmlgen.py script which is both a lib and a bin script in site-packages lofar tree.
made executable script xmlgen (which imports xmlgen.py) for bin dir.
moved regression test data into test_regression.in_data dir, so ctest can copy it automagically.
made minor modifications to tests so they import the proper xmlgen module, and call the proper xmlgen bin script.'

.gitattributes

@@ -5121,44 +5121,44 @@ SAS/Scheduler/test/unittest/tojunit.xslt -text
 SAS/XML_generator/src/xmlgen.py -text
 SAS/XML_generator/test/test_error8134.py -text
 SAS/XML_generator/test/test_error8134.sh -text
+SAS/XML_generator/test/test_regression.in_data/txt/20150713_4C17.31.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/20150731_G46_run1_HBA.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/20150810_P247P244.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/2MASS_1.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/LC4_020_20150813.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/LT5_006_4C43_HBA_calSearch_parameters.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/MSSS_20151207_testmultipipe.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/Ticket_6923.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/hd156279b_reference.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/lc4_019_1.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/old_Long_Baseline_test.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/old_input.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/old_pulsar_pipe_test.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/test_LB.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/test_input.txt -text
+SAS/XML_generator/test/test_regression.in_data/txt/test_input_long_baseline_pipeline.txt -text
+SAS/XML_generator/test/test_regression.in_data/xml/20150713_4C17.31.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/20150731_G46_run1_HBA.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/20150810_P247P244.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/2MASS_1.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/B1834620_HBA_LB_20150817.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/LC4_020_20150813.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/LC4_022_3C58_HBA_parameters.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/LT5_006_4C43_HBA_calSearch_parameters.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/Long_Baseline_test.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/Ticket_6923.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/hd156279b_reference.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/input.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/lc4_019_1.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/pulsar_pipe_test.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/test_LB.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/test_input.xml -text
+SAS/XML_generator/test/test_regression.in_data/xml/test_input_long_baseline_pipeline.xml -text
 SAS/XML_generator/test/test_regression.py -text
 SAS/XML_generator/test/test_regression.sh -text
-SAS/XML_generator/test/txt/20150713_4C17.31.txt -text
-SAS/XML_generator/test/txt/20150731_G46_run1_HBA.txt -text
-SAS/XML_generator/test/txt/20150810_P247P244.txt -text
-SAS/XML_generator/test/txt/2MASS_1.txt -text
-SAS/XML_generator/test/txt/B1834620_HBA_LB_20150817.txt -text
-SAS/XML_generator/test/txt/LC4_020_20150813.txt -text
-SAS/XML_generator/test/txt/LC4_022_3C58_HBA_parameters.txt -text
-SAS/XML_generator/test/txt/LT5_006_4C43_HBA_calSearch_parameters.txt -text
-SAS/XML_generator/test/txt/MSSS_20151207_testmultipipe.txt -text
-SAS/XML_generator/test/txt/Ticket_6923.txt -text
-SAS/XML_generator/test/txt/hd156279b_reference.txt -text
-SAS/XML_generator/test/txt/lc4_019_1.txt -text
-SAS/XML_generator/test/txt/old_Long_Baseline_test.txt -text
-SAS/XML_generator/test/txt/old_input.txt -text
-SAS/XML_generator/test/txt/old_pulsar_pipe_test.txt -text
-SAS/XML_generator/test/txt/test_LB.txt -text
-SAS/XML_generator/test/txt/test_input.txt -text
-SAS/XML_generator/test/txt/test_input_long_baseline_pipeline.txt -text
-SAS/XML_generator/test/xml/20150713_4C17.31.xml -text
-SAS/XML_generator/test/xml/20150731_G46_run1_HBA.xml -text
-SAS/XML_generator/test/xml/20150810_P247P244.xml -text
-SAS/XML_generator/test/xml/2MASS_1.xml -text
-SAS/XML_generator/test/xml/B1834620_HBA_LB_20150817.xml -text
-SAS/XML_generator/test/xml/LC4_020_20150813.xml -text
-SAS/XML_generator/test/xml/LC4_022_3C58_HBA_parameters.xml -text
-SAS/XML_generator/test/xml/LT5_006_4C43_HBA_calSearch_parameters.xml -text
-SAS/XML_generator/test/xml/Long_Baseline_test.xml -text
-SAS/XML_generator/test/xml/MSSS_20151207_testmultipipe.xml -text
-SAS/XML_generator/test/xml/Ticket_6923.xml -text
-SAS/XML_generator/test/xml/hd156279b_reference.xml -text
-SAS/XML_generator/test/xml/input.xml -text
-SAS/XML_generator/test/xml/lc4_019_1.xml -text
-SAS/XML_generator/test/xml/pulsar_pipe_test.xml -text
-SAS/XML_generator/test/xml/test_LB.xml -text
-SAS/XML_generator/test/xml/test_input.xml -text
-SAS/XML_generator/test/xml/test_input_long_baseline_pipeline.xml -text
 SubSystems/LAPS_CEP/test/startPythonFromMsg.py eol=lf
 SubSystems/LAPS_CEP/test/startPythonFromMsg.run eol=lf
 SubSystems/LAPS_CEP/test/startPythonFromMsg.sh eol=lf

CMake/LofarPackageList.cmake

@@ -143,6 +143,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(OTDB_Services_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB_Services)
   set(jOTDB3_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/jOTDB3)
   set(OTB-Java_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/OTB)
+  set(XML_generator_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/XML_generator)
   set(ResourceAssignmentEditor_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentEditor)
   set(CCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/CCU_MAC)
   set(LCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LCU_MAC)

SAS/CMakeLists.txt

@@ -7,5 +7,6 @@ lofar_add_package(Scheduler)
 lofar_add_package(SAS_Feedback Feedback_Service)
 lofar_add_package(CleanupTool)
 lofar_add_package(OTDB_Services)
+lofar_add_package(XML_generator)
 
 add_subdirectory(ResourceAssignment)

SAS/XML_generator/test/test_error8134.py

 #! /usr/bin/env python
-from xmlgen import dms2deg, hms2deg
+from lofar.sas.xmlgenerator.xmlgen import dms2deg, hms2deg
 import sys
 
 #testing for bug #8134 Negative zero degrees were turned into positive ones
@@ -9,4 +9,4 @@ test_hms = str(hms2deg("-00:30:00.0")) == "-7.5"
 if test_dms and test_hms:
   sys.exit(0)
 else:
-  sys.exit(1)
\ No newline at end of file
+  sys.exit(1)