From 57cda10f6f70fb4cef028c162361283b29d7b932 Mon Sep 17 00:00:00 2001 From: Andrea Orlati Date: Tue, 2 Oct 2018 12:42:49 +0200 Subject: [PATCH] fix #280: STrack, FTrack and scheduleChecker are now copiedin user tool area during deploymnet phase. User area is INTROOT/user/bin (#281) --- Common/Libraries/IRALibrary/src/Makefile | 10 +- .../UserTools/src/FrequencyTrack.cpp} | 5 +- Common/Misc/UserTools/src/Makefile | 241 ++++++++++++++++++ .../UserTools/src/SourceTrack.cpp} | 0 Common/Servers/Scheduler/src/Makefile | 2 + SystemMake/Makefile | 2 +- 6 files changed, 252 insertions(+), 8 deletions(-) rename Common/{Libraries/IRALibrary/src/TestFrequency.cpp => Misc/UserTools/src/FrequencyTrack.cpp} (99%) create mode 100644 Common/Misc/UserTools/src/Makefile rename Common/{Libraries/IRALibrary/src/TestSkySource.cpp => Misc/UserTools/src/SourceTrack.cpp} (100%) diff --git a/Common/Libraries/IRALibrary/src/Makefile b/Common/Libraries/IRALibrary/src/Makefile index c93a3aade..3ee371b8d 100644 --- a/Common/Libraries/IRALibrary/src/Makefile +++ b/Common/Libraries/IRALibrary/src/Makefile @@ -51,7 +51,7 @@ IRALibrary_LIBS = acstime SlaLibrary maciClient PY_PACKAGES = IRAPy PY_SCRIPTS = -EXECUTABLES = FTrack STrack +EXECUTABLES = EXECUTABLES_L = Test1 Test2 TestDBTable TestTypes TestMicroControllerBoard TestReceiverControl TestLogDike TestTimeTaggedCircularArray \ TestFlux TestTimer TestRounding @@ -87,11 +87,11 @@ TestFlux_LIBS = IRALibrary TestTimer_OBJECTS = TestTimer TestTimer_LIBS = IRALibrary -FTrack_OBJECTS = TestFrequency FrequencyTracking -FTrack_LIBS = SlaLibrary IRALibrary +#FTrack_OBJECTS = TestFrequency FrequencyTracking +#FTrack_LIBS = SlaLibrary IRALibrary -STrack_OBJECTS = TestSkySource SkySource DateTime String -STrack_LIBS = IRALibrary +#STrack_OBJECTS = TestSkySource SkySource DateTime String +#STrack_LIBS = IRALibrary TestRounding_OBJECTS = TestFloatRounding IRATools TestRounding_LIBS = IRALibrary diff --git a/Common/Libraries/IRALibrary/src/TestFrequency.cpp b/Common/Misc/UserTools/src/FrequencyTrack.cpp similarity index 99% rename from Common/Libraries/IRALibrary/src/TestFrequency.cpp rename to Common/Misc/UserTools/src/FrequencyTrack.cpp index dc5b135da..dcb522bd8 100644 --- a/Common/Libraries/IRALibrary/src/TestFrequency.cpp +++ b/Common/Misc/UserTools/src/FrequencyTrack.cpp @@ -1,5 +1,6 @@ -#include "FrequencyTracking.h" -#include "DateTime.h" +#include +#include +#include #include #include #include diff --git a/Common/Misc/UserTools/src/Makefile b/Common/Misc/UserTools/src/Makefile new file mode 100644 index 000000000..d614c2c88 --- /dev/null +++ b/Common/Misc/UserTools/src/Makefile @@ -0,0 +1,241 @@ + +#******************************************************************************* +# PPPPPPPP +# +# "@(#) $Id$" +# +# Makefile of ........ +# +# who when what +# -------- -------- ---------------------------------------------- +# discos 01/10/18 created +# + +# ALMA - Atacama Large Millimeter Array +# Copyright (c) ESO - European Southern Observatory, 2014 +# (in the framework of the ALMA collaboration). +# All rights reserved. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#******************************************************************************* + +#******************************************************************************* +# This Makefile follows ALMA/ACS Standards (see Makefile(5) for more). +#******************************************************************************* +# REMARKS +# None +#------------------------------------------------------------------------ + +# +# user definable C-compilation flags +#USER_CFLAGS = + +# +# additional include and library search paths +#USER_INC = +#USER_LIB = +# +# MODULE CODE DESCRIPTION: +# ------------------------ +# As a general rule: public file are "cleaned" and "installed" +# local (_L) are not "installed". + +# +# C programs (public and local) +# ----------------------------- +EXECUTABLES = FTrack STrack +EXECUTABLES_L = + +FTrack_OBJECTS = FrequencyTrack +#FTrack_LDFLAGS = +FTrack_LIBS = IRALibrary SlaLibrary + +STrack_OBJECTS = SourceTrack +#FTrack_LDFLAGS = +STrack_LIBS = IRALibrary SlaLibrary + + +# +# +xxxxx_OBJECTS = +xxxxx_LDFLAGS = +xxxxx_LIBS = + +# +# special compilation flags for single c sources +#yyyyy_CFLAGS = + +# +# Includes (.h) files (public only) +# --------------------------------- +INCLUDES = + +# +# Libraries (public and local) +# ---------------------------- +LIBRARIES = +LIBRARIES_L = + +# +# +lllll_OBJECTS = + +# +# Scripts (public and local) +# ---------------------------- +SCRIPTS = +SCRIPTS_L = + +# +# TCL scripts (public and local) +# ------------------------------ +TCL_SCRIPTS = +TCL_SCRIPTS_L = + +# +# Python stuff (public and local) +# ---------------------------- +PY_SCRIPTS = +PY_SCRIPTS_L = + +PY_MODULES = +PY_MODULES_L = + +PY_PACKAGES = +PY_PACKAGES_L = +pppppp_MODULES = + +# +# +tttttt_OBJECTS = +tttttt_TCLSH = +tttttt_LIBS = + +# +# TCL libraries (public and local) +# ------------------------------ +TCL_LIBRARIES = +TCL_LIBRARIES_L = + +# +# +tttlll_OBJECTS = + +# +# Configuration Database Files +# ---------------------------- +CDB_SCHEMAS = + +# +# IDL Files and flags +# +IDL_FILES = +TAO_IDLFLAGS = +USER_IDL = +# +# Jarfiles and their directories +# +JARFILES= +jjj_DIRS= +jjj_EXTRAS= +# For expressing dependencies between jarfiles (parallel builds) +jjj_JLIBS= +# +# java sources in Jarfile on/off +DEBUG= +# +# ACS XmlIdl generation on/off +# +XML_IDL= +# +# Java Component Helper Classes generation on/off +# +COMPONENT_HELPERS= +# +# Java Entity Classes generation on/off +# +XSDBIND= +# +# Schema Config files for the above +# +XSDBIND_INCLUDE= +# man pages to be done +# -------------------- +MANSECTIONS = +MAN1 = +MAN3 = +MAN5 = +MAN7 = +MAN8 = + +# +# local man pages +# --------------- +MANl = + +# +# ASCII file to be converted into Framemaker-MIF +# -------------------- +ASCII_TO_MIF = + +# +# other files to be installed +#---------------------------- +INSTALL_FILES = + +# +# list of all possible C-sources (used to create automatic dependencies) +# ------------------------------ +CSOURCENAMES = \ + $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ + $(foreach rtos, $(RTAI_MODULES) , $($(rtos)_OBJECTS)) \ + $(foreach lib, $(LIBRARIES) $(LIBRARIES_L), $($(lib)_OBJECTS)) + +# +#>>>>> END OF standard rules + +# +# INCLUDE STANDARDS +# ----------------- + +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + +# +# TARGETS +# ------- +all: do_all + @echo " . . . 'all' done" + +clean : clean_all + @echo " . . . clean done" + +clean_dist : clean_all clean_dist_all + @echo " . . . clean_dist done" + +man : do_man + @echo " . . . man page(s) done" + +install : install_all + @echo "FTrack and STrack made available to users...." + @if [ -d $(INTROOT)/user/bin ]; then cp -p $(INTROOT)/bin/STrack $(INTROOT)/user/bin/; fi; + @if [ -d $(INTROOT)/user/bin ]; then cp -p $(INTROOT)/bin/FTrack $(INTROOT)/user/bin/; fi; + @echo " . . . installation done" + + +#___oOo___ diff --git a/Common/Libraries/IRALibrary/src/TestSkySource.cpp b/Common/Misc/UserTools/src/SourceTrack.cpp similarity index 100% rename from Common/Libraries/IRALibrary/src/TestSkySource.cpp rename to Common/Misc/UserTools/src/SourceTrack.cpp diff --git a/Common/Servers/Scheduler/src/Makefile b/Common/Servers/Scheduler/src/Makefile index 845e2d6e9..3be02128e 100644 --- a/Common/Servers/Scheduler/src/Makefile +++ b/Common/Servers/Scheduler/src/Makefile @@ -218,6 +218,8 @@ install : install_all @echo $(RESTRICT_PERMS)" has been restcicted to system manager" @chmod g-x $(INTROOT)/bin/$(RESTRICT_PERMS) @chmod o-x $(INTROOT)/bin/$(RESTRICT_PERMS) + @echo "scheduleChecker made available to users...." + @if [ -d $(INTROOT)/user/bin ]; then cp -p $(INTROOT)/bin/scheduleChecker $(INTROOT)/user/bin/; fi; @echo " . . . installation done" diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 83e78db09..056ecb807 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -40,7 +40,7 @@ COMMON_CLIENTS:=AntennaBossTextClient ObservatoryTextClient \ SystemTerminal CaltoolClient CustomLoggingClient \ SchedulerTextClient -COMMON_MISC:=Plotter KStars Scripts getTemplateForTests PMUpdate InjectCommand +COMMON_MISC:=Plotter KStars Scripts getTemplateForTests PMUpdate InjectCommand UserTools COMMON_SIMULATORS:= TCPGenericProtocolSim ReceiverBoardSim -- GitLab