cdp-client: Add exe to installers. Modify tools makefile.

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 5df37a40e0bbdec9109c1e17bd29dd1f6042bbab..99af1100227efb77a1b41b472c997bbff60543aa 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -21,19 +21,19 @@ WIN64_DIRS=lib filed filed/plugins console scripts stored
 ifeq ($(win64),yes)
         DIRS=$(WIN64_DIRS)
         INSTALLER=win64_installer
-        SPECIAL=bat64 bsmtp
+        SPECIAL=bat64 bsmtp tools
 else
         DIRS=$(WIN32_DIRS)
         INSTALLER=win32_installer
-        SPECIAL=bat32 bsmtp
+        SPECIAL=bat32 bsmtp tools
 endif
 
 ifeq ($(bat),no)
-        SPECIAL=bsmtp
+        SPECIAL=bsmtp tools
 endif  
 
 .PHONY: $(DIRS) clean all Makefile.inc win32_installer full_win32_installer \
-        win64_installer bsmtp distclean
+        win64_installer bsmtp tools distclean
 
 all: Makefile.inc $(DIRS) $(SPECIAL) $(INSTALLER)
 
@@ -122,7 +122,14 @@ bsmtp:
           fi ; \
        fi
 
-
+tools:
+       @if test -f Makefile.inc; then \
+          if $(MAKE) -C tools all $(MAKECMDGOALS); then \
+               echo "\n===== Make of tools/all succeeded =====\n\n" ; \
+          else  \
+               echo "\n!!!!! Make of tools/all failed !!!!!\n\n" ; exit 1; \
+          fi ; \
+       fi
 
 Makefile.inc:
        @echo Creating $@

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index b83bb3e242d4816a6362c06d2636e307cbaa3c17..3493d10e3f3c555b7f3143df5d8d40654b6f1329 100644 (file)
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -30,6 +30,8 @@ BACULABINARIES := \
        bacula.dll \
        alldrives-fd.dll \
        exchange-fd.dll \
+       cdp-fd.dll \
+       cdp-client.exe \
        bacula-fd.exe \
        bconsole.exe \
        bsleep.exe \

diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 82d33a5e9de6d825e06137c5b359b9bfb5e061c8..3e71acdfb0c9b0f6a431d10aa12638730134abef 100644 (file)
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -664,20 +664,11 @@ SectionGroup "Documentation" SecGroupDocumentation
 Section "Documentation (Acrobat Format)" SecDocPdf
   SectionIn 1 2 3
 
-  SetOutPath "$INSTDIR\doc"
-  CreateDirectory "$INSTDIR\doc"
-
-  File "${SRC_DIR}\docs\manuals\en\console\console.pdf"
-  File "${SRC_DIR}\docs\manuals\en\misc\misc.pdf"
-  File "${SRC_DIR}\docs\manuals\en\main\main.pdf"
-  File "${SRC_DIR}\docs\manuals\en\utility\utility.pdf"
-  File "${SRC_DIR}\docs\manuals\en\problems\problems.pdf"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Console.lnk" '"$INSTDIR\doc\console.pdf"'
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Main.lnk" '"$INSTDIR\doc\main.pdf"'
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Misc.lnk" '"$INSTDIR\doc\misc.pdf"'
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Utility.lnk" '"$INSTDIR\doc\utility.pdf"'
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Problems.lnk" '"$INSTDIR\doc\problems.pdf"'
+  SetOutPath "$INSTDIR\plugins"
+  File "${SRC_DIR}\cdp-fd.dll"
   SetOutPath "$INSTDIR"
+  File "${SRC_DIR}\cdp-client.exe"
+  
 SectionEnd
 
 ;Section "Documentation (HTML Format)" SecDocHtml
@@ -739,8 +730,8 @@ LangString DESC_SecConsole ${LANG_ENGLISH} "Install bconsole program on this sys
 LangString DESC_SecBatConsole ${LANG_ENGLISH} "Install Bat graphical console program on this system."
 LangString DESC_SecTrayMonitor ${LANG_ENGLISH} "Install Tray Monitor graphical program on this system."
 LangString DESC_SecAllDrivesPlugin ${LANG_ENGLISH} "Install alldrives Plugin on this system."
