From c0e50f3e756a4772ba91d6bb2c62f8341a3e2f4c Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Tue, 5 Oct 2010 14:59:47 +0000
Subject: [PATCH] Bug 1582: Rename iBeamServer/ibeamctl to Beamserver/beamctl
---
MAC/APL/APLCommon/src/swlevel.conf | 1 -
MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/MAC/APL/APLCommon/src/swlevel.conf b/MAC/APL/APLCommon/src/swlevel.conf
index be534260072..98784e109af 100644
--- a/MAC/APL/APLCommon/src/swlevel.conf
+++ b/MAC/APL/APLCommon/src/swlevel.conf
@@ -18,7 +18,6 @@
#
3:u:d:::AMCServer
3:u:d:::CalServer
-3:u:d:::iBeamServer
3:u:d:::BeamServer
#
4:u:d:::SoftwareMonitor
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
index a98382b5f3f..231e6a15490 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
@@ -11,17 +11,17 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
#include_directories(${CMAKE_BINARY_DIR}/include/MAC)
#lofar_add_bin_program(versionitrfbeamserver versionitrfbeamserver.cc)
-lofar_add_bin_program(iBeamServer BeamServerMain.cc BeamServer.cc Beam.cc DigitalBeam.cc AnalogueBeam.cc AnaBeamMgr.cc J2000Converter.cc CasaConverter.cc)
-lofar_add_bin_program(ibeamctl beamctl.cc)
+lofar_add_bin_program(BeamServer BeamServerMain.cc BeamServer.cc Beam.cc DigitalBeam.cc AnalogueBeam.cc AnaBeamMgr.cc J2000Converter.cc CasaConverter.cc)
+lofar_add_bin_program(beamctl beamctl.cc)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/iBeamServer.conf.in
- ${CMAKE_CURRENT_BINARY_DIR}/iBeamServer.conf)
+ ${CMAKE_CURRENT_BINARY_DIR}/BeamServer.conf)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/ibeamctl.conf.in
- ${CMAKE_CURRENT_BINARY_DIR}/ibeamctl.conf)
+ ${CMAKE_CURRENT_BINARY_DIR}/beamctl.conf)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/iBeamServer.conf
- ${CMAKE_CURRENT_BINARY_DIR}/ibeamctl.conf
+ ${CMAKE_CURRENT_BINARY_DIR}/BeamServer.conf
+ ${CMAKE_CURRENT_BINARY_DIR}/beamctl.conf
DESTINATION etc)
--
GitLab