Enable build of Windows 64 bit tray monitor

diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
index 30cacd53d175434ffd987d5c66a35afa4181c59f..5ffc16c48632155d279f7793d9c0c3adb6f90596 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw32.in
@@ -8,7 +8,7 @@
 #    
 # CONFIG options for Windows are pulled from win32/qmake.conf
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2018 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 
@@ -18,7 +18,7 @@ CONFIG += qt cross-win32
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 cross-win32 {
-  LIBS       +=  -mwindows -L../../win32/release32 -lbacula -lpthread
+  LIBS       +=  ../../win32/lib/obj32/ini.o -mwindows -L../../win32/release32 -lbacula -lpthread
   INCLUDEPATH += ../../win32/compat
 }
 !cross-win32 {
@@ -60,8 +60,8 @@ QMAKE_LIB               = i686-w64-mingw32-ar -ru
 QMAKE_RC                = i686-w64-mingw32-windres
 
 # Main directory
-HEADERS += tray-monitor.h tray_conf.h tray-ui.h fdstatus.h task.h ../util/fmtwidgetitem.h dirstatus.h conf.h sdstatus.h runjob.h status.h restorewizard.h filesmodel.h clientselectwizardpage.h jobselectwizardpage.h fileselectwizardpage.h restoreoptionswizardpage.h
-SOURCES +=  tray-monitor.cpp tray_conf.cpp fdstatus.cpp task.cpp authenticate.cpp ../util/fmtwidgetitem.cpp dirstatus.cpp sdstatus.cpp conf.cpp runjob.cpp status.cpp restorewizard.cpp clientselectwizardpage.cpp jobselectwizardpage.cpp fileselectwizardpage.cpp restoreoptionswizardpage.cpp
-FORMS += fd-monitor.ui dir-monitor.ui sd-monitor.ui main-conf.ui res-conf.ui run.ui restorewizard.ui clientselectwizardpage.ui jobselectwizardpage.ui fileselectwizardpage.ui restoreoptionswizardpage.ui
+HEADERS += tray-monitor.h tray_conf.h tray-ui.h fdstatus.h task.h ../util/fmtwidgetitem.h dirstatus.h conf.h sdstatus.h runjob.h status.h restorewizard.h filesmodel.h clientselectwizardpage.h jobselectwizardpage.h fileselectwizardpage.h restoreoptionswizardpage.h pluginwizardpage.h
+SOURCES +=  tray-monitor.cpp tray_conf.cpp fdstatus.cpp task.cpp authenticate.cpp ../util/fmtwidgetitem.cpp dirstatus.cpp sdstatus.cpp conf.cpp runjob.cpp status.cpp restorewizard.cpp clientselectwizardpage.cpp jobselectwizardpage.cpp fileselectwizardpage.cpp restoreoptionswizardpage.cpp pluginwizardpage.cpp
+FORMS += fd-monitor.ui dir-monitor.ui sd-monitor.ui main-conf.ui res-conf.ui run.ui restorewizard.ui clientselectwizardpage.ui jobselectwizardpage.ui fileselectwizardpage.ui restoreoptionswizardpage.ui pluginwizardpage.ui
 
 TRANSLATIONS += ts/tm_fr.ts ts/tm_de.ts ts/tm_ja.ts

diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw64.in b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw64.in
index 92cb9e114b17bd3f879f5586cf759cb6861ab70d..096dac3a92b9cb6bfcd20bf42ac960c3a82cbcea 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw64.in
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.mingw64.in
@@ -1,21 +1,7 @@
-/*
-   Bacula(R) - The Network Backup Solution
-
-   Copyright (C) 2000-2018 Kern Sibbald
-
-   The original author of Bacula is Kern Sibbald, with contributions
-   from many others, a complete list can be found in the file AUTHORS.
-
-   You may use this file and others of this release according to the
-   license defined in the LICENSE file, which includes the Affero General
-   Public License, v3.0 ("AGPLv3") and some additional permissions and
-   terms pursuant to its AGPLv3 Section 7.
-
-   This notice must be preserved when any source code is
-   conveyed and/or propagated.
-
-   Bacula(R) is a registered trademark of Kern Sibbald.
-*/
+#
+# Copyright (C) 2000-2018 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 ######################################################################
 #
 #  !!!!!!! IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index f374cbf137ca006dc538ee8c13fa6ecfaf2cf532..5b8d09708c1ace955d34a6ca0ac9987505bb4ed9 100644 (file)
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -41,7 +41,7 @@ ifeq ($(bat),no)
        BACULA_BINARIES=$(BACULABINARIES)
        HELP=
 else
-       BACULA_BINARIES=$(BACULABINARIES) bat.exe #bacula-tray-monitor.exe
+       BACULA_BINARIES=$(BACULABINARIES) bat.exe bacula-tray-monitor.exe
        HELP=help
 endif
 

diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 2d112f3db088dca87c6afd510294aa0866e3e6ff..82d33a5e9de6d825e06137c5b359b9bfb5e061c8 100644 (file)
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -601,15 +601,15 @@ Section "Bacula Tray Monitor" SecTrayMonitor
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
   File "${SRC_DIR}\libgcc_s_sjlj-1.dll"
-; File "${SRC_DIR}\bacula-tray-monitor.exe"
+  File "${SRC_DIR}\bacula-tray-monitor.exe"
 
-; File "/oname=$PLUGINSDIR\bacula-tray-monitor.conf" "bacula-tray-monitor.conf.in"
-; StrCpy $0 "$INSTDIR"
-; StrCpy $1 bacula-tray-monitor.conf
-; Call ConfigEditAndCopy
+  ;File "/oname=$PLUGINSDIR\bacula-tray-monitor.conf" "bacula-tray-monitor.conf.in"
+  StrCpy $0 "$INSTDIR"
+  StrCpy $1 bacula-tray-monitor.conf
+  ;Call ConfigEditAndCopy
 
   ; Create Start Menu entry
-;  CreateShortCut "$SMPROGRAMS\Bacula\TrayMonitor.lnk" "$INSTDIR\bacula-tray-monitor.exe" "" "$INSTDIR\bacula-tray-monitor.exe" 0
+   CreateShortCut "$SMPROGRAMS\Bacula\TrayMonitor.lnk" "$INSTDIR\bacula-tray-monitor.exe" "" "$INSTDIR\bacula-tray-monitor.exe" 0
 !endif
 
 SectionEnd
@@ -737,8 +737,8 @@ LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula 32 bit File Daemon
 LangString DESC_SecStorageDaemon ${LANG_ENGLISH} "Install Bacula 32 bit Storage Daemon on this system."
 LangString DESC_SecConsole ${LANG_ENGLISH} "Install bconsole program on this system."
 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_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."
 
@@ -760,7 +760,7 @@ LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create a resource template f
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecStorageDaemon} $(DESC_SecStorageDaemon)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecBatConsole} $(DESC_SecBatConsole)
-;  !InsertMacro MUI_DESCRIPTION_TEXT ${SecTrayMonitor} $(DESC_SecTrayMonitor)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecTrayMonitor} $(DESC_SecTrayMonitor)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecAllDrivesPlugin} $(DESC_SecAllDrivesPlugin)
 ;  !InsertMacro MUI_DESCRIPTION_TEXT ${SecWinBMRPlugin} $(DESC_SecWinBMRPlugin)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecOldExchangePlugin} $(DESC_SecOldExchangePlugin)
