From 160925cea6959ce6b0294119be247b3a6fcd24a0 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 2 Jan 2011 11:13:51 +0100
Subject: [PATCH] Remove tray-monitor from Win32 build

---
 bacula/src/win32/filed/Makefile       |  12 +-
 bacula/src/win32/lib/bacula32.def     |   1 +
 bacula/src/win32/lib/bacula64.def     |   1 +
 bacula/src/win32/libwin32/main.cpp    |   4 +-
 bacula/src/win32/libwin32/service.cpp |   2 +-
 bacula/src/win32/stored/Makefile      | 194 +++++++++++++-------------
 6 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index 7a2694ba5d..2862fc8203 100644
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -23,12 +23,14 @@ INCLUDES = \
 	$(INCLUDE_ICONS)
 
 DEFINES = \
-	-DHAVE_TRAY_MONITOR \
 	-DUSING_DLL \
 	-DWIN32_VSS \
 	-DWINVER=0x500 \
 	$(HAVES)
 
+#	-DHAVE_TRAY_MONITOR \
+
+
 vpath %.c $(MAINDIR)/src/filed $(BUILDDIR)/libwin32
 vpath %.cpp $(MAINDIR)/src/filed $(BUILDDIR)/libwin32
 
@@ -53,14 +55,16 @@ FILED_OBJS = \
 	$(OBJDIR)/vss_XP.o \
 	$(OBJDIR)/vss_W2K3.o \
 	$(OBJDIR)/vss_Vista.o \
-	$(OBJDIR)/aboutDialog.o \
 	$(OBJDIR)/service.o \
-	$(OBJDIR)/statusDialog.o \
-	$(OBJDIR)/trayMonitor.o \
 	$(OBJDIR)/xattr.o \
 	$(OBJDIR)/main.o \
 	$(OBJDIR)/bacula.res
 
+#	$(OBJDIR)/trayMonitor.o \
+#	$(OBJDIR)/aboutDialog.o \
+#	$(OBJDIR)/statusDialog.o \
+
+
 ALL_OBJS = $(FILED_OBJS)
 
 FILED_LIBS = \
diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def
index 365138f8bb..97dd749746 100644
--- a/bacula/src/win32/lib/bacula32.def
+++ b/bacula/src/win32/lib/bacula32.def
@@ -454,6 +454,7 @@ _Z13is_an_integerPKc
 _Z13is_name_validPcPS_
 _Z13str_to_uint64Pc
 _Z14size_to_uint64PciPy
+_Z15speed_to_uint64PciPy
 _Z17duration_to_utimePcPx
 _Z22edit_int64_with_commasxPc
 _Z23edit_uint64_with_commasyPc
diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def
index dc508b52f1..a55f76b774 100644
--- a/bacula/src/win32/lib/bacula64.def
+++ b/bacula/src/win32/lib/bacula64.def
@@ -447,6 +447,7 @@ _Z13is_an_integerPKc
 _Z13is_name_validPcPS_
 _Z13str_to_uint64Pc
 _Z14size_to_uint64PciPy
+_Z15speed_to_uint64PciPy
 _Z17duration_to_utimePcPx
 _Z22edit_int64_with_commasxPc
 _Z23edit_uint64_with_commasyPc
diff --git a/bacula/src/win32/libwin32/main.cpp b/bacula/src/win32/libwin32/main.cpp
index b7335783f7..2c28b34d16 100644
--- a/bacula/src/win32/libwin32/main.cpp
+++ b/bacula/src/win32/libwin32/main.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -30,8 +30,6 @@
  * 
  *  Kern Sibbald, August 2007
  *
- *  Version $Id$
- *
  * Note, some of the original Bacula Windows startup and service handling code
  *  was derived from VNC code that was used in apcupsd then ported to 
  *  Bacula.  However, since then the code has been significantly enhanced 
diff --git a/bacula/src/win32/libwin32/service.cpp b/bacula/src/win32/libwin32/service.cpp
index 4537f791fe..630abef558 100644
--- a/bacula/src/win32/libwin32/service.cpp
+++ b/bacula/src/win32/libwin32/service.cpp
@@ -110,7 +110,7 @@ void WINAPI serviceStartCallback(DWORD argc, char **argv)
       return;
    }
 
