bugid:470

Now rpm installable.
Updated include paths.

.gitattributes

@@ -233,6 +233,7 @@ MAC/APL/Navigator/source/RCUplot1.gps -text svneol=native#application/octet-stre
 MAC/APL/Navigator/source/RCUplot2.gps -text svneol=native#application/octet-stream
 MAC/APL/Navigator/source/RCUplot3.gps -text svneol=native#application/octet-stream
 MAC/APL/Navigator/source/RCUplot4.gps -text svneol=native#application/octet-stream
+MAC/APL/PAC/BS_Protocol/package.doc -text
 MAC/APL/PAC/BeamServer/test/weights.dat -text svneol=unset#unset
 MAC/APL/PAC/CAL_Protocol/package.doc -text
 MAC/APL/PAC/_StationOperations/Makefile.am -text svneol=native#application/octet-stream

MAC/APL/PAC/BS_Protocol/BS_Protocol.spec.in

+# -*- Mode:rpm-spec -*-
+# BS_Protocol.spec.in
+#
+
+##############################################################################
+#
+# Preamble
+#
+##############################################################################
+
+Summary: BS_Protocol is ... brief description ...
+
+%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 = 1.2   ## define dependent packages here
+Packager: %{packager}
+Distribution: The LOFAR project
+Vendor: ASTRON
+
+AutoReqProv: no
+
+%description
+
+BS_Protocol ... more detailed description ...
+
+##############################################################################
+#
+# 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

MAC/APL/PAC/BS_Protocol/Makefile.am

+SUBDIRS=src test include
+
+DISTCHECK_CONFIGURE_FLAGS=\
+      --with-common=$(prefix)
+
+EXTRA_DIST = \
+      Makefile.common \
+      BS_Protocol.spec \
+      autoconf_share/compiletool
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/BS_Protocol/bootstrap

+#!/bin/sh
+
+../../../../autoconf_share/bootstrap ../../../../autoconf_share

MAC/APL/PAC/BS_Protocol/configure.in

+dnl
+dnl Process this file with autoconf to produce a configure script.
+dnl
+AC_INIT
+dnl AC_CONFIG_AUX_DIR(config)
+dnl AM_CONFIG_HEADER(config/config.h)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(BS_Protocol, 1.0, no-define)
+
+dnl Initialize for LOFAR (may set compilers)
+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
+dnl lofar_BLITZ
+dnl lofar_MPI
+lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Control.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, MAC-RTC-4_0, 1, APL/RTCCommon/Marshalling.h,,)
+lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
+
+dnl
+dnl Output Makefiles
+dnl
+AC_OUTPUT(
+include/Makefile
+include/APL/Makefile
+include/APL/BS_Protocol/Makefile
+src/Makefile
+test/Makefile
+Makefile
+BS_Protocol.spec
+)

MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Makefile.am

+
+INSTHDRS = \
+	Beamlet2SubbandMap.h \
+	Pointing.h
+
+apldir = $(includedir)/APL/BS_Protocol
+apl_HEADERS = $(INSTHDRS)
+
+NOINSTHDRS =
+
+TCCHDRS =
+
+nobase_pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS)
+
+noinst_HEADERS = $(NOINSTHDRS)
+
+DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/BS_Protocol/include/APL/Makefile.am

+SUBDIRS	= BS_Protocol
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/BS_Protocol/include/Makefile.am

+SUBDIRS	= APL
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/BS_Protocol/package.doc

+// \ingroup PAC
+// \defgroup BS_Protocol BS_Protocol Description

MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot

@@ -10,8 +10,8 @@ id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+10)";
 // specify extra include files
 // e.g.
 include = '<sys/time.h>';
-include = '"Beamlet2SubbandMap.h"';
-include = '"Pointing.h"';
+include = '<APL/BS_Protocol/Beamlet2SubbandMap.h>';
+include = '<APL/BS_Protocol/Pointing.h>';
 include = '<APL/RTCCommon/Timestamp.h>';
 
 prelude = << PRELUDE_END

MAC/APL/PAC/BS_Protocol/src/Beamlet2SubbandMap.cc

@@ -23,7 +23,7 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 
-#include "Beamlet2SubbandMap.h"
+#include <APL/BS_Protocol/Beamlet2SubbandMap.h>
 #include <APL/RTCCommon/Marshalling.h>
 
 using namespace LOFAR;

MAC/APL/PAC/BS_Protocol/src/Makefile.am

+# if HAVE_SHMEM
+# SUBDIRS = shmem .
+# endif
+
+AUTOGEN = autogen
+SUFFIXES = .ph
+%.ph: %.prot
+	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+%.cc: %.prot
+	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+
+BUILT_SOURCES = \
+	BS_Protocol.ph
+
+EXTRA_DIST = \
+	BS_Protocol.ph
+
+phdir=$(includedir)/APL/BS_Protocol
+ph_HEADERS = \
+	$(EXTRA_DIST)
+
+lib_LTLIBRARIES         = libbs_protocol.la
+
+libbs_protocol_la_SOURCES = \
+	BS_Protocol.cc \
+	Beamlet2SubbandMap.cc \
+	Pointing.cc
+
+# AM_YFLAGS               = -d -p KeyParse
+# AM_LFLAGS               = -PKeyTokenize
+# LEX_OUTPUT_ROOT         = lex.KeyTokenize
+
+# if HAVE_SHMEM
+# libbs_protocol_la_LIBADD     = shmem/libshmem.la
+# endif
+
+bin_PROGRAMS =
+
+# Lines to build a program prg
+#prg_SOURCES		= prg.cc
+#prg_LDADD		= libbs_protocol.la
+#prg_DEPENDENCIES	= libbs_protocol.la $(LOFAR_DEPEND)
+
+glishdir = $(libexecdir)/glish
+dist_glish_SCRIPTS = 
+
+pythondir = $(bindir)
+dist_python_SCRIPTS = 
+
+scriptdir = $(bindir)
+dist_script_SCRIPTS = 
+
+include $(top_srcdir)/Makefile.common

MAC/APL/PAC/BS_Protocol/src/Pointing.cc

@@ -23,7 +23,7 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 
-#include "Pointing.h"
+#include <APL/BS_Protocol/Pointing.h>
 
 using namespace LOFAR;
 using namespace BS_Protocol;

MAC/APL/PAC/BS_Protocol/test/Makefile.am

+check_PROGRAMS        =
+
+# programs to run through supplied checktools
+CHECKTOOLPROGS        =
+#ENDCHECKTOOLPROGS
+
+# scripts used to run tests
+TESTSCRIPTS           =
+
+# scripts and possible programs to run tests
+TESTS	              = $(TESTSCRIPTS)
+
+XFAIL_TESTS           =
+
+# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
+EXTRA_DIST            = $(TESTSCRIPTS)
+
+# Lines to build a test program testprg
+#testprg_SOURCES		= testprg.cc
+#testprg_LDADD			= ../src/libbs_protocol.la
+#testprg_DEPENDENCIES		= ../src/libbs_protocol.la $(LOFAR_DEPEND)
+
+TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
+				  srcdir=$(srcdir) \
+				  LOFARROOT=$(LOFARROOT) \
+				  LOFARDATAROOT=$(LOFARDATAROOT) \
+				  MPIBIN=$(MPIBIN)
+
+
+include $(top_srcdir)/Makefile.common