HPCC-25079 Simplify cmake regress install

Also fixes issues with files missing at install time
e.g. java manifest files.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>

testing/CMakeLists.txt

@@ -14,11 +14,15 @@
 #    limitations under the License.
 ################################################################################
 HPCC_ADD_SUBDIRECTORY (unittests)
-HPCC_ADD_SUBDIRECTORY (regress)
-install( DIRECTORY regress DESTINATION "./testing" COMPONENT Runtime
-         USE_SOURCE_PERMISSIONS
-         FILES_MATCHING
-         PATTERN "regress/ecl-test"
-         PATTERN "regress/ecl-test.json"
-         PATTERN "regress/environment.xml"
-         PATTERN "regress/README.rst" )
+
+
+Install ( DIRECTORY regress DESTINATION "./testing" COMPONENT Runtime
+          USE_SOURCE_PERMISSIONS
+          PATTERN "environment.xml.in" EXCLUDE
+          PATTERN "ecl-test-cluster160.json" EXCLUDE
+        )
+
+configure_file("regress/environment.xml.in" "regress/environment.xml")
+
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/regress/environment.xml DESTINATION "./testing/regress" COMPONENT Runtime )
+

testing/regress/CMakeLists.txt

@@ -1,34 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    All rights reserved. This program is free software: you can redistribute it
-#    and/or modify
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-HPCC_ADD_SUBDIRECTORY (hpcc)
-HPCC_ADD_SUBDIRECTORY (ecl)
-
-configure_file("environment.xml.in" "environment.xml")
-
-Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.xml DESTINATION "./testing/regress" COMPONENT Runtime )
-
-Install ( DIRECTORY download hpcc ecl DESTINATION "./testing/regress" COMPONENT Runtime
-          USE_SOURCE_PERMISSIONS
-          FILES_MATCHING
-          PATTERN "hpcc/__init__.py"
-          PATTERN "download/0drvb10.txt"
-          PATTERN "download/donQuixote.txt"
-          PATTERN "download/pge0112.txt"
-          PATTERN "download/spray_test.txt"
-          PATTERN "ecl/*.ecl"
-          PATTERN "ecl/*.xml"
-          PATTERN "ecl/*.queryxml" )

testing/regress/ecl/CMakeLists.txt

@@ -1,28 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    All rights reserved. This program is free software: you can redistribute it
-#    and/or modify
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-HPCC_ADD_SUBDIRECTORY (setup)
-
-Install ( DIRECTORY setup common hthor key roxie thor DESTINATION "./testing/regress/ecl" COMPONENT Runtime
-          USE_SOURCE_PERMISSIONS
-          FILES_MATCHING
-          PATTERN "setup/*.ecl"
-          PATTERN "setup/*.xml"
-          PATTERN "common/*.ecl"
-          PATTERN "hthor/*.xml"
-          PATTERN "key/*.xml"
-          PATTERN "roxie/*.xml"
-          PATTERN "thor/*.xml" )

testing/regress/ecl/setup/CMakeLists.txt

@@ -1,20 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    All rights reserved. This program is free software: you can redistribute it
-#    and/or modify
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-Install ( DIRECTORY thor DESTINATION "./testing/regress/ecl/setup" COMPONENT Runtime
-          USE_SOURCE_PERMISSIONS
-          FILES_MATCHING
-          PATTERN "thor/*.xml" )

testing/regress/hpcc/CMakeLists.txt

@@ -1,37 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    All rights reserved. This program is free software: you can redistribute it
-#    and/or modify
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-HPCC_ADD_SUBDIRECTORY (util)
-Install ( DIRECTORY common regression util DESTINATION "./testing/regress/hpcc" COMPONENT Runtime
-          USE_SOURCE_PERMISSIONS
-          FILES_MATCHING
-          PATTERN "common/config.py"
-          PATTERN "common/dict.py"
-          PATTERN "common/error.py"
-          PATTERN "common/__init__.py"
-          PATTERN "common/logger.py"
-          PATTERN "common/report.py"
-          PATTERN "common/shell.py"
-          PATTERN "regression/__init__.py"
-          PATTERN "regression/regress.py"
-          PATTERN "regression/suite.py"
-          PATTERN "util/argparse.py"
-          PATTERN "util/collections.py"
-          PATTERN "util/configgen.py"
-          PATTERN "util/expandcheck.py"
-          PATTERN "util/__init__.py"
-          PATTERN "util/util.py"
-)

testing/regress/hpcc/util/CMakeLists.txt

@@ -1,24 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    All rights reserved. This program is free software: you can redistribute it
-#    and/or modify
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-Install ( DIRECTORY ecl DESTINATION "./testing/regress/hpcc/util" COMPONENT Runtime
-          USE_SOURCE_PERMISSIONS
-          FILES_MATCHING
-          PATTERN "ecl/cc.py"
-          PATTERN "ecl/command.py"
-          PATTERN "ecl/file.py"
-          PATTERN "ecl/__init__.py"
-)