orkaudio installer NSIS script improvements.

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

2 files changed, 19 insertions, 68 deletions

diff --git a/distribution/orkaudio-win32-binary/README.txt b/distribution/orkaudio-win32-binary/README.txt
index 90f31e3..10a40dd 100644
--- a/distribution/orkaudio-win32-binary/README.txt
+++ b/distribution/orkaudio-win32-binary/README.txt
@@ -4,63 +4,8 @@ Welcome to Oreka, an open media capture and retrieval platform
 Copyright (C) 2005, orecx LLC	http://www.orecx.com
 
 This program is free software, distributed under the terms of
-the GNU General Public License.
-
-This package is a binary distribution of the oreka audio recording service. Source code and documentation can be found at http://sourceforge.net/projects/oreka/
-
---------
-Features
-
-* VoIP recording capability by sniffing on a network device (default configuration)
-* Works as well on a dedicated server for LAN-wide recording as on an individual PC for personal VoIP recording
-* Audio device recording (by default, records all devices in the system) using the Sound Device plugin
-* Generates calls details records with local party, remote party and call direction.
-
-The VoIP plugin supports the following protocols:
-	- Bidirectional SIP sessions recording with SIP metadata extraction
-	- Bidirectional Cisco skinny (aka SCCP) session recording with Skinny metadata extraction
-	- Bidirectional Raw RTP session recording with limited metadata extraction (when SIP and Skinny both fail - e.g for H.323)
-
---------------
-Capturing from the right network device
-
-If the software does not seem to produce any audio output, you might be monitoring from the wrong network device. Go to Start/Programs/Orkaudio/Orkaudio Logfile and try to locate lines similar to the following:
-
-....
-2005-11-19 11:13:04,638  INFO packet:479 - Available pcap devices:
-2005-11-19 11:13:04,638  INFO packet:483 - 	* Realtek RTL8139/810x Family Fast Ethernet NIC                                    (Microsoft's Packet Scheduler)  \Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}
-2005-11-19 11:13:04,638  INFO packet:483 - 	* Intel(R) PRO/Wireless 2200BG Network Connection (Microsoft's Packet Scheduler)  \Device\NPF_{2FEDB9F0-F584-48A8-B164-117965F80986}
-....
-
-Pick the device you want to monitor, e.g. in this case the wireless connection, copy the Windows device name in the clipboard and paste this into the orkaudio configuration file (config.xml) so that it looks like the following:
-
-....
-<Device>\Device\NPF_{2FEDB9F0-F584-48A8-B164-117965F80986}</Device>
-....
-
---------------
-Where to tap ?
-
-* If you record from a single PC, no need to worry, just install the software
-* For VoIP recording on an entire LAN, you need to tap an ethernet link carrying all 
-the voice traffic you want to monitor. There are three methods:
-1. Ehternet tap
-2. Ethernet Hub
-3. Switch SPAN port
-For more info on those options, see:
-http://www.snort.org/docs and more specifically:
-http://www.snort.org/docs/iss-placement.pdf
-
-----------------
-How to configure
-
-* General configuration is found in config.xml
-* Logging configuration is found in logging.properties 
-
--------------------------------------------------
-Where to find generated "tapes" and "tape detail records"
-
-* Point the windows file explorer to the OrkAudio install directory. Files are stored in subdirectories using the following path scheme:  YYYY\MM\DD\HH\
-
-* "tape details records" can be found in tapelist.log
+the GNU General Public License. See http://www.gnu.org/licenses/gpl.html.
 
+This package is a binary distribution of the oreka audio recording service. Source code and documentation can be found at 
+http://www.oreka.org
+http://sourceforge.net/projects/oreka/
diff --git a/distribution/orkaudio-win32-binary/orkaudio.nsi b/distribution/orkaudio-win32-binary/orkaudio.nsi
index 6f8779c..935c7af 100644
--- a/distribution/orkaudio-win32-binary/orkaudio.nsi
+++ b/distribution/orkaudio-win32-binary/orkaudio.nsi
@@ -1,6 +1,8 @@
 ; orkaudio.nsi
 ;--------------------------------
 
+!include "MUI2.nsh"
+
 ; The name of the installer
 Name "Orkaudio"
 
@@ -20,6 +22,7 @@ InstallDirRegKey HKLM "Software\Orkaudio" "Install_Dir"
 
 ; Pages
 
+!insertmacro MUI_PAGE_LICENSE ..\..\LICENSE.txt
 Page components
 Page directory
 Page instfiles
@@ -49,7 +52,7 @@ file "logging.properties"
 file "OrkBase.dll"
 file "orkaudio.log"
 file "tapelist.log"
-file "WinPcap_3_1.exe"
+file "WinPcap_4_0_2.exe"
 file "LICENSE.txt"
 file "README.txt"
 file "VERSION.txt"
@@ -76,11 +79,12 @@ file "xerces-c-version.incl"
 file "xerces-c_2_6.dll"
 
   SetOutPath $INSTDIR\audiocaptureplugins
-file "audiocaptureplugins\Generator.dll"
-file "audiocaptureplugins\SoundDevice.dll"
 file "audiocaptureplugins\VoIp.dll"  
+
+  SetOutPath $INSTDIR\plugins
+file "plugins\RtpMixer.dll"  
   
-  SetOutPath $INSTDIR\AudioRecordings
+  SetOutPath c:\oreka\audio  
   
   nsSCM::Install orkaudio orkaudio 16 2 "$INSTDIR\orkaudio.exe" "" "" "" ""
   Pop $0
@@ -104,7 +108,7 @@ SectionEnd
 Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Orkaudio"
-  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Recordings.lnk" "$INSTDIR\AudioRecordings" "" "$INSTDIR\AudioRecordings" 0
+  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Recordings.lnk" "c:\oreka\audio" "" "c:\oreka\audio" 0
   CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Recordings List.lnk" "$INSTDIR\tapelist.log" "" "$INSTDIR\tapelist.log" 0  
   CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Logfile.lnk" "$INSTDIR\orkaudio.log" "" "$INSTDIR\orkaudio.log" 0  
   CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Install Directory.lnk" "$INSTDIR\" "" "$INSTDIR\" 0
@@ -112,8 +116,8 @@ Section "Start Menu Shortcuts"
   
 SectionEnd
 
-Section "Install WinPcap 3.1"
-	ExecWait "$INSTDIR\WinPcap_3_1.exe"
+Section "Install WinPcap 4.0.2"
+	ExecWait "$INSTDIR\WinPcap_4_0_2.exe"
 SectionEnd
 
 Section "Run orkaudio NT service"
@@ -134,7 +138,7 @@ Section "Uninstall"
   nsSCM::Stop orkaudio
   Pop $0
   StrCmp $0 "success" stopOk  
-	MessageBox MB_OK "Orkaudio NT Service stop failed"
+	MessageBox MB_OK "Could not stop Orkaudio NT Service, maybe it was not running?"
   stopOk:
   ; wait for the service to stop
   sleep 4000
@@ -142,7 +146,7 @@ Section "Uninstall"
   nsSCM::Remove orkaudio
   Pop $0
   StrCmp $0 "success" uninstallOk  
-	MessageBox MB_OK "Orkaudio NT Service uninstallation failed - service has probably been removed earlier"
+	MessageBox MB_OK "Orkaudio NT Service uninstallation failed - OrkAudio NT service has probably been removed earlier"
   uninstallOk:
   
   ; Remove registry keys
@@ -152,6 +156,8 @@ Section "Uninstall"
   ; Remove files
   Delete "$INSTDIR\audiocaptureplugins\*.*"  
   RMDir "$INSTDIR\audiocaptureplugins"
+  Delete "$INSTDIR\plugins\*.*"  
+  RMDir "$INSTDIR\plugins"
   Delete "$INSTDIR\*.*"
   RMDir "$INSTDIR"