Win -- add help files to installer + stop any running bacula-fd before install

diff --git a/bacula/src/host.h.in b/bacula/src/host.h.in
index d3615e9bf664d1eaa4c41c9ced27aac66276ca92..6da98286a33fc8369c4ebaee2f6e32f6eb7cb8a6 100644 (file)
--- a/bacula/src/host.h.in
+++ b/bacula/src/host.h.in
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -28,12 +28,14 @@
 /*
  * Define Host machine
  *
- *  Version $Id$
- *
  */
 
 #define HOST_OS  "@host@@post_host@"
 #define BACULA   "@BACULA@"
 #define DISTNAME "@DISTNAME@"
 #define DISTVER  "@DISTVER@"
+#ifdef HAVE_WIN32
+#define HELPDIR   "c://Program Files//Bacula//help"
+#else
 #define HELPDIR  "@htmldir@"
+#endif

diff --git a/bacula/src/qt-console/help/help.cpp b/bacula/src/qt-console/help/help.cpp
index fe6f6662b4d491c2b8e78f084a6330eeb05806d5..8fb127820416965b7e9dfae9a8ec449f439cda9c 100644 (file)
--- a/bacula/src/qt-console/help/help.cpp
+++ b/bacula/src/qt-console/help/help.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -31,12 +31,15 @@
  *
  *   Kern Sibbald, May MMVII
  *
- *  $Id$
  */ 
 
 #include "bat.h"
 #include "help.h"
 
+/*
+ * Note: HELPDIR is defined in src/host.h
+ */
+
 Help::Help(const QString &path, const QString &file, QWidget *parent) :
         QWidget(parent)
 {

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 13640735fd845a6a3a21a1b664394917d91588a7..8859416f52738eb7300c78a15d9e11af99d386a4 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -27,7 +27,6 @@
 */
 
 /*
- *   Version $Id$
  *
  *  Main Window control for bat (qt-console)
  *

diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32
index 4b4ed4a27d27e2278b482d0ee909377eb947a0cc..b75ff1723b87be0e8052bedbbacccccc9aac3fbf 100755 (executable)
--- a/bacula/src/qt-console/make-win32
+++ b/bacula/src/qt-console/make-win32
@@ -15,4 +15,9 @@ if test -d ../win32/release32; then
    cp -f debug/bat.exe ../win32/release32
    cp -f ${DEPKGS}/depkgs-mingw32/lib/qt/QtGui4.dll ../win32/release32
    cp -f ${DEPKGS}/depkgs-mingw32/lib/qt/QtCore4.dll ../win32/release32
+   rm -rf ../win32/release32/help
+   mkdir ../win32/release32/help
+   cp -f help/*.html ../win32/release32/help/
+   cp -f images/status.png ../win32/release32/help/
+   cp -f images/mail-message-new.png ../win32/release32/help/
 fi

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a72041ca451a952aecd8776a76dae2a4c3b8adf2..245fcfe62892e88513878b2b87f3248ad8d72620 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 
 #undef  VERSION
-#define VERSION "5.1.0"
-#define BDATE   "26 January 2010"
-#define LSMDATE "26Jan10"
+#define VERSION "5.1.1"
+#define BDATE   "06 February 2010"
+#define LSMDATE "06Feb10"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2010"       /* year for copyright messages in progs */

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 0f3ab9ffb76547dd4f6aa44d96fa08e2d1b93609..5d70841c7a732e161f3ed7b83d2ac434597a8112 100644 (file)
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -64,6 +64,8 @@ DOC_FILES := \
        docs/manuals/en/problems/problems.pdf \
        docs/manuals/en/utility/utility.pdf
 
+HELP_FILES := help/*
+
 ##########################################################################
 
 # Targets
@@ -122,7 +124,12 @@ $(foreach file,$(addprefix ../../dird/, $(DIRD_FILES)),$(eval $(call Copy_Binary
 
 $(foreach file,$(DOC_FILES),$(eval $(call Copy_Docs,$(file))))
 
+
+
 $(INSTALL_EXE): winbacula.nsi $(addprefix release32/,$(BACULA_BINARIES) $(SCRIPT_FILES) $(CAT_FILES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES) $(MINGW_BINARIES) $(SSL_FILES) $(DIRD_FILES) $(DOC_FILES))
+       rm -rf release32/help
+       mkdir release32/help
+       cp -f $(BINDIR)/$(HELP_FILES) release32/help/
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
 

diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index af6b16c85db2f38173b408f684ee8d6e4cf2817d..552a03faa4fe3855a0e067d0df70ef65b12a83ac 100644 (file)
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -435,8 +435,15 @@ Section "-Initialize"
 
   FileClose $R1
 
+  ${If} ${FileExists} "$OldInstallDir\bacula-fd.exe"
+    nsExec::ExecToLog '"$OldInstallDir\bacula-fd.exe" /kill'     ; Shutdown any bacula that could be running
+    Sleep 3000
+    nsExec::ExecToLog '"$OldInstallDir\bacula-fd.exe" /remove'   ; Remove existing service
+  ${EndIf}
+
 SectionEnd
 
+
 SectionGroup "Client" SecGroupClient
 
 Section "File Service" SecFileDaemon
@@ -503,6 +510,9 @@ Section "Bat Console" SecBatConsole
   StrCpy $1 bat.conf
   Call ConfigEditAndCopy
 
+  File "${SRC_DIR}\help\*"
+   
+
   ; Create Start Menu entry
   CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bat.exe" '-c "$INSTDIR\bat.conf"' "$INSTDIR\bat.exe" 0
   CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$INSTDIR\bat.conf"'
@@ -611,7 +621,7 @@ UninstallText "This will uninstall Bacula. Click Uninstall to continue."
 Section "Uninstall"
   ; Shutdown any baculum that could be running
   nsExec::ExecToLog '"$INSTDIR\bacula-fd.exe" /kill'
-  Sleep 5000
+  Sleep 3000
 
 ; ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-fd"
   ; Remove bacula service

diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index f89cd47b22648badf63bca042311f514ce2abdb4..0dbc90f03c4eb0a47a818fb7dae266f03bb777ea 100644 (file)
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -443,6 +443,12 @@ Section "-Initialize"
 
   FileClose $R1
 
+  ${If} ${FileExists} "$OldInstallDir\bacula-fd.exe"
+    nsExec::ExecToLog '"$OldInstallDir\bacula-fd.exe" /kill'     ; Shutdown any bacula that could be running
+    Sleep 3000
+    nsExec::ExecToLog '"$OldInstallDir\bacula-fd.exe" /remove'   ; Remove existing service
+  ${EndIf}
+
 SectionEnd
 
 SectionGroup "Client" SecGroupClient
@@ -516,6 +522,9 @@ Section "Bat Console" SecBatConsole
   StrCpy $1 bat.conf
   Call ConfigEditAndCopy
 
+  File "${SRC_DIR}\help\*"
+
+
   ; Create Start Menu entry
   CreateShortCut "$SMPROGRAMS\Bacula\Bat.lnk" "$INSTDIR\bin32\bat.exe" '-c "$INSTDIR\bin32\bat.conf"' "$INSTDIR\bin32\bat.exe" 0
   CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Bat Configuration.lnk" "write.exe" '"$INSTDIR\bin32\bat.conf"'