bareos: bareos-12.4 57827b41

Diff Back to Repository
Author Committer Branch Timestamp Parent
pstorz pstorz bareos-12.4 2015-11-18 10:08 bareos-12.4 dcd29ba3 Pending
Changeset adapt windows nsi to old status and new buildchain

In 12.4, we dit not have mssqlvdi.dll nor libfastlz.
Also, we now use libpng16 instead of 15
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
index e900021..0b0ca3e 100644
--- a/platforms/win32/winbareos-nsi.spec
+++ b/platforms/win32/winbareos-nsi.spec
@@ -83,7 +83,6 @@ for file in \
    bareos-tray-monitor.exe \
    bat.exe \
    bpipe-fd.dll \
- mssqlvdi-fd.dll \
    libbareos.dll \
    libbareosfind.dll \
    libcrypto-*.dll \
@@ -98,8 +97,7 @@ for file in \
    QtCore4.dll \
    QtGui4.dll \
    liblzo2-2.dll \
- libfastlz.dll \
- libpng15-15.dll \
+ libpng16-16.dll \
    openssl.exe \
    sed.exe;\
    do
diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi
index 4c10364..d7551eb 100644
--- a/platforms/win32/winbareos.nsi
+++ b/platforms/win32/winbareos.nsi
@@ -402,7 +402,7 @@ SectionIn 1 2
   CreateShortCut "$SMSTARTUP\bareos-tray-monitor.lnk" "$INSTDIR\bareos-tray-monitor.exe" '-c "$APPDATA\${PRODUCT_NAME}\tray-monitor.conf"'

   File "bareos-tray-monitor.exe"
- File "libpng15-15.dll"
+ File "libpng16-16.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"

@@ -418,7 +418,7 @@ SectionIn 2
   CreateShortCut "$DESKTOP\BAT.lnk" "$INSTDIR\bat.exe" '-c "$APPDATA\${PRODUCT_NAME}\bat.conf"'

   File "bat.exe"
- File "libpng15-15.dll"
+ File "libpng16-16.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"

@@ -963,7 +963,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\QtGui4.dll"
   Delete "$INSTDIR\liblzo2-2.dll"
- Delete "$INSTDIR\libpng15-15.dll"
+ Delete "$INSTDIR\libpng16-16.dll"
   Delete "$INSTDIR\openssl.exe"
   Delete "$INSTDIR\sed.exe"
mod - platforms/win32/winbareos-nsi.spec Diff File
mod - platforms/win32/winbareos.nsi Diff File