Added "make install" target

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@49 09dcff7a-b715-0410-9601-b79a96267cd0

4 files changed, 90 insertions, 0 deletions

diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am
index 659c8d1..b8b914a 100644
--- a/orkaudio/Makefile.am
+++ b/orkaudio/Makefile.am
@@ -16,3 +16,15 @@ INCLUDES = -I@top_srcdir@ -I../orkbasecxx
 SUBDIRS = audiocaptureplugins messages audiofile
 orkaudio_LDADD = $(top_builddir)/messages/libmessages.la \
 	$(top_builddir)/audiofile/libaudiofile.la 
+
+orkaudioconfdir = /etc/orkaudio
+orkaudioconf_DATA = \
+	logging-linux-template.properties \
+	config-linux-template.xml
+install-orkaudioconfDATA:
+	/bin/sh ./mkinstalldirs /etc/orkaudio
+	cp logging-linux-template.properties /etc/orkaudio/logging.properties
+	cp config-linux-template.xml /etc/orkaudio/config.xml
+	/bin/sh ./mkinstalldirs /var/log/orkaudio
+
+
diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp
index 75e1140..8a067d4 100644
--- a/orkaudio/OrkAudio.cpp
+++ b/orkaudio/OrkAudio.cpp
@@ -139,6 +139,7 @@ int main(int argc, char* argv[])
 	CStdString serviceName = StripFileExtension(serviceNameWithExtension);
 	if (serviceName.IsEmpty())
 	{
+		printf("Error: Could not determine service name.\n");
 		return -1;
 	}
 
diff --git a/orkaudio/config-linux-template.xml b/orkaudio/config-linux-template.xml
new file mode 100644
index 0000000..fee0c32
--- /dev/null
+++ b/orkaudio/config-linux-template.xml
@@ -0,0 +1,33 @@
+<config>
+<!-- This is an example configuration file for the Oreka orkaudio capture service on Linux -->
+<!-- Copy this to config.xml and modify according to taste -->
+
+	<AudioOutputPath>/var/log/orkaudio</AudioOutputPath>
+
+	<TrackerHostname>localhost</TrackerHostname>
+	<EnableReporting>true</EnableReporting>
+	<ClientTimeout>1000</ClientTimeout>
+
+	<!-- Use the following if oreka has been installed (having run "make install") -->
+	<CapturePluginPath>/usr/local/lib</CapturePluginPath>
+	<CapturePlugin>libvoip.so</CapturePlugin>
+	<!-- Use the following if you run oreka uninstalled (without having run "make install") -->
+	<!--<CapturePluginPath>audiocaptureplugins/voip/.libs</CapturePluginPath>-->
+	<!--<CapturePlugin>libvoip.so</CapturePlugin>-->
+
+	<StorageAudioFormat>gsm</StorageAudioFormat>
+	<NumBatchThreads></NumBatchThreads>
+	<DeleteNativeFile>no</DeleteNativeFile>
+	<AudioSegmentation>false</AudioSegmentation>
+	<AudioSegmentDuration>10</AudioSegmentDuration>
+	<VoIpPlugin>
+		<Device>eth0</Device>
+		<!--<LanMasks>10.4.3.4, 1.2.3.4</LanMasks>-->
+		<!--<MediaGateways>10.0.0.102</MediaGateways>-->
+	</VoIpPlugin>
+	<GeneratorPlugin>
+		<NumConcurrentPorts>1</NumConcurrentPorts>
+		<AudioDuration>5</AudioDuration>
+		<AudioFilename>sine.8KHz.pcm.wav</AudioFileName>
+	</GeneratorPlugin>
+</config>
diff --git a/orkaudio/logging-linux-template.properties b/orkaudio/logging-linux-template.properties
new file mode 100644
index 0000000..6c3cd42
--- /dev/null
+++ b/orkaudio/logging-linux-template.properties
@@ -0,0 +1,44 @@
+# This is an example configuration file for the Oreka orkaudio capture service logging for Linux -->
+# Copy this to logging.properties and modify according to needs -->
+
+# console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+
+# main logfile
+log4j.appender.A1=org.apache.log4j.RollingFileAppender
+log4j.appender.A1.File=/var/log/orkaudio/orkaudio.log
+log4j.appender.A1.MaxFileSize=5000KB
+log4j.appender.A1.MaxBackupIndex=2
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout 
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+
+# messages logfile
+log4j.appender.messages=org.apache.log4j.RollingFileAppender
+log4j.appender.messages.File=/var/log/orkaudio/messages.log
+log4j.appender.messages.MaxFileSize=5000KB
+log4j.appender.messages.MaxBackupIndex=2
+log4j.appender.messages.layout=org.apache.log4j.PatternLayout 
+log4j.appender.messages.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+
+#tapelist logfile
+log4j.appender.tapelist=org.apache.log4j.RollingFileAppender
+log4j.appender.tapelist.File=/var/log/orkaudio/tapelist.log
+log4j.appender.tapelist.MaxFileSize=5000KB
+log4j.appender.tapelist.MaxBackupIndex=2
+log4j.appender.tapelist.layout=org.apache.log4j.PatternLayout 
+log4j.appender.tapelist.layout.ConversionPattern=%m%n
+
+
+# Set root logger level to DEBUG
+log4j.rootLogger=INFO, A1, stdout
+log4j.logger.reporting=INFO, messages
+log4j.logger.tapelist=INFO, tapelist
+log4j.logger.rtpringbuffer=INFO
+log4j.logger.voip=INFO
+log4j.logger.rtpsessions=INFO
+log4j.logger.rtpsession=DEBUG
+log4j.logger.sipextraction=DEBUG
+log4j.logger.skinny=DEBUG