@@ -973,9 +973,9 @@ Function GetSelectedComponents
   ${If} ${SectionIsSelected} ${SecBatConsole}
     IntOp $R0 $R0 | ${ComponentBatConsole}
   ${EndIf}
-;  ${If} ${SectionIsSelected} ${SecTrayMonitor}
-;    IntOp $R0 $R0 | ${ComponentTrayMonitor}
-;  ${EndIf}
+   ${If} ${SectionIsSelected} ${SecTrayMonitor}
+     IntOp $R0 $R0 | ${ComponentTrayMonitor}
+   ${EndIf}
   ${If} ${SectionIsSelected} ${SecAllDrivesPlugin}
     IntOp $R0 $R0 | ${ComponentAllDrivesPlugin}
   ${EndIf}
@@ -1118,14 +1118,14 @@ Function SelectPreviousComponents
       !InsertMacro UnselectSection ${SecBatConsole}
       !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_RO}
     ${EndIf}
-;    IntOp $R1 $PreviousComponents & ${ComponentTrayMonitor}
-;    ${If} $R1 <> 0
-;      !InsertMacro SelectSection ${SecTrayMonitor}
-;      !InsertMacro SetSectionFlag ${SecTrayMonitor} ${SF_RO}
-;    ${Else}
-;      !InsertMacro UnselectSection ${SecTrayMonitor}
-;      !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_RO}
-;    ${EndIf}
+     IntOp $R1 $PreviousComponents & ${ComponentTrayMonitor}
+     ${If} $R1 <> 0
+       !InsertMacro SelectSection ${SecTrayMonitor}
+       !InsertMacro SetSectionFlag ${SecTrayMonitor} ${SF_RO}
+     ${Else}
+       !InsertMacro UnselectSection ${SecTrayMonitor}
+       !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_RO}
+     ${EndIf}
     IntOp $R1 $PreviousComponents & ${ComponentAllDrivesPlugin}
     ${If} $R1 <> 0
       !InsertMacro SelectSection ${SecAllDrivesPlugin}
