From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 13 Jul 2009 12:58:03 +0000 (+0000)
Subject: Tweak win32/64 build doc
X-Git-Tag: Release-3.0.2~89
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e024d0fe47ea0d9e6d3fbec52c4165caa44967f;p=bacula%2Fbacula

Tweak win32/64 build doc

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

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
index 0debbc67ef..152eab8e41 100644
--- a/bacula/src/cats/create_postgresql_database.in
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -20,7 +20,10 @@ ENCODING="ENCODING 'SQL_ASCII'"
 #
 #ENCODING="ENCODING 'UTF8'"
      
-
+#
+# KES: Note: the CREATE DATABASE, probably should be
+#   CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0
+#
 if $bindir/psql -f - -d template1 $* <<END-OF-DATA
 CREATE DATABASE ${db_name} $ENCODING;
 ALTER DATABASE ${db_name} SET datestyle TO 'ISO, YMD';
diff --git a/bacula/src/win32/README.mingw b/bacula/src/win32/README.mingw
index 5d38a34b6e..1adbfb3519 100644
--- a/bacula/src/win32/README.mingw
+++ b/bacula/src/win32/README.mingw
@@ -1,5 +1,5 @@
 
-Instructions to build Bacula using the Mingw on Linux
+Instructions for cross compiling the Win32/64 FD on Linux
 =======================================================
 
 This file documents the tools (scripts) we use for building Bacula for
@@ -119,7 +119,9 @@ it is relatively obvious when looking at the src directory.
 In that directory, you should find a make.log, which has the full details
 of the compiles, links, and installs done for that package.
 
-Build the 64 bit cross-tools and mingw64:
+===
+Building the 64 bit cross-tools and mingw64:
+
 When building the mingw64 environment and all dependencies
 (cross-tools, and depkgs-mingw64) should be compiled by hand with
 host=x86_64-pc-linux and target=x86_64-pc-mingw32.  
diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32
deleted file mode 100644
index 233175dfa2..0000000000
--- a/bacula/src/win32/README.win32
+++ /dev/null
@@ -1,45 +0,0 @@
-Starting in version 1.39.x the source tree structure and the build
-process have changed significantly.
-
-Building the Windows version with versions of Microsoft Visual C++
-prior to VC8 (2005) is no longer supported nor is Cygwin32 required.
-
-There are now two supported methods of building the Windows version.
-The MinGW cross-compile environment is used to build it on Unix
-systems.  Microsoft Visual C++ 2005 is used to build it on Microsoft
-Windows systems.
-
-The new directory structure is:
-
-  bacula-top                 Top level directory -- any name
-    bacula                   Top level Bacula source directory -- any name
-      src
-        win32                Main directory where Windows version is built.
-
-    docs                     Top level Bacula documentation directory
-
-    depkgs-mingw32 (MinGW32) 3rd Party Dependencies for MinGW32 build
-or
-    depkgs-msvc (MS VC++)    3rd Party Dependencies for Microsoft VC++ build.
-      bin              --
-      include            |
-      lib                |
-      man                |   Created by script
-      nsis               |-- .../bacula/src/win32/build-depkgs-mingw32
-      scons              |
-      share              |
-      src                |
-      ssl              --
-      vss
-        inc                  A copy of the Windows VSS/inc directory
-
-    cross-tools (MinGW32)    Cross compilation tools (gcc, g++, mingw32, ...)
-      binutils-mingw32 --
-      gcc-mingw32        |   Created by script
-      mingw32            |-- .../bacula/src/win32/build-win32-cross-tools
-      mingw-utils        |
-      source           --
-
-Information on building the Windows version of Bacula is contained in the
-files README.mingw32/README.mingw64 for building in a cross-compile environment on Unix
-and README.vc8 for building using Microsoft Visual C++ 2005.