Skip to content
Snippets Groups Projects
Commit 141b4327 authored by Marcel Loose's avatar Marcel Loose :sunglasses:
Browse files

Bug 1294: 

* Moved LCS/ACC/ACCbin/src  to MAC/APL/CEPCU/src/ApplController
* Moved LCS/ACC/ACCbin/test to MAC/APL/CEPCU/test/ApplController
* Updated configure.in and Makefile.am; needs further testing on a system with
  PVSS installed (e.g., rs002).
parent 009bc0e1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 280 deletions
.gitattributes
+ 1
− 2
View file @ 141b4327
......@@ -278,8 +278,6 @@ JAVA/LofarUtils/src/com/toedter/components/images/JSpinFieldMono16.gif -text
JAVA/LofarUtils/src/com/toedter/components/images/JSpinFieldMono32.gif -text
JAVA/MAC/jRSP/.cvsignore -text
JAVA/MAC/jRSP/nbproject/.cvsignore -text
LCS/ACC/ACCbin/CMakeLists.txt -text
LCS/ACC/ACCbin/src/CMakeLists.txt -text
LCS/ACC/CMakeLists.txt -text
LCS/AMC/AMCImpl/src/AMCServer.cc -text
LCS/AMC/amc_main_classes.png -text
......@@ -306,6 +304,7 @@ MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream
MAC/APL/APLCommon/configure.in -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text
MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.log_prop -text
MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.conf -text
MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.log_prop -text
......
.gitignore
+ 0
− 3
View file @ 141b4327
......@@ -74,9 +74,6 @@ JAVA/MAC/jRSP/Makefile.common
JAVA/MAC/jRSP/autoconf_share
JAVA/MAC/jRSP/lofarconf
JAVA/MAC/jRSP/nbproject/private
LCS/ACC/ACCbin/Makefile.common
LCS/ACC/ACCbin/autoconf_share
LCS/ACC/ACCbin/lofarconf
LCS/ACC/ALC/Makefile.common
LCS/ACC/ALC/autoconf_share
LCS/ACC/ALC/lofarconf
......
LCS/ACC/ACCbin/ACCbin.spec.in deleted 100644 → 0
+ 0
− 166
View file @ 009bc0e1
# -*- Mode:rpm-spec -*-
# ACCbin.spec.in
#
##############################################################################
#
# Preamble
#
##############################################################################
Summary: ACCbin contains the controller and daemon of ACC.
%define release @RPM_RELEASE@
%define version @VERSION@
%define pkgname @PACKAGE@
%define pkgdir %{pkgname}-%{version}-%{release}
%define prefix /opt/lofar
%define configure_args @RPM_CONFIGURE_ARGS@
##define build_kernel_version @BUILD_KERNEL_VERSION@
Name: %{pkgname}
Version: %{version}
Release: %{release}
Copyright: LGPL
Group: Application/System
Source: %{pkgname}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{pkgdir}-root
URL: http://www.astron.nl
Prefix: %{prefix}
BuildArchitectures: i386 # Target platforms, i.e., i586
#Requires: Common >= 3.0
#Requires: Transport >= 2.3
#Requires: APS >= 2.1
#Requires: ALC >= 2.1
#Requires: PLC >= 2.1
Packager: %{packager}
Distribution: The LOFAR project
Vendor: ASTRON
AutoReqProv: no
%description
ACCbin contains two executables: the ACC daemon that manages the administration
and lifecycle of the ACC controllers, and secondly the ACCcontroller that is
the executable the ACC processes and the ACC user connect to.
##############################################################################
#
# prep
#
##############################################################################
%prep
echo $prefix
# create the build directory, untar the source
%setup
##############################################################################
#
# build
#
##############################################################################
%build
./configure %{configure_args} --prefix=%{prefix} && make
##############################################################################
#
# install
#
##############################################################################
%install
# To make things work with BUILDROOT
if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
then
echo
echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
echo @ @
echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
echo @ @
echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
echo
else
echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
rm -rf "$RPM_BUILD_ROOT"
fi
mkdir -p $RPM_BUILD_ROOT%{prefix}
make DESTDIR="$RPM_BUILD_ROOT" install
#uninstall
##############################################################################
#
# verify
#
##############################################################################
#verify
##############################################################################
#
# clean
#
##############################################################################
%clean
# Call me paranoid, but I do not want to be responsible for nuking
# someone's harddrive!
if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
then
echo
echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
echo @ @
echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
echo @ @
echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
echo
else
echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
rm -rf "$RPM_BUILD_ROOT"
fi
##############################################################################
#
# files
#
##############################################################################
# empty 'files' means all distributed files
%files
%defattr(-, root, root)
%{prefix}
# Your application file list goes here
# %{prefix}/lib/lib*.so*
# Documentation
# doc COPYING ChangeLog README AUTHORS NEWS
# doc doc/*
# link the module to the correct path
%post
# before uninstall
%preun
# after uninstall
%postun
##############################################################################
#
# package devel
#
##############################################################################
#package devel
#Summary: Development files for %{pkgname}
#Group: Applications/System
#description devel
#Development files for %{pkgname}.
#files devel
# Your development files go here
# Programmers documentation goes here
#doc doc
# end of file
LCS/ACC/ACCbin/CMakeLists.txt deleted 100644 → 0
+ 0
− 6
View file @ 009bc0e1
## ------------------------------------------------------------------------------
## Directories to be included in the build
add_subdirectory (src)
add_subdirectory (test)
LCS/ACC/ACCbin/Makefile.am deleted 100644 → 0
+ 0
− 20
View file @ 009bc0e1
SUBDIRS=src test
ACLOCAL_AMFLAGS = -I $(top_srcdir)/autoconf_share
pkgextdir = $(prefix)/config/$(PACKAGE)
pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix) \
--with-transport=$(prefix) \
--with-aps=$(prefix) \
--with-alc=$(prefix) \
--with-plc=$(prefix)
EXTRA_DIST = \
Makefile.common \
ACCbin.spec \
autoconf_share/compiletool
include $(top_srcdir)/Makefile.common
LCS/ACC/ACCbin/bootstrap deleted 100755 → 0
+ 0
− 3
View file @ 009bc0e1
#!/bin/sh
../../../autoconf_share/bootstrap ../../../autoconf_share
LCS/ACC/ACCbin/configure.in deleted 100644 → 0
+ 0
− 71
View file @ 009bc0e1
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
AC_INIT
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ACC, 2.1, no-define)
dnl
dnl Initialize for LOFAR (may set compilers)
dnl
lofar_INIT
dnl Checks for programs.
AC_PROG_AWK
AC_PROG_YACC
AC_PROG_CC
AC_PROG_CXX
AM_PROG_LEX
AC_PROG_INSTALL
AC_PROG_LN_S
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
dnl Checks for libraries.
dnl dnl Replace `main' with a function in -lfl:
dnl AC_CHECK_LIB(fl, main)
dnl dnl Replace `main' with a function in -lcosev_r:
dnl AC_CHECK_LIB(cosev_r, main)
dnl dnl Replace `main' with a function in -lcosnm_r:
dnl AC_CHECK_LIB(cosnm_r, main)
dnl dnl Replace `main' with a function in -lorb_r:
dnl AC_CHECK_LIB(orb_r, main)
dnl dnl Replace `main' with a function in -lpthread:
dnl AC_CHECK_LIB(pthread, main)
dnl dnl Replace `main' with a function in -lvport_r:
dnl AC_CHECK_LIB(vport_r, main)
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
dnl Checks for library functions.
AC_FUNC_VPRINTF
dnl
dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_INTERNAL(LCS/ACC/ALC,ALC,,1,ALC/ApplControl.h,,)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO,,1,MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
dnl Note: only the test programs depend on the tribool functionality
lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,"")
dnl
dnl Output Makefiles
dnl
AC_OUTPUT(
Makefile
src/Makefile
test/Makefile
ACCbin.spec
)
LCS/ACC/ACCbin/package.dox deleted 100644 → 0
+ 0
− 8
View file @ 009bc0e1
//
//
// \ingroup ACC
// \defgroup ACCbin Executables of ACC (ACCbin)
//
// Contains the programs ACDaemon and ApplController
//
MAC/APL/CEPCU/configure.in
+ 1
− 1
View file @ 141b4327
......@@ -74,7 +74,7 @@ dnl Output Makefiles
dnl
AC_OUTPUT(
src/Makefile
dnl src/ACCControl/Makefile
src/ApplController/Makefile
src/OnlineControl/Makefile
dnl src/OfflineControl/Makefile
Makefile
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment