Update win32 build instructions

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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index e73bc2284b6a801072b244ba5a6073badd73df45..ada17fb19a9fb1999b2e4521158d2eb5f3e1dde4 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.42:
+26Oct05
+- Update README.win32 instructions.
 25Oct05 
 - Make db_get_job_record() return Name so that the ACL
   can be checked.  Fixes bug #446

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 68f97f6c96b5287c5932d04ecd670b699edd3ced..5b6144526d997bfba631012e08151f10e1efb802 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.42"
-#define BDATE   "25 October 2005"
-#define LSMDATE "25Oct05"
+#define BDATE   "26 October 2005"
+#define LSMDATE "26Oct05"
 
 /* Debug flags */
 #undef  DEBUG

diff --git a/bacula/src/win32/README.vc8 b/bacula/src/win32/README.vc8
index 43c1f62d835b75833157ee2c2e44f762e220b61b..660e3b0e0236d59afd132dac7688c477a35cfab7 100644 (file)
--- a/bacula/src/win32/README.vc8
+++ b/bacula/src/win32/README.vc8
@@ -1,7 +1,10 @@
+
 Instructions to build Bacula with Microsoft Visual C++ 2005 Express Edition (free version).
 ---
 
-(Note: for the moment VSS support has been disabled)
+(Note: for the moment VSS support has been disabled, and this is not
+the official way to build the released FD.  See README.win32 for the
+"official" instructions.)
 
 What you need to download:
 - Visual C++ Express Edition Beta 2 (2MB + 66MB)

diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32
index 424ae9a3d216ca48a1b273fab058923d3c036139..aa27590f5603714d0bd59db08aeb40c66c8d77da 100644 (file)
--- a/bacula/src/win32/README.win32
+++ b/bacula/src/win32/README.win32
@@ -5,7 +5,6 @@ the native Win32 bconsole program and the wx-console GUI console
 program.
 
 The directory structure is:
-
   bacula/src/win32      Makefiles and scripts
     baculafd            Visual Studio Files
       Release           Release objects, and bacula-fd.exe
@@ -21,6 +20,9 @@ The directory structure is:
     findlib             Links to core findlib code
     lib                 Links to core lib code
 
+  docs                  Bacula documentation directory with pre-build
+                        doc files
+
   depkgs-win32
     pthreads            The POSIX pthreads library (third party)
     zlib                The zlib library (third party)
@@ -29,7 +31,32 @@ The directory structure is:
 depkgs-win32 is released in a separate .tar.gz file that contains the
 source for the above mentioned libraries needed to build the
 Win32 Bacula.  It can be found in the Source Forge Bacula project
-release section.
+release section.  Docs is released as a separate tar file, which is
+created from the bacula CVS docs project (module).             
+
+
+Instructions if you want to build bacula-fd with VSS 
+(Volume Shadow Copy Service) support. Note, the non-VSS build is
+no longer supported though you may be able to get it to work by
+copy the file src/win32/baculafd/baculanovssfd.mak into 
+src/win32/baculafd/baculafd.mak before running the "make" command
+below:
+
+- 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 
+  'bacula/src/win32/compat/vss'. Note, generally these files
+  are installed in c:/Program\ Files/Microsoft/VSSSDK71
+- you should then have 'bacula/src/win32/compat/vss/inc' and 
+  'bacula/src/win32/compat/vss/lib'
+  both with 'Win2003' and 'WinXP' subdirectories
+- add 'WIN32_VSS' as preprocessor directive
+- you should get a single bacula-fd.exe that runs on all platforms and has 
+  VSS support for WinXP and 2003 enabled
+- Once you have added the VSS SDK files as a subdirectory to the build
+  tree, follow the original instructions for building Bacula given
+  below.
 
 To build it:
 - For this version of Bacula, you must have msvcr71.dll
@@ -59,27 +86,38 @@ To build it:
 - cd bacula
   ./configure --enable-client-only
   cd src/win32
+- ensure that the docs are copied into docs at the bacula
+  directory level.
   make
 
-Instructions if you want to build bacula-fd with VSS 
-(Volume Shadow Copy Service) support:
-
-- 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 
-  'bacula/src/win32/compat/vss'. Note, generally these files
-  are installed in c:/Program\ Files/Microsoft/VSSSDK71
-- you should then have 'bacula/src/win32/compat/vss/inc' and 
-  'bacula/src/win32/compat/vss/lib'
-  both with 'Win2003' and 'WinXP' subdirectories
-- add 'WIN32_VSS' as preprocessor directive
-- 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.
+Here is the script that I use under cygwin to build it:
+==== build script =========
+#!/bin/sh
+cd bacula
+mkdir -p src/win32/compat/vss
+cp -a c:/Program\ Files/Microsoft/VSSSDK71/inc src/win32/compat/vss
+cp -a c:/Program\ Files/Microsoft/VSSSDK71/lib src/win32/compat/vss
+./configure \
+  --enable-client-only \
+  --sbindir=/bacula/bin \
+  --sysconfdir=/bacula/bin \
+  --enable-smartalloc \
+  --enable-static-tools \
+  --with-working-dir=/bacula/working \
+  --with-pid-dir=/bacula/working \
+  --with-subsys-dir=/bacula/working
+rm -rf docs
+cp -a ../docs .
+cd src/win32
+make
+VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ../version.h`
+cp -pf winbacula-$VERSION.exe k:/home/kern/bacula/winbacula-vss-$VERSION.exe
+if test $? = 0 ; then
+  echo "winbacula-$VERSION.exe copied to k:/home/kern/bacula/winbacula-vss-$VERSION.exe"
+else
+  echo "Build failed ..."
+fi
+======== end build script ==============
 
 
 See License.txt for the License.