Add bat to Win64 installer

diff --git a/bacula/src/win32/win64_installer/InstallType.nsh b/bacula/src/win32/win64_installer/InstallType.nsh
index 5f4cfaa3ccec67c16dd52da6554b93cc539c1dc9..a9ddf8cdd724461bbb8e4d0efb757be5a37a9127 100644 (file)
--- a/bacula/src/win32/win64_installer/InstallType.nsh
+++ b/bacula/src/win32/win64_installer/InstallType.nsh
@@ -63,10 +63,13 @@ Function EnterInstallType
     ${If} ${FileExists} "$R1\bconsole.conf"
       IntOp $PreviousComponents $PreviousComponents | ${ComponentTextConsole}
     ${EndIf}
+    ${If} ${FileExists} "$R1\bat.conf"
+      IntOp $PreviousComponents $PreviousComponents | ${ComponentBatConsole}
+    ${EndIf}
     ${If} ${FileExists} "$R1\wx-console.conf"
       IntOp $PreviousComponents $PreviousComponents | ${ComponentGUIConsole}
     ${EndIf}
-    ${If} ${FileExists} "$R2\bacula.pdf"
+    ${If} ${FileExists} "$R2\main.pdf"
       IntOp $PreviousComponents $PreviousComponents | ${ComponentPDFDocs}
     ${EndIf}
     ${If} ${FileExists} "$R2\bacula\bacula.html"

diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index 40cb8724412b2a08106492d4f5459a3f0d6edecd..0823664c208eb94fb4df5808399cbf68669688d7 100644 (file)
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -89,10 +89,11 @@ SSL_FILES := \
        openssl.cnf
 
 DOC_FILES := \
-       manual/bacula.pdf \
-       manual/bacula/*.html \
-       manual/bacula/*.png  \
-       manual/bacula/*.css
+       docs/manuals/en/console/console.pdf \
+       docs/manuals/en/main/main.pdf \
+       docs/manuals/en/misc/misc.pdf \
+       docs/manuals/en/problems/problems.pdf \
+       docs/manuals/en/utility/utility.pdf
 
 ##########################################################################
 
@@ -155,6 +156,9 @@ $(foreach file,$(addprefix $(DEPKGS32)/ssl/, $(SSL_FILES)),$(eval $(call Copy_Bi
 #$(foreach file,$(DOC_FILES),$(eval $(call Copy_Docs,$(file))))
 
 $(INSTALL_EXE): winbacula.nsi $(addprefix release64/,$(BACULA_BINARIES) $(DEPKGS_BINARIES) $(DEPKGS32_BINARIES) $(SSL_FILES) )
+       cp -f ../release32/bat.exe release64
+       cp -f ../release32/QtCore4.dll release64
+       cp -f ../release32/QtGui4.dll release64
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
 

diff --git a/bacula/src/win32/win64_installer/WriteTemplates.ini b/bacula/src/win32/win64_installer/WriteTemplates.ini
index 1b9b1b1b8b43d5275b83d9ce9fe5e0bccb74065e..3b3631c3ff6980e4e7555640da8d87c2a6a36ea9 100644 (file)
--- a/bacula/src/win32/win64_installer/WriteTemplates.ini
+++ b/bacula/src/win32/win64_installer/WriteTemplates.ini
@@ -13,7 +13,7 @@ Bottom=32
 
 [Field 2]
 Type="CheckBox"
-Text="Save Client template in:
+Text="Save Client template in:"
 Left=6
 Right=240
 Top=38

diff --git a/bacula/src/win32/win64_installer/bacula-fd.conf.in b/bacula/src/win32/win64_installer/bacula-fd.conf.in
index 986ebc855784bec44c917082828a2c2fe1a5e1b7..5d4c7f98a093f625b5eabb0173808a218f0fe959 100644 (file)
--- a/bacula/src/win32/win64_installer/bacula-fd.conf.in
+++ b/bacula/src/win32/win64_installer/bacula-fd.conf.in
@@ -1,7 +1,7 @@
 #
 # Default  Bacula File Daemon Configuration file
 #
-#  For Bacula Systems release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
+#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
 #
 # There is not much to change here except perhaps the
 # File daemon Name

diff --git a/bacula/src/win32/win64_installer/bat.conf.in b/bacula/src/win32/win64_installer/bat.conf.in
new file mode 100644 (file)
index 0000000..7f0b5f1
--- /dev/null
+++ b/bacula/src/win32/win64_installer/bat.conf.in
@@ -0,0 +1,10 @@
+#
+# Bacula Administration Tool (bat) Configuration File
+#
+
+Director {
+  Name = @director_name@
+  DIRport = @director_port@
+  address = @director_address@
+  Password = "@director_password@"
+}

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index 05cd5b7f16271a90b04d42596b76dd6ca4921b7b..be995a91b173dd4ec57bd89089c94f5a2d086e7e 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -185,23 +185,25 @@ Var NewComponents
 ;     1 = Storage Service
 ;     2 = Director Service
 ;     3 = Command Console
-;     4 = Graphical Console
-;     5 = Documentation (PDF)
-;     6 = Documentation (HTML)
+;     4 = Bat Console
+;     5 = wxWidgits Console
+;     6 = Documentation (PDF)
+;     7 = Documentation (HTML)
 
 !define ComponentFile                   1
 !define ComponentStorage                2
 !define ComponentDirector               4
 !define ComponentTextConsole            8
-!define ComponentGUIConsole             16
-!define ComponentPDFDocs                32
-!define ComponentHTMLDocs               64
+!define ComponentBatConsole             16
+!define ComponentGUIConsole             32
+!define ComponentPDFDocs                64
+!define ComponentHTMLDocs               128
 
-!define ComponentsRequiringUserConfig           31
+!define ComponentsRequiringUserConfig           63
 !define ComponentsFileAndStorage                3
 !define ComponentsFileAndStorageAndDirector     7
-!define ComponentsDirectorAndTextGuiConsoles    28
-!define ComponentsTextAndGuiConsoles            24
+!define ComponentsDirectorAndTextGuiConsoles    60
+!define ComponentsTextAndGuiConsoles            56
 
 Var HDLG
 Var HCTL
@@ -490,6 +492,33 @@ Section "Command Console" SecConsole
 
 SectionEnd
 
+Section "Bat Console" SecBatConsole
+  SectionIn 1 2 3
+
+  SetOutPath "$INSTDIR\bin"
+
+  Call InstallCommonFiles
+  File "${SRC_DIR}\QtCore4.dll"
+  File "${SRC_DIR}\QtGui4.dll"
+
+  File "${SRC_DIR}\bat.exe"
+
+  ${If} $InstallType = ${MigrateInstall}
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bat.conf"
+    CopyFiles "$OldInstallDir\bin\bat.conf" "$APPDATA\Bacula"
+  ${Else}
+    File "/oname=$PLUGINSDIR\bat.conf" "bat.conf.in"
+    StrCpy $0 "$APPDATA\Bacula"
+    StrCpy $1 bat.conf
+    Call ConfigEditAndCopy
+  ${EndIf}
+
+  ; Create Start Menu entry
+  CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bin\bat.exe" '-c "$APPDDATA\Bacula\bat.conf"' "$INSTDIR\bin\bat.exe" 0
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bat.conf"'
+SectionEnd
+
+
 ; Essentially deleted because wxconsole is not implemented on Win64
 Section "Graphical Console" SecWxConsole
   SectionIn 1 2 3
@@ -532,6 +561,7 @@ SectionEnd
 
 LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
 LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."
+LangString DESC_SecBatConsole ${LANG_ENGLISH} "Install Bat graphical console program on this system."
 
 LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
 LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
@@ -548,6 +578,7 @@ LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create a resource template f
 !InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
   !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
+  !InsertMacro MUI_DESCRIPTION_TEXT ${SecBatConsole} $(DESC_SecBatConsole)
 !InsertMacro MUI_FUNCTION_DESCRIPTION_END
 
 ; Uninstall section
@@ -741,6 +772,9 @@ Function GetSelectedComponents
   ${If} ${SectionIsSelected} ${SecConsole}
     IntOp $R0 $R0 | ${ComponentTextConsole}
   ${EndIf}
+  ${If} ${SectionIsSelected} ${SecBatConsole}
+    IntOp $R0 $R0 | ${ComponentBatConsole}
+  ${EndIf}
   Exch $R0
 FunctionEnd
 
@@ -829,6 +863,14 @@ Function SelectPreviousComponents
       !InsertMacro UnselectSection ${SecConsole}
       !InsertMacro ClearSectionFlag ${SecConsole} ${SF_RO}
     ${EndIf}
+    IntOp $R1 $PreviousComponents & ${ComponentBatConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SelectSection ${SecBatConsole}
+      !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_RO}
+    ${Else}
+      !InsertMacro UnselectSection ${SecBatConsole}
+      !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_RO}
+    ${EndIf}
   ${EndIf}
 FunctionEnd
 
@@ -855,6 +897,12 @@ Function UpdateComponentUI
     ${Else}
       !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD}
     ${EndIf}
+   IntOp $R1 $NewComponents & ${ComponentBatConsole}
+    ${If} $R1 <> 0
+      !InsertMacro SetSectionFlag ${SecBatConsole} ${SF_BOLD}
+    ${Else}
+      !InsertMacro ClearSectionFlag ${SecBatConsole} ${SF_BOLD}
+    ${EndIf}
   ${EndIf}
 
   GetDlgItem $R0 $HWNDPARENT 1