From 4d6fec7bdcc28a4d846ce8cd9fbc0ea913a2a7d8 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Thu, 19 Jan 2012 08:28:35 +0000
Subject: [PATCH] Task #2744: Undid commits to the trunk. Will move them to the
task branch.
---
.../CEPCU/src/PythonControl/CMakeLists.txt | 4 --
.../CEPCU/src/PythonControl/startPython.sh | 56 -------------------
2 files changed, 60 deletions(-)
delete mode 100755 MAC/APL/CEPCU/src/PythonControl/startPython.sh
diff --git a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
index 3b0142a465d..05d52c422f6 100644
--- a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
+++ b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
@@ -26,7 +26,3 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
lofar_add_bin_program(PythonControl
PythonControlMain.cc
PythonControl.cc)
-
-install(PROGRAMS
- startPython.sh
- DESTINATION bin)
diff --git a/MAC/APL/CEPCU/src/PythonControl/startPython.sh b/MAC/APL/CEPCU/src/PythonControl/startPython.sh
deleted file mode 100755
index 3d9f3725502..00000000000
--- a/MAC/APL/CEPCU/src/PythonControl/startPython.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash -l
-#
-# This script is started by the MAC Python Controller using the following
-# parameters:
-#
-# <pythonProgram> <parsetname> <3 fields with communication settings>
-#
-# For example:
-#
-# startPython.sh ./pythonProgram /opt/lofar/share/Observation6118 \
-# MCU001T MCU001T:PythonControl[0]{6118}:listener \
-# PythonServer{6118}@MCU001T
-#
-# For the time being, we will ignore the 3 communication settings, because
-# we will not be under control of MAC yet.
-#
-
-# Make sure aliases are expanded, which is not the default for non-interactive
-# shells.
-shopt -s expand_aliases
-
-# Enable debugging messages
-debug=on
-
-usage()
-{
- echo "Usage: $0 <pythonProgram> <parsetname> <MAC-Python-control-host> \\"
- echo " <MAC-Python-control-listener> <MAC-Python-control-server>"
- exit 1
-}
-
-# Check for correct number of input arguments.
-[ $# -eq 5 ] || usage
-
-# Initialize the environment. We will assume here that we can use the
-# Lofar Login Environment (LLE).
-use LofIm
-
-pythonProgram="${1}"
-parsetFile="${2}"
-programOptions=" \
- -d \
- -c ${LOFARROOT}/share/pipeline.cfg \
- -t ${LOFARROOT}/share/tasks.cfg \
- -r ${LOFARROOT}/share"
-
-# Print some debugging information if debugging is enabled.
-if [ -n "$debug" ]; then
- echo "PATH=${PATH}"
- echo "PYHONTPATH=${PYTHONPATH}"
- echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
- echo "${pythonProgram} ${programOptions} ${parsetFile}"
-fi
-
-# Start the Python program.
-${pythonProgram} ${programOptions} ${parsetFile}
--
GitLab