-; LangString DESC_SecWinBMRPlugin ${LANG_ENGLISH} "Install winbmr Plugin on this system."
-LangString DESC_SecOldExchangePlugin ${LANG_ENGLISH} "Install old (deprecated) Exchange Plugin on this system."
+LangString DESC_SecWinBMRPlugin ${LANG_ENGLISH} "Install winbmr Plugin on this system."
+LangString DESC_SecCDPPlugin ${LANG_ENGLISH} "Install CDP Plugin and CDP client on this system."
 
 
 LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
@@ -810,8 +801,8 @@ Section "Uninstall"
   Delete /REBOOTOK "$INSTDIR\*.sql"
   Delete /REBOOTOK "$INSTDIR\help\*"
   Delete /REBOOTOK "$INSTDIR\plugins\alldrives-fd.dll"
-  Delete /REBOOTOK "$INSTDIR\plugins\exchange-fd.dll"
-;  Delete /REBOOTOK "$INSTDIR\plugins\winbmr-fd.dll"
+  Delete /REBOOTOK "$INSTDIR\plugins\cdp-fd.dll"
+  Delete /REBOOTOK "$INSTDIR\cdp-client.exe"
 
   ; Check for existing installation
   IfSilent +2

diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index a1d728e2c8d6be308d3cc31f65e514e4cd3917ba..abf6278d27b2d952567e865014c906db08709c97 100644 (file)
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -29,6 +29,8 @@ BACULABINARIES := \
        bacula.dll \
        alldrives-fd.dll \
        exchange-fd.dll \
+       cdp-fd.dll \
+       cdp-client.exe \
        bsleep.exe \
        bsmtp.exe \
        bconsole.exe \

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index fd82c831515279f2654226d34bd1626bd779f4ec..b0618198156a85a3691f36a419a68aa42a081b47 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -680,6 +680,7 @@ Section "Old (deprecated) Exchange Plugin" SecOldExchangePlugin
   SetOutPath "$INSTDIR\plugins"
   File "${SRC_DIR}\exchange-fd.dll"
   SetOutPath "$INSTDIR"
+  File "${SRC_DIR}\cdp-client.exe"
 
 SectionEnd
 
@@ -731,6 +732,7 @@ LangString DESC_SecBatConsole ${LANG_ENGLISH} "Install Bat graphical console pro
 LangString DESC_SecTrayMonitor ${LANG_ENGLISH} "Install Tray Monitor graphical program on this system."
 LangString DESC_SecAllDrivesPlugin ${LANG_ENGLISH} "Install alldrives Plugin on this system."
 LangString DESC_SecOldExchangePlugin ${LANG_ENGLISH} "Install old (deprecated) Exchange Plugin on this system."
+LangString DESC_SecCDPPlugin ${LANG_ENGLISH} "Install CDP Plugin and CDP client on this system."
 
 LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
 LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
@@ -752,6 +754,7 @@ LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create a resource template f
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecTrayMonitor} $(DESC_SecTrayMonitor)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecAllDrivesPlugin} $(DESC_SecAllDrivesPlugin)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecOldExchangePlugin} $(DESC_SecOldExchangePlugin)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecCDPPlugin} $(DESC_SecCDPPlugin)
 !InsertMacro MUI_FUNCTION_DESCRIPTION_END
 
 ; Uninstall section
@@ -803,6 +806,8 @@ Section "Uninstall"
   Delete /REBOOTOK "$INSTDIR\*.dll"
   Delete /REBOOTOK "$INSTDIR\plugins\alldrives-fd.dll"
   Delete /REBOOTOK "$INSTDIR\plugins\exchange-fd.dll"
+  Delete /REBOOTOK "$INSTDIR\plugins\cdp-fd.dll"
+  Delete /REBOOTOK "$INSTDIR\cdp-client.exe"
 
   ; Check for existing installation
   MessageBox MB_YESNO|MB_ICONQUESTION \