-   service_status.dwServiceType = SERVICE_WIN32|SERVICE_INTERACTIVE_PROCESS;
+   service_status.dwServiceType = SERVICE_WIN32;
    service_status.dwServiceSpecificExitCode = 0;
 
    /* Report status */
diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index 443bf4451f..5b8399dc57 100644
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -10,20 +10,22 @@
 include ../Makefile.inc
 
 INCLUDES = \
-	-I. \
-	-I$(MAINDIR)/src/stored \
-	$(INCLUDE_DDK) \
-	$(INCLUDE_PTHREADS) \
-	$(INCLUDE_BACULA) \
-	$(INCLUDE_ZLIB) \
-	$(INCLUDE_OPENSSL) \
-	$(INCLUDE_ICONS)
+        -I. \
+        -I$(MAINDIR)/src/stored \
+        $(INCLUDE_DDK) \
+        $(INCLUDE_PTHREADS) \
+        $(INCLUDE_BACULA) \
+        $(INCLUDE_ZLIB) \
+        $(INCLUDE_OPENSSL) \
+        $(INCLUDE_ICONS)
 
 DEFINES = \
-	-DHAVE_TRAY_MONITOR \
-	-DUSING_DLL \
-	-DWINVER=0x500 \
-	$(HAVES)
+        -DUSING_DLL \
+        -DWINVER=0x500 \
+        $(HAVES)
+
+#       -DHAVE_TRAY_MONITOR \
+
 
 vpath %.c $(MAINDIR)/src/stored $(BUILDDIR)/libwin32
 vpath %.cpp $(MAINDIR)/src/stored $(BUILDDIR)/libwin32
@@ -31,75 +33,77 @@ vpath %.cpp $(MAINDIR)/src/stored $(BUILDDIR)/libwin32
 ##########################################################################
 
 COMMON_OBJS = \
-	$(OBJDIR)/acquire.o \
-	$(OBJDIR)/ansi_label.o \
-	$(OBJDIR)/autochanger.o \
-	$(OBJDIR)/block.o \
-	$(OBJDIR)/butil.o \
-	$(OBJDIR)/dev.o \
-	$(OBJDIR)/device.o \
-	$(OBJDIR)/dvd.o \
-	$(OBJDIR)/ebcdic.o \
-	$(OBJDIR)/label.o \
-	$(OBJDIR)/lock.o \
-	$(OBJDIR)/match_bsr.o \
-	$(OBJDIR)/mount.o \
-	$(OBJDIR)/parse_bsr.o \
-	$(OBJDIR)/read_record.o \
-	$(OBJDIR)/record.o \
-	$(OBJDIR)/reserve.o \
-	$(OBJDIR)/scan.o \
-	$(OBJDIR)/spool.o \
-	$(OBJDIR)/stored_conf.o \
-	$(OBJDIR)/vol_mgr.o \
-	$(OBJDIR)/wait.o \
-	$(OBJDIR)/mtops.o
+        $(OBJDIR)/acquire.o \
+        $(OBJDIR)/ansi_label.o \
+        $(OBJDIR)/autochanger.o \
+        $(OBJDIR)/block.o \
+        $(OBJDIR)/butil.o \
+        $(OBJDIR)/dev.o \
+        $(OBJDIR)/device.o \
+        $(OBJDIR)/dvd.o \
+        $(OBJDIR)/ebcdic.o \
+        $(OBJDIR)/label.o \
+        $(OBJDIR)/lock.o \
+        $(OBJDIR)/match_bsr.o \
+        $(OBJDIR)/mount.o \
+        $(OBJDIR)/parse_bsr.o \
+        $(OBJDIR)/read_record.o \
+        $(OBJDIR)/record.o \
+        $(OBJDIR)/reserve.o \
+        $(OBJDIR)/scan.o \
+        $(OBJDIR)/spool.o \
+        $(OBJDIR)/stored_conf.o \
+        $(OBJDIR)/vol_mgr.o \
+        $(OBJDIR)/wait.o \
+        $(OBJDIR)/mtops.o
 
 # bacula-sd
 SD_OBJS = \
