Massive bat notifier rewrite + fix seg fault + implement text input dialog

[bacula/bacula] / bacula / src / qt-console / make-win32

diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32
index 4de01cf1b0f71e39dcc164cbbabe1e021c4bfdda..b9be654f279495d5cd679dbfe768619f648af3a0 100755 (executable)
--- a/bacula/src/qt-console/make-win32
+++ b/bacula/src/qt-console/make-win32
@@ -3,7 +3,7 @@
 #  Used to build the Win32 version of bat
 #
 rm -f debug/bat.exe
-if test -e ../config.h ; then
+if test -f ../config.h ; then
    mv -f ../config.h ../config.h.orig
 fi
 qmake -spec win32 -unix -o Makefile.mingw32 bat.pro.mingw32
@@ -11,6 +11,17 @@ make -j3 -f Makefile.mingw32 $1
 if test -e ../config.h.orig ; then
    mv -f ../config.h.orig ../config.h
 fi
-if test -d ../win32/release; then
-   cp -f debug/bat.exe ../win32/release
+if test -d ../win32/release32; then
+   if test -f release/bat.exe; then
+      cp -f release/bat.exe ../win32/release32
+   else
+      cp -f debug/bat.exe ../win32/release32
+   fi 
+   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