From e9305bbfe63210ac3bc2c219bcf7e5e1d2a515ff Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 26 Nov 2020 20:50:31 +0100
Subject: [PATCH] Tweak signing process

---
 bacula/src/qt-console/make-win32          | 3 ---
 bacula/src/win32/Makefile                 | 4 ++++
 bacula/src/win32/win32_installer/Makefile | 2 ++
 bacula/src/win32/win64_installer/Makefile | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32
index 41056d980..80e262c05 100755
--- a/bacula/src/qt-console/make-win32
+++ b/bacula/src/qt-console/make-win32
@@ -37,7 +37,6 @@ prepare_regw_build()
       echo "Make Windows RegistrationWizard"
       make -j3 -f Makefile.mingw${version} $2
       if test -f RegistrationWizard.exe; then
-          ../../win32/sign-binaries RegistrationWizard.exe
           cp -f RegistrationWizard.exe ../../win32/release${version}
       fi
       rm -f RegistrationWizard.exe
@@ -97,7 +96,6 @@ prepare_bat_build ()
       else
          cp -f debug/bat.exe ../win32/release${version}
       fi
-      ../win32/sign-binaries ../win32/release${version}/bat.exe
       rm -f bat.exe release/bat.exe debug/bat.exe
    fi
 }
@@ -123,7 +121,6 @@ prepare_tray_monitor_build ()
     else
        cp -f debug/bacula-tray-monitor.exe ../../win32/release${version}
     fi
-    ../../win32/sign-binaries ../../win32/release${version}/bacula-tray-monitor.exe
     rm -f bacula-tray-monitor.exe release/bacula-tray-monitor.exe debug/bacula-tray-monitor.exe
     cd ..
 }
diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 99af11002..c7e605ff8 100644
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -57,12 +57,16 @@ is_depkgs_set:
 release32/bat.exe: is_depkgs_set
 	( cd ../qt-console; ./make-win32 "32" )
 	test -f release32/bat.exe
+	test -f release32/bacula-tray-monitor.exe
+	./sign-binaries release32/bat.exe release32/bacula-tray-monitor.exe release32/RegistrationWizard.exe release32/Qt*dll release32/q*.dll
 
 bat32: release32/bat.exe
 
 release64/bat.exe: is_depkgs_set
 	( cd ../qt-console; ./make-win32 "64" )
 	test -f release64/bat.exe
+	test -f release64/bacula-tray-monitor.exe
+	./sign-binaries release64/bat.exe release64/bacula-tray-monitor.exe release64/RegistrationWizard.exe release64/Qt*dll release64/q*.dll
 
 bat64: release64/bat.exe
 
diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 3493d10e3..a76edbee9 100644
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -133,11 +133,13 @@ release32/$$(notdir $(1)): $(1)
 	$$(call checkdir,$$@)
 	$(ECHO_CMD)cp -f $$^ $$@ ; \
 	$(STAB2CV) $$@
+	$(BUILDDIR)/sign-binaries release32/$$(notdir $(1))
 endef
 
 define Copy_Binary
 release32/$$(notdir $(1)): $(1)
 	$$(call checkdir,$$@)
+	$(BUILDDIR)/sign-binaries $$^
 	$(ECHO_CMD)cp -f $$^ $$@
 endef
 
diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index abf6278d2..1f0a03082 100644
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -161,12 +161,14 @@ docs:
 define Convert_Binary
 release64/$$(notdir $(1)): $(1)
 	$$(call checkdir,$$@)
+	$(BUILDDIR)/sign-binaries $$^
 	$(ECHO_CMD)cp -f $$^ $$@
 endef
 
 define Copy_Binary
 release64/$$(notdir $(1)): $(1)
 	$$(call checkdir,$$@)
+	$(BUILDDIR)/sign-binaries $$^
 	$(ECHO_CMD)cp -f $$^ $$@
 endef
 
-- 
2.47.3