-	$(OBJDIR)/stored.o \
-	$(OBJDIR)/append.o \
-	$(OBJDIR)/askdir.o \
-	$(OBJDIR)/authenticate.o \
-	$(OBJDIR)/dircmd.o \
-	$(OBJDIR)/fd_cmds.o \
-	$(OBJDIR)/job.o \
-	$(OBJDIR)/mac.o \
-	$(OBJDIR)/pythonsd.o \
-	$(OBJDIR)/read.o \
-	$(OBJDIR)/sd_plugins.o \
-	$(OBJDIR)/status.o
+        $(OBJDIR)/stored.o \
+        $(OBJDIR)/append.o \
+        $(OBJDIR)/askdir.o \
+        $(OBJDIR)/authenticate.o \
+        $(OBJDIR)/dircmd.o \
+        $(OBJDIR)/fd_cmds.o \
+        $(OBJDIR)/job.o \
+        $(OBJDIR)/mac.o \
+        $(OBJDIR)/pythonsd.o \
+        $(OBJDIR)/read.o \
+        $(OBJDIR)/sd_plugins.o \
+        $(OBJDIR)/status.o
 
 # bextract
 BEXTRACT_OBJS = \
-	$(OBJDIR)/bextract.o \
-	$(OBJDIR)/pythonsd.o
+        $(OBJDIR)/bextract.o \
+        $(OBJDIR)/pythonsd.o
 
 OBJS_WIN = \
-	$(OBJDIR)/aboutDialog.o \
-	$(OBJDIR)/service.o \
-	$(OBJDIR)/statusDialog.o \
-	$(OBJDIR)/trayMonitor.o \
-	$(OBJDIR)/main.o \
-	$(OBJDIR)/bacula.res
+        $(OBJDIR)/aboutDialog.o \
+        $(OBJDIR)/service.o \
+        $(OBJDIR)/statusDialog.o \
+        $(OBJDIR)/main.o \
+        $(OBJDIR)/bacula.res
+
+#       $(OBJDIR)/trayMonitor.o \
+
 
 ALL_OBJS = \
-	$(COMMON_OBJS) \
-	$(SD_OBJS) \
-	$(BEXTRACT_OBJS) \
-	$(OBJS_WIN) \
-	$(OBJDIR)/bcopy.o \
-	$(OBJDIR)/bls.o \
-	$(OBJDIR)/btape.o \
-	$(OBJDIR)/bscan.o
+        $(COMMON_OBJS) \
+        $(SD_OBJS) \
+        $(BEXTRACT_OBJS) \
+        $(OBJS_WIN) \
+        $(OBJDIR)/bcopy.o \
+        $(OBJDIR)/bls.o \
+        $(OBJDIR)/btape.o \
+        $(OBJDIR)/bscan.o
 
 LIBS_STORED = \
-	$(LIBS_PTHREADS) \
-	$(LIBS_NETWORK) \
-	-lole32 \
-	-loleaut32 \
-	-luuid \
-	-lcomctl32
+        $(LIBS_PTHREADS) \
+        $(LIBS_NETWORK) \
+        -lole32 \
+        -loleaut32 \
+        -luuid \
+        -lcomctl32
 
 ######################################################################
 
@@ -107,53 +111,53 @@ LIBS_STORED = \
 
 .PHONY: all clean
 
-all:	$(BINDIR)/bacula-sd.exe $(BINDIR)/bcopy.exe $(BINDIR)/bextract.exe \
-	$(BINDIR)/bls.exe $(BINDIR)/bscan.exe $(BINDIR)/btape.exe
+all:    $(BINDIR)/bacula-sd.exe $(BINDIR)/bcopy.exe $(BINDIR)/bextract.exe \
+        $(BINDIR)/bls.exe $(BINDIR)/bscan.exe $(BINDIR)/btape.exe
 
 clean:
-	@echo "Cleaning `pwd`"
-	$(call clean_obj,$(ALL_OBJS))
-	$(call clean_exe,$(BINDIR)/bacula-sd.exe)
-	$(call clean_exe,$(BINDIR)/bcopy.exe)
-	$(call clean_exe,$(BINDIR)/bextract.exe)
-	$(call clean_exe,$(BINDIR)/bls.exe)
-	$(call clean_exe,$(BINDIR)/bscan.exe)
-	$(call clean_exe,$(BINDIR)/btape.exe)
-	$(ECHO_CMD)rm -rf $(OBJDIRS)
+        @echo "Cleaning `pwd`"
+        $(call clean_obj,$(ALL_OBJS))
+        $(call clean_exe,$(BINDIR)/bacula-sd.exe)
+        $(call clean_exe,$(BINDIR)/bcopy.exe)
+        $(call clean_exe,$(BINDIR)/bextract.exe)
+        $(call clean_exe,$(BINDIR)/bls.exe)
+        $(call clean_exe,$(BINDIR)/bscan.exe)
+        $(call clean_exe,$(BINDIR)/btape.exe)
+        $(ECHO_CMD)rm -rf $(OBJDIRS)
 
 realclean: clean
-	rm -f tags bacula-sd.conf
+        rm -f tags bacula-sd.conf
 
 #
 # Rules
 #
 
 $(BINDIR)/bacula-sd.exe: $(SD_OBJS) $(COMMON_OBJS) $(OBJS_WIN) $(LIBS_BACULA)
-	$(call link_winapp,$(LIBS_STORED))
+        $(call link_winapp,$(LIBS_STORED))
 
 $(BINDIR)/btape.exe: $(OBJDIR)/btape.o $(COMMON_OBJS) $(LIBS_BACULA)
-	$(call link_conapp,$(LIBS_STORED))
+        $(call link_conapp,$(LIBS_STORED))
 
 $(BINDIR)/bls.exe: $(OBJDIR)/bls.o $(COMMON_OBJS) $(LIBS_BACULA)
-	$(call link_conapp,$(LIBS_STORED))
+        $(call link_conapp,$(LIBS_STORED))
 
 $(BINDIR)/bextract.exe: $(BEXTRACT_OBJS) $(COMMON_OBJS) $(LIBS_BACULA)
-	$(call link_conapp,$(LIBS_STORED) $(LIBS_ZLIB))
+        $(call link_conapp,$(LIBS_STORED) $(LIBS_ZLIB))
 
 $(BINDIR)/bscan.exe: $(OBJDIR)/bscan.o $(COMMON_OBJS) $(LIBS_CATS) $(LIBS_BACULA)
-	$(call link_conapp,$(LIBS_STORED))
+        $(call link_conapp,$(LIBS_STORED))
 
 $(BINDIR)/bcopy.exe: $(OBJDIR)/bcopy.o $(COMMON_OBJS) $(LIBS_BACULA)
-	$(call link_conapp,$(LIBS_STORED))
+        $(call link_conapp,$(LIBS_STORED))
 
 $(OBJDIR)/mtops.o: mtops.cpp
-	@echo "Compiling $@"
-	$(call checkdir,$@)
-	$(ECHO_CMD)$(CXX) $(CFLAGS) $(INCLUDE_DDK) -I../../stored -c $< -o $@
-
-$(OBJDIR)/winres.res:	  baculasd/winres.rc
-	@echo "Compiling $@"
-	$(call checkdir,$@)
-	$(ECHO_CMD)$(WINDRES) $(INCLUDE_ICONS) -I baculasd -O coff $< -o $@
+        @echo "Compiling $@"
+        $(call checkdir,$@)
+        $(ECHO_CMD)$(CXX) $(CFLAGS) $(INCLUDE_DDK) -I../../stored -c $< -o $@
+
+$(OBJDIR)/winres.res:     baculasd/winres.rc
+        @echo "Compiling $@"
+        $(call checkdir,$@)
+        $(ECHO_CMD)$(WINDRES) $(INCLUDE_ICONS) -I baculasd -O coff $< -o $@
 
 include ../Makefile.rules
-- 
2.39.5