Add the new mssqlvdi plugin to the windows installer.

Fixes #199: Plugin to do backup of Microsoft Sql Server (mssql) server
bareos · Feb 17, 2015 · 8ca972e · 8ca972e
1 parent c615e72
commit 8ca972e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
@@ -67,7 +67,7 @@ mkdir  $RPM_BUILD_ROOT/release64
 
 for file in \
       bareos-tray-monitor.exe bat.exe bareos-fd.exe bconsole.exe \
-      bpipe-fd.dll libbareos.dll libbareosfind.dll \
+      bpipe-fd.dll mssqlvdi-fd.dll libbareos.dll libbareosfind.dll \
       libcrypto-8.dll libgcc_s_*-1.dll libhistory6.dll \
       libreadline6.dll libssl-8.dll libstdc++-6.dll \
       libtermcap-0.dll pthreadGCE2.dll zlib1.dll \

diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi
@@ -371,12 +371,13 @@ SectionIn 1 2 3
 SectionEnd
 
 Section /o "Bareos FileDaemon Plugins " SEC_PLUGINS
-SectionIn 1 2
+SectionIn 1 2 3
 
   SetShellVarContext all
   SetOutPath "$INSTDIR\Plugins"
   SetOverwrite ifnewer
   File "bpipe-fd.dll"
+  File "mssqlvdi-fd.dll"
 SectionEnd
 
 Section /o "Text Console (bconsole)" SEC_BCONSOLE
@@ -928,6 +929,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\bareos-fd.exe"
   Delete "$INSTDIR\bconsole.exe"
   Delete "$INSTDIR\Plugins\bpipe-fd.dll"
+  Delete "$INSTDIR\Plugins\mssqlvdi-fd.dll"
   Delete "$INSTDIR\libbareos.dll"
   Delete "$INSTDIR\libbareosfind.dll"
   Delete "$INSTDIR\libcrypto-8.dll"

diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -22,6 +22,7 @@ BuildArch:      noarch
 
 Source1:       fillup.sed
 Source2:       vss_headers.tar
+Source3:       vdi_headers.tar
 
 Patch1:        tray-monitor-conf.patch
 
@@ -80,17 +81,12 @@ bareos
 %patch1 -p1
 
 tar xvf %SOURCE2
+tar xvf %SOURCE3
 
 %build
 
 cd src/win32/
-
-
-make BUILD_QTGUI=yes %{?jobs:-j%jobs}
-#make  %{?jobs:-j%jobs}
-
-#make BUILD_QTGUI=yes WIN_VERSION=64  %{?jobs:-j%jobs}
-
+make BUILD_QTGUI=yes WIN_VERSION=32 WIN_VISTACOMPAT=yes %{?jobs:-j%jobs}
 
 %install
 
@@ -105,6 +101,7 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    filed/bareos-fd.exe lib/libbareos.dll \
    findlib/libbareosfind.dll \
    plugins/filed/bpipe-fd.dll \
+   plugins/filed/mssqlvdi-fd.dll \
    $RPM_BUILD_ROOT%{_mingw32_bindir}
 
 for cfg in  ../qt-tray-monitor/tray-monitor.conf.in \

diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
@@ -22,6 +22,7 @@ BuildArch:      noarch
 
 Source1:       fillup.sed
 Source2:       vss_headers.tar
+Source3:       vdi_headers.tar
 
 Patch1:        tray-monitor-conf.patch
 
@@ -80,17 +81,12 @@ bareos
 %patch1 -p1
 
 tar xvf %SOURCE2
+tar xvf %SOURCE3
 
 %build
 
 cd src/win32/
-
-
-make BUILD_QTGUI=yes WIN_VERSION=64  %{?jobs:-j%jobs}
-#make  %{?jobs:-j%jobs}
-
-#make BUILD_QTGUI=yes WIN_VERSION=64  %{?jobs:-j%jobs}
-
+make BUILD_QTGUI=yes WIN_VERSION=64 VISTACOMPAT=yes %{?jobs:-j%jobs}
 
 %install
 
@@ -105,6 +101,7 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    filed/bareos-fd.exe lib/libbareos.dll \
    findlib/libbareosfind.dll \
    plugins/filed/bpipe-fd.dll \
+   plugins/filed/mssqlvdi-fd.dll \
    $RPM_BUILD_ROOT%{_mingw64_bindir}
 
 for cfg in  ../qt-tray-monitor/tray-monitor.conf.in \