From: Eric Bollengier Date: Wed, 4 Jan 2012 12:54:47 +0000 (+0100) Subject: tweak bat files X-Git-Tag: Release-7.0.0~375 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92cf99357374d2e2af2ee9c6dd5c54862993dd77;p=bacula%2Fbacula tweak bat files --- diff --git a/bacula/src/qt-console/README.mingw32 b/bacula/src/qt-console/README.mingw32 index 55ada98671..0422c1ffca 100644 --- a/bacula/src/qt-console/README.mingw32 +++ b/bacula/src/qt-console/README.mingw32 @@ -52,11 +52,7 @@ $ wine qt-win-opensource-4.3.5-mingw.exe * Install under c:\Qt (no space) * no worry about mingw installation -$ cd ~/.wine/drive_c/Qt/4.3.5/ -$ find src -type d -o -name '*.h' | cpio -pmv /tmp/depkgs-mingw32/include -or $ cp -r ~/.wine/drive_c/Qt/4.3.5/src/ depkgs-mingw32/include - $ cp -r ~/.wine/drive_c/Qt/4.3.5/include depkgs-mingw32/include/qt $ cp -r ~/.wine/drive_c/Qt/4.3.5/lib depkgs-mingw32/lib/qt # cp ~/.wine/drive_c/Qt/4.3.5/bin/QtCore4.dll src/win32/release32 diff --git a/bacula/src/qt-console/job/job.ui b/bacula/src/qt-console/job/job.ui index f112a2c513..6f3305cbe6 100644 --- a/bacula/src/qt-console/job/job.ui +++ b/bacula/src/qt-console/job/job.ui @@ -643,7 +643,7 @@ Running Information - + diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32 index 295023ec31..5b1bab2e6e 100755 --- a/bacula/src/qt-console/make-win32 +++ b/bacula/src/qt-console/make-win32 @@ -1,12 +1,11 @@ #!/bin/sh # -# Used to build the Windows version of bat and the tray-monitor +# Used to build the Win32 version of bat # rm -f debug/bat.exe if test -f ../config.h ; then mv -f ../config.h ../config.h.orig fi -# Create bat Makefile.mingw32 qmake -spec win32 -unix -o Makefile.mingw32 bat.pro.mingw32 echo "Make Windows bat" make -j3 -f Makefile.mingw32 $1 @@ -30,7 +29,6 @@ fi cd tray-monitor rm -f release/bacula-tray-monitor.exe debug/bacula-tray-monitor.exe -# Create tray-monitor Makefile.mingw32 qmake -spec ../win32 -unix -o Makefile.mingw32 tray-monitor.pro echo "Make Windows tray-monitor" make -j3 -f Makefile.mingw32 $1