Merge pull request #8383 from Michael-Gardner/HPCC-15131-revert

HPCC-15130 Revert HPCC-12750 changes.  Add new default environment.xml

Reviewed-By: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

initfiles/bash/etc/init.d/install-init.in

@@ -184,15 +184,8 @@ echo ""
 
 # installing files
 installConfs "environment.conf" $configs/ 1 || exit 1
-installConfs "genenvrules.conf" $configs/ 1 || exit 1
-
-echo "Generate environment.xml"
-# Generate environment.xml
-${path}/sbin/create-env-xml.sh > /dev/null 2>&1 || exit 1
-echo ""
-
-# installing environment.xml
 installConfs "environment.xml" $configs/  1 || exit 1
+installConfs "genenvrules.conf" $configs/ 1 || exit 1
 
 installFile "$path${CONFIG_DIR}/version" "${CONFIG_DIR}/version" 1 || exit 1
 installFile "$initPath/dafilesrv" "/etc/init.d/dafilesrv" 1 || exit 1

initfiles/bash/etc/init.d/uninstall-init.in

@@ -85,8 +85,3 @@ if [ "${DISTRIB_NAME}" = "ubuntu" ] &&
       [ -e /lib/systemd/system/dafilesrv@.service ] && rm -rf /lib/systemd/system/dafilesrv@.service
    fi
 fi
-# Remove generated environment.xml under install directory
-[ -e ${INSTALL_DIR}/etc/HPCCSystems/rpmnew/environment.xml ] && rm -rf ${INSTALL_DIR}/etc/HPCCSystems/rpmnew/environment.xml
-[ -e ${INSTALL_DIR}/testing/regress/environment.xml ] && rm -rf ${INSTALL_DIR}/testing/regress/environment.xml
-
-exit 0

initfiles/etc/DIR_NAME/CMakeLists.txt

@@ -16,6 +16,7 @@
 ################################################################################
 configure_file("version.in" "version")
 configure_file("environment.conf.in" "environment.conf")
+configure_file("environment.xml.in" "environment.xml")
 FOREACH( iFILES
     ${CMAKE_CURRENT_BINARY_DIR}/environment.conf
     ${CMAKE_CURRENT_BINARY_DIR}/version
@@ -23,7 +24,8 @@ FOREACH( iFILES
     Install ( FILES ${iFILES}  DESTINATION .${CONFIG_DIR} COMPONENT Runtime )	#  Don't delete the "."
 ENDFOREACH ( iFILES)
 
-Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.conf DESTINATION .${CONFIG_DIR}/rpmnew COMPONENT Runtime )     #  Don't delete the "."
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.xml DESTINATION .${CONFIG_DIR}/rpmnew COMPONENT Runtime ) 	#  Don't delete the "."
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.conf DESTINATION .${CONFIG_DIR}/rpmnew COMPONENT Runtime )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/genenvrules.conf DESTINATION .${CONFIG_DIR}/rpmnew COMPONENT Runtime )
 
 ADD_SUBDIRECTORY(configmgr)

initfiles/sbin/CMakeLists.txt

@@ -26,7 +26,6 @@ GENERATE_BASH(processor ${bash-vars} "hpcc-push.sh.in" outFiles)
 GENERATE_BASH(processor ${bash-vars} "hpcc-run.sh.in" outFiles)
 GENERATE_BASH(processor ${bash-vars} "remote-install-engine.sh.in" outFiles)
 GENERATE_BASH(processor ${bash-vars} "deploy-java-files.sh.in" outFiles)
-GENERATE_BASH(processor ${bash-vars} "create-env-xml.sh.in" outFiles)
 
 SET(noInstall)
 GENERATE_BASH(processor ${bash-vars} "prerm.in" noInstall)

testing/regress/CMakeLists.txt

@@ -17,6 +17,10 @@
 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