@@ -1196,12 +1196,12 @@ Function UpdateComponentUI
     ${Else}
       !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_BOLD}
     ${EndIf}
-;    IntOp $R1 $NewComponents & ${ComponentTrayMonitor}
-;    ${If} $R1 <> 0
-;      !InsertMacro SetSectionFlag ${SecTrayMonitor} ${SF_BOLD}
-;    ${Else}
-;      !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_BOLD}
-;    ${EndIf}
+     IntOp $R1 $NewComponents & ${ComponentTrayMonitor}
+     ${If} $R1 <> 0
+       !InsertMacro SetSectionFlag ${SecTrayMonitor} ${SF_BOLD}
+     ${Else}
+       !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_BOLD}
+     ${EndIf}
     IntOp $R1 $NewComponents & ${ComponentAllDrivesPlugin}
     ${If} $R1 <> 0
       !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_BOLD}

diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index 753fb06d967a4af474449c46e24eafcfac3ad605..98008b9097824d5ad1c02f6d64d6a02319e76416 100644 (file)
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -108,7 +108,7 @@ ifeq ($(bat),no)
        BACULA_BINARIES=$(BACULABINARIES)
        HELP=
 else
-       BACULA_BINARIES=$(BACULABINARIES) bat.exe #bacula-tray-monitor.exe
+       BACULA_BINARIES=$(BACULABINARIES) bat.exe bacula-tray-monitor.exe
        HELP=help
 endif
 

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index b271054024992f97cdfaafe92059e0a9e94b7689..fd82c831515279f2654226d34bd1626bd779f4ec 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -647,15 +647,15 @@ Section "Tray Monitor" SecTrayMonitor
   Call InstallCommonFiles
   File "${SRC64_DIR}\QtCore4.dll"
   File "${SRC64_DIR}\QtGui4.dll"
-  ;File "${SRC64_DIR}\bacula-tray-monitor.exe"
+  File "${SRC64_DIR}\bacula-tray-monitor.exe"
 
-  ;File "/oname=$INSTDIR\working\bacula-tray-monitor.conf.in" "bacula-tray-monitor.conf.in"
-  ;StrCpy $0 "$INSTDIR"
-  ;StrCpy $1 bacula-tray-monitor.conf
-  ;Call ConfigEditAndCopy
+  File "/oname=$INSTDIR\working\bacula-tray-monitor.conf.in" "bacula-tray-monitor.conf.in"
+  StrCpy $0 "$INSTDIR"
+  StrCpy $1 bacula-tray-monitor.conf
+  Call ConfigEditAndCopy
 
   ; Create Start Menu entry
-  ;CreateShortCut "$SMPROGRAMS\Bacula\TrayMonitor.lnk" "$INSTDIR\bacula-tray-monitor.exe" "" "$INSTDIR\bacula-tray-monitor.exe" 0
+  CreateShortCut "$SMPROGRAMS\Bacula\TrayMonitor.lnk" "$INSTDIR\bacula-tray-monitor.exe" "" "$INSTDIR\bacula-tray-monitor.exe" 0
   SetOutPath "$INSTDIR"
 !endif