[Bacula-commits] SF.net SVN: bacula:[7946] trunk/bacula/src/win32/installer

[<jam...@us...>]

Revision: 7946
          http://bacula.svn.sourceforge.net/bacula/?rev=7946&view=rev
Author:   jamesharper
Date:     2008-10-30 09:18:41 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
Moved exchange-fd plugin install to fdplugins instead of bin.
Added "Plugin Directory" entry to the config file, commented out for now.

Modified Paths:
--------------
    trunk/bacula/src/win32/installer/bacula-fd.conf.in
    trunk/bacula/src/win32/installer/winbacula.nsi

Modified: trunk/bacula/src/win32/installer/bacula-fd.conf.in
===================================================================
--- trunk/bacula/src/win32/installer/bacula-fd.conf.in	2008-10-30 09:15:49 UTC (rev 7945)
+++ trunk/bacula/src/win32/installer/bacula-fd.conf.in	2008-10-30 09:18:41 UTC (rev 7946)
@@ -15,6 +15,7 @@
   FDport = @client_port@                # where we listen for the director
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@working_dir@"
+  #Plugin Directory = "@fdplugins_dir@"
   Maximum Concurrent Jobs = @client_maxjobs@
 }
 

Modified: trunk/bacula/src/win32/installer/winbacula.nsi
===================================================================
--- trunk/bacula/src/win32/installer/winbacula.nsi	2008-10-30 09:15:49 UTC (rev 7945)
+++ trunk/bacula/src/win32/installer/winbacula.nsi	2008-10-30 09:18:41 UTC (rev 7946)
@@ -449,6 +449,9 @@
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"
   FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
 
+  ${StrRep} $R2 "$INSTDIR\fdplugins" "\" "\\\\"
+  FileWrite $R1 's;@fdplugins_dir@;$R2;g$\r$\n'
+
   ${StrRep} $R2 "$INSTDIR" "\" "/"
   FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"
 
@@ -561,10 +564,12 @@
 Section "File Service" SecFileDaemon
   SectionIn 1 2 3
 
+  SetOutPath "$INSTDIR\fdplugins"
+  File "${SRC_DIR}\exchange-fd.dll"
+
   SetOutPath "$INSTDIR\bin"
 
   File "${SRC_DIR}\bacula-fd.exe"
-  File "${SRC_DIR}\exchange-fd.dll"
 
   ${If} $InstallType = ${MigrateInstall}
   ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.