- Include msvcr71.dll in distribution.

- Add VSS to status line in Win32 FD if enabled.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2201 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 3230194f8d899e6456c8a6dc0ea35c6dfeb6db6f..579c9fe05b8fa83b7e7b1e68886e4b22ed4d0423 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -5,6 +5,8 @@ General:
 
 Changes to 1.37.30:
 14Jul05
+- Include msvcr71.dll in distribution.
+- Add VSS to status line in Win32 FD if enabled.
 - Get VSS build scripts working with Thorsten's help.
 - Unlink the bootstrap file after sending it to
   the FD.

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 398ad673198cbd08f9f2da01a1036780b7f0700a..275399949d1ee80dd7838530fd4b30b788ad5dc5 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -7,22 +7,17 @@
  *
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2001-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -48,6 +43,11 @@ static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
 static int privs = 0;
 #endif
+#ifdef WIN32_VSS
+#define VSS " VSS"
+#else
+#define VSS ""
+#endif
 
 /*
  * General status generator
@@ -62,8 +62,8 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
 
    msg = (char *)get_pool_memory(PM_MESSAGE);
    found = 0;
-   len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
-              HOST_OS, DISTNAME, DISTVER);
+   len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ")" VSS " %s %s %s\n", 
+              my_name, HOST_OS, DISTNAME, DISTVER);
    sendit(msg, len, arg);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),

diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32
index 51e25015b0029622e61db54012f82829f449d535..96e0ec4bfda62876f1ddf4ace347d8148c50c206 100644 (file)
--- a/bacula/src/win32/README.win32
+++ b/bacula/src/win32/README.win32
@@ -32,6 +32,10 @@ Win32 Bacula.  It can be found in the Source Forge Bacula project
 release section.
 
 To build it:
+- For this version of Bacula, you must have msvcr71.dll
+  installed in c:/windows/system32.  The winbacula.nsi.in
+  and pebuilder Makefile.in files have this hard coded in.
+- We are using Microsoft Visual Studio .NET 2003.
 - Make sure nmake is on your PATH.
 - Make sure your COMSPEC is properly setup (see full dump of
   my cygwin environment below).
@@ -60,9 +64,7 @@ To build it:
 Instructions if you want to build bacula-fd with VSS 
 (Volume Shadow Copy Service) support:
 
-- VSS support is right now (June 2005) available for MS-Windows XP 
-   (beta)
-- VSS support is right now (June 2005) available for MS-Windows 2003 (beta)
+- VSS support works for both WinXP machines and Win 2003 machines.
 - you need to get the VSS SDK: 
   http://www.microsoft.com/downloads/details.aspx?FamilyID=0B4F56E4-0CCC-4626-826A-ED2C4C95C871&displaylang=en
 - copy the 'inc' and 'lib' directories from this SDK to 
@@ -72,8 +74,9 @@ Instructions if you want to build bacula-fd with VSS
   'bacula/src/win32/compat/vss/lib'
   both with 'Win2003' and 'WinXP' subdirectories
 - add 'WIN32_VSS' as preprocessor directive
-- you should get a bacula-fd that runs on all platforms and has 
+- you should get a single bacula-fd.exe that runs on all platforms and has 
   VSS support for WinXP and 2003 enabled
+- Follow the instructions given above for building it.
 
 That should be all there is too it. The winbacula-1.xx.y.exe 
 should be in the current directory.
@@ -131,6 +134,9 @@ NOTE! I (Kern) cannot build wxWindows with the Makefile until after
 I do a ./configure.  I can us VC Studio directly to do so
 following their instructions.
 
+Note, the paths given below have changed now that we switched
+to Microsoft Visual Studio .NET 2003 (VC++ 7.1).
+
 Getting all the environment variables setup properly is not always so obvious.
 Here is what I have when I do a "set" in a rxvt window, in which I build
 Bacula. Probably what is important are INCLUDE, LIB, PATH, and WXWIN, but note

diff --git a/bacula/src/win32/pebuilder/Makefile.in b/bacula/src/win32/pebuilder/Makefile.in
index d1ebe78e939f75f39c05052997c5ca39349ea2c7..fa0cca5b99a1fcb16468c1593a019c89307e0f25 100644 (file)
--- a/bacula/src/win32/pebuilder/Makefile.in
+++ b/bacula/src/win32/pebuilder/Makefile.in
@@ -31,6 +31,7 @@ pebuilder:
        cp -f ../console/Release/bconsole.exe bacula/files/
        cp -f ../wx-console/Release/wx-console.exe bacula/files/
        cp -f ../../../../depkgs-win32/pthreads/pthreadVCE.dll bacula/files/
+       cp -f c:/windows/system32/msvcr71.dll bacula/files
        cp -f ../License.txt bacula/files/
 
 zip: pebuilder

diff --git a/bacula/src/win32/winbacula.nsi.in b/bacula/src/win32/winbacula.nsi.in
index 56a3e24250b8f9b9f2860016d5787bd8fd4e9b3f..46417071f31cd5bd31c694dfc552ecfd3cd21d40 100755 (executable)
--- a/bacula/src/win32/winbacula.nsi.in
+++ b/bacula/src/win32/winbacula.nsi.in
@@ -104,6 +104,7 @@ Section "Bacula File Service" SecService
   CreateDirectory "c:\tmp"
   ; Put files there
   File baculafd\Release\bacula-fd.exe
+  File c:\windows\system32\msvcr71.dll
   File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
   File License.txt
   IfFileExists "$INSTDIR\bin\bacula-fd.conf" newconf 
@@ -182,9 +183,10 @@ SectionEnd
 Section "Install Console" SecConsole
   SetOutPath "$INSTDIR\bin"
   File console\Release\bconsole.exe
+  File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
+  File c:\windows\system32\msvcr71.dll
   IfFileExists "$INSTDIR\bin\bconsole.conf" newconf 
   File console\bconsole.conf
-  File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
   goto do_next
  newconf:
   File /oname=bconsole.conf.new console\bconsole.conf
@@ -201,9 +203,10 @@ SectionEnd
 Section "Install wx-Console" SecWxConsole
   SetOutPath "$INSTDIR\bin"
   File wx-console\Release\wx-console.exe
+  File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
+  File c:\windows\system32\msvcr71.dll
   IfFileExists "$INSTDIR\bin\wx-console.conf" newconf 
   File wx-console\wx-console.conf
-  File ..\..\..\depkgs-win32\pthreads\pthreadVCE.dll
   goto do_next
  newconf:
   File /oname=wx-console.conf.new wx-console\wx-console.conf