Fix bat build for Win32.

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

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 05f8555f46d8542e841bfaf678bbc74fd6c05bdc..964e3504def02f2743afa9430689c435ca19f565 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -39,6 +39,9 @@
 /* Define if you want to use SQLite3 */
 #undef HAVE_SQLITE3
 
+/* Define if you want to use Berkeley DB */
+#undef HAVE_BERKELEY_DB
+
 /* Define if you want to use mSQL */
 #undef HAVE_MSQL
 
@@ -302,9 +305,6 @@
 /* Set if you have the DBI driver */
 #undef HAVE_DBI
 
-/* Define to 1 if you have the <db.h> header file. */
-#undef HAVE_DB_H
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 11c40c7b0a3173dac799be0375b7b3afd6e64c49..823593b5930ccaa0e4979da1213d0d6e90f2438c 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2359,6 +2359,7 @@ AC_OUTPUT([autoconf/Make.common \
           src/gnome2-console/bgnome-console.conf \
           src/qt-console/bat.conf \
           src/qt-console/bat.pro \
+          src/qt-console/bat.pro.mingw32 \
           src/qt-console/install_conf_file \
           src/wx-console/Makefile \
           src/wx-console/bwx-console.conf \

diff --git a/bacula/configure b/bacula/configure
index 4a2830bf1dc574da267945c441b86cc4e2463cdb..b4ddcac2f55a38d7ab51a83ee0e653a899d8a77b 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -30641,7 +30641,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -31261,6 +31261,7 @@ do
     "src/gnome2-console/bgnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/bgnome-console.conf" ;;
     "src/qt-console/bat.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.conf" ;;
     "src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;;
+    "src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;;
     "src/qt-console/install_conf_file") CONFIG_FILES="$CONFIG_FILES src/qt-console/install_conf_file" ;;
     "src/wx-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;;
     "src/wx-console/bwx-console.conf") CONFIG_FILES="$CONFIG_FILES src/wx-console/bwx-console.conf" ;;

