X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=bacula%2Fsrc%2Fqt-console%2Fmake-win32;h=d064ba9400b6ec392570f8726713cad00ebfdd2a;hb=10cfd798ced2d27f61ead2de6fe9b1bcc8e3468d;hp=c347e9beea01db9640925966748a3d18d1ac8388;hpb=c19da45cb24df010ee83ff1959d264b807856907;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32
index c347e9beea..d064ba9400 100755
--- a/bacula/src/qt-console/make-win32
+++ b/bacula/src/qt-console/make-win32
@@ -1,37 +1,77 @@
 #!/bin/sh
 #
-#  Used to build the Win32 version of bat
+#  Used to build the Win32/Win64 version of bat
 #
+#
+# Copyright (C) 2000-2018 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
+prepare_bat_build ()
+{
+   local version=$1
+   local dpkgs_mingw
+   if test -d ../win32/release${version}; then
+
+
+      if [ ${version} -eq 32 ]
+      then
+        depkgs_mingw='depkgs-mingw32'
+
+      elif [ ${version} -eq 64 ]
+      then
+        depkgs_mingw='depkgs-mingw-w64'
+      else
+        echo "wrong version - '${version}'."
+        exit 1
+      fi
+
+      cp -f ${DEPKGS}/${depkgs_mingw}/lib/qt/QtGui4.dll ../win32/release${version}
+      cp -f ${DEPKGS}/${depkgs_mingw}/lib/qt/QtCore4.dll ../win32/release${version}
+
+      rm -rf ../win32/release${version}/help
+      mkdir ../win32/release${version}/help
+      cp -f help/*.html ../win32/release${version}/help/
+      cp -f images/status.png ../win32/release${version}/help/
+      cp -f images/mail-message-new.png ../win32/release${version}/help/
+      qmake -spec win32 -unix -o Makefile.mingw${version} bat.pro.mingw${version}
+      echo "Make Windows bat"
+      make -j3 -f Makefile.mingw${version} $2
+      if test -f release/bat.exe; then
+         cp -f release/bat.exe ../win32/release${version}
+      else
+         cp -f debug/bat.exe ../win32/release${version}
+      fi
+   fi
+}
+
+prepare_tray_monitor_build ()
+{
+    local version=$1
+    cd tray-monitor
+    qmake -spec ../win32 -unix -o Makefile.mingw${version} tray-monitor.pro.mingw${version}
+    echo "Make Windows tray-monitor"
+    make -j3 -f Makefile.mingw${version} $2
+    if test -f release/bacula-tray-monitor.exe; then
+       cp -f release/bacula-tray-monitor.exe ../../win32/release${version}
+    else
+       cp -f debug/bacula-tray-monitor.exe ../../win32/release${version}
+    fi
+    rm -f release/bacula-tray-monitor.exe debug/bacula-tray-monitor.exe
+    cd ..
+}
+
+readonly BUILD_ARCH="$1"
+
 rm -f debug/bat.exe
 if test -f ../config.h ; then
    mv -f ../config.h ../config.h.orig
 fi
-qmake -spec win32 -unix -o Makefile.mingw32 bat.pro.mingw32
-make -j3 -f Makefile.mingw32 $1
+
+prepare_bat_build ${BUILD_ARCH:-64}
+
 if test -e ../config.h.orig ; then
    mv -f ../config.h.orig ../config.h
 fi
-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
 
-cd tray-monitor
-qmake -spec ../win32 -unix -o Makefile.mingw32 tray-monitor.pro
-make -j3 -f Makefile.mingw32 $1
-if test -f release/bacula-tray-monitor.exe; then
-      cp -f release/bacula-tray-monitor.exe ../../win32/release32
-else
-      cp -f debug/bacula-tray-monitor.exe ../../win32/release32
-fi 
-cd ..
+#prepare_tray_monitor_build ${BUILD_ARCH:-64}