Merge pull request #11847 from Michael-Gardner/HPCC-20750

HPCC-20750 Move spark xsd/xsl files into platform

Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

initfiles/componentfiles/configxml/CMakeLists.txt

@@ -34,6 +34,9 @@ if("${HPCC_PROJECT_ABBR}" STREQUAL "CC")
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/buildset.xml DESTINATION componentfiles/configxml COMPONENT Runtime)
 endif()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sparkThor.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/sparkThor.xsl @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spark-defaults.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/spark-defaults.xsl @ONLY)
+        
 FOREACH( iFILES
     ${CMAKE_CURRENT_BINARY_DIR}/dropzone.xsd
     ${CMAKE_CURRENT_BINARY_DIR}/eclagent_config.xsd
@@ -97,6 +100,9 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/daliplugin.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/backupnode.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/backupnode_vars.xsl
+    ${CMAKE_CURRENT_SOURCE_DIR}/sparkThor.xsd
+    ${CMAKE_CURRENT_BINARY_DIR}/sparkThor.xsl
+    ${CMAKE_CURRENT_BINARY_DIR}/spark-defaults.xsl
 )
     Install ( FILES ${iFILES} DESTINATION componentfiles/configxml COMPONENT Runtime)
 ENDFOREACH ( iFILES )

plugins/spark/CMakeLists.txt

@@ -156,15 +156,6 @@ if(SPARK)
         DESTINATION ${EXEC_DIR}
         COMPONENT Runtime)
     
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sparkThor.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/sparkThor.xsl @ONLY)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spark-defaults.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/spark-defaults.xsl @ONLY)
-    install(FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/sparkThor.xsd
-        ${CMAKE_CURRENT_BINARY_DIR}/sparkThor.xsl
-        ${CMAKE_CURRENT_BINARY_DIR}/spark-defaults.xsl
-        DESTINATION componentfiles/configxml
-        COMPONENT Runtime)
-        
     configure_file(sparkthor@instance.service.in sparkthor@.service @ONLY)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sparkthor@.service DESTINATION etc/systemd/system COMPONENT Systemd)