diff --git a/bacula/src/qt-console/README.mingw32 b/bacula/src/qt-console/README.mingw32
index 7f416e051e8cea85ef0dc8ac7366dd8c3d486132..0c5484921a774f77f76ebddf62cca2a55bd4d8ce 100644 (file)
--- a/bacula/src/qt-console/README.mingw32
+++ b/bacula/src/qt-console/README.mingw32
@@ -28,8 +28,11 @@ It will result something like :
 |-- cross-tools
 `-- bacula
 
-bacula setup
+Linux bacula setup -- Note: I believe that this is *required* before trying
+                      to build the Win32 bat.
 ------------
+$ cd bacula
+$ ./configure <your-options-for Linux>
 $ cd bacula/src/win32
 $ make
 
@@ -55,6 +58,7 @@ $ cp -r ~/.wine/drive_c/Qt/4.4.0/lib     depkgs-mingw32/lib/qt
 
 MINGW setup
 -----------
+I think this only needs to be done once ...
 
 --- cross-tools/mingw32/mingw32/include/wchar.h.org     2008-07-13 15:18:52.000000000 +0200
 +++ cross-tools/mingw32/mingw32/include/wchar.h 2008-07-12 14:47:10.000000000 +0200
@@ -79,6 +83,8 @@ Cleanup
 $ cd bacula/src/qt-console
 $ ./make-win32 clean
 
+The bat.exe will be in src/qt-console/debug/bat.exe
+
 
 
 Run Bat on Windows

diff --git a/bacula/src/qt-console/bat.pro.mingw b/bacula/src/qt-console/bat.pro.mingw
deleted file mode 100644 (file)
index 74f7fda..0000000
--- a/bacula/src/qt-console/bat.pro.mingw
+++ /dev/null
@@ -1,165 +0,0 @@
-######################################################################
-# Version $Id: bat.pro.in 7051 2008-05-29 01:19:31Z bartleyd2 $
-#
-#   !!!!!!! IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-#      Edit only bat.pro.in  -- bat.pro is built by the ./configure program
-#
-#   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#    
-CONFIG += qt debug cross-win32
-
-bins.path = ./
-bins.files = ./bat
-confs.path = ./
-confs.commands = ./install_conf_file   
-
-TEMPLATE     = app
-TARGET       = bat
-DEPENDPATH  += .
-INCLUDEPATH += .. . ./console ./restore ./select
-
-cross-win32 {
-#  LIBS       +=  ../win32/dll/bacula.a
-  LIBS       +=  -mwindows -L../win32/release -lbacula
-}
-!cross-win32 {
-  LIBS        += -L../lib -lbac @OPENSSL_LIBS@
-}
-
-qwt {
-  INCLUDEPATH += @QWT_INC@ 
-  LIBS        += @QWT_LDFLAGS@ @QWT_LIB@
-}
-
-RESOURCES    = main.qrc
-MOC_DIR      = moc
-OBJECTS_DIR  = obj
-UI_DIR       = ui
-
-# Main window
-FORMS += main.ui 
-FORMS += prefs.ui
-FORMS += label/label.ui 
-FORMS += relabel/relabel.ui 
-FORMS += mount/mount.ui
-FORMS += console/console.ui
-FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui
-FORMS += restore/restoretree.ui
-FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui
-FORMS += select/select.ui
-FORMS += medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.ui
-FORMS += clients/clients.ui storage/storage.ui fileset/fileset.ui
-FORMS += joblog/joblog.ui jobs/jobs.ui
-FORMS += help/help.ui
-FORMS += status/dirstat.ui
-FORMS += status/clientstat.ui
-FORMS += status/storstat.ui
-qwt {
-  FORMS += jobgraphs/jobplotcontrols.ui
-}
-
-# Main directory
-HEADERS += mainwin.h bat.h bat_conf.h qstd.h pages.h
-SOURCES += main.cpp bat_conf.cpp mainwin.cpp qstd.cpp pages.cpp
-
-# bcomm
-HEADERS += bcomm/dircomm.h
-SOURCES += bcomm/dircomm.cpp bcomm/dircomm_auth.cpp
-
-# Console
-HEADERS += console/console.h
-SOURCES += console/authenticate.cpp console/console.cpp
-
-# Restore
-HEADERS += restore/restore.h
-SOURCES += restore/prerestore.cpp restore/restore.cpp restore/brestore.cpp
-
-# Label dialog
-HEADERS += label/label.h
-SOURCES += label/label.cpp
-
-# Relabel dialog
-HEADERS += relabel/relabel.h
-SOURCES += relabel/relabel.cpp
-
-# Mount dialog
-HEADERS += mount/mount.h
-SOURCES += mount/mount.cpp
-
-# Run dialog
-HEADERS += run/run.h
-SOURCES += run/run.cpp run/runcmd.cpp run/estimate.cpp run/prune.cpp
-
-# Select dialog
-HEADERS += select/select.h
-SOURCES += select/select.cpp
-
-## MediaList
-HEADERS += medialist/medialist.h
-SOURCES += medialist/medialist.cpp
-
-## MediaEdit
-HEADERS += mediaedit/mediaedit.h
-SOURCES += mediaedit/mediaedit.cpp
-
-## JobList
-HEADERS += joblist/joblist.h
-SOURCES += joblist/joblist.cpp
-
-## Clients
-HEADERS += clients/clients.h
-SOURCES += clients/clients.cpp
-
-## Storage
-HEADERS += storage/storage.h
-SOURCES += storage/storage.cpp
-
-## Fileset
-HEADERS += fileset/fileset.h
-SOURCES += fileset/fileset.cpp
-
-## Job log
-HEADERS += joblog/joblog.h
-SOURCES += joblog/joblog.cpp
-
-## Jobs
-HEADERS += jobs/jobs.h
-SOURCES += jobs/jobs.cpp
-
-## RestoreTree
-HEADERS += restore/restoretree.h
-SOURCES += restore/restoretree.cpp
-
-## Job Step Graphs
-qwt {
-  HEADERS += jobgraphs/jobplot.h
-  SOURCES += jobgraphs/jobplot.cpp
-}
-
-# Help dialog
-HEADERS += help/help.h
-SOURCES += help/help.cpp
-
-## Status Dir
-HEADERS += status/dirstat.h
-SOURCES += status/dirstat.cpp
-
-## Status Client
-HEADERS += status/clientstat.h
-SOURCES += status/clientstat.cpp
-
-## Status Client
-HEADERS += status/storstat.h
-SOURCES += status/storstat.cpp
-
-# Utility sources
-HEADERS += util/fmtwidgetitem.h util/comboutil.h
-SOURCES += util/fmtwidgetitem.cpp util/comboutil.cpp
-
-INSTALLS += bins
-INSTALLS += confs
-
-QMAKE_EXTRA_TARGETS += depend
-
-TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts

diff --git a/bacula/src/version.h b/bacula/src/version.h
index ecaf2a7119ff4b662edee7c58e297da8486aefb3..ea8d190ac3e603f7e495d4392ec98a509d473c18 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.12"
-#define BDATE   "06 October 2008"
-#define LSMDATE "06Oct08"
+#define BDATE   "07 October 2008"
+#define LSMDATE "07Oct08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 6de0539a33bb4e3872dad5a6566dc6caaaed8dd2..10ef3a00b7a5054cccfa855b28f9d0b8d053c77d 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -17,6 +17,8 @@ dbdriver
 remove reader/writer in FOPTS????
 
 General:
+07Oct08
+kes  Fix bat build for Win32.
 06Oct08
 kes  Copy plugin link field into ffpkt.
 05Oct08