From c89753ebdf771309dc0f23dffc23967d333708df Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 19 Apr 2006 20:49:26 +0000 Subject: [PATCH] Tweak Win32 build git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2946 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/filed/win32/winmain.cpp | 6 ++-- bacula/src/filed/win32/winservice.cpp | 5 +-- bacula/src/filed/win32/winservice.h | 6 ++-- bacula/src/lib/crypto.c | 2 +- bacula/src/lib/openssl.c | 2 +- bacula/src/lib/tls.c | 2 +- bacula/src/win32/baculafd/baculafd.mak | 44 +++++++++++++------------- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/bacula/src/filed/win32/winmain.cpp b/bacula/src/filed/win32/winmain.cpp index a12030481a..2cda05ad2b 100755 --- a/bacula/src/filed/win32/winmain.cpp +++ b/bacula/src/filed/win32/winmain.cpp @@ -40,6 +40,7 @@ extern void d_msg(const char *, int, int, const char *, ...); HINSTANCE hAppInstance; const char *szAppName = "Bacula"; DWORD mainthreadId; +bool silent = false; /* Imported variables */ extern DWORD g_servicethread; @@ -61,7 +62,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, char *szCmdLine = CmdLine; char *wordPtr, *tempPtr; int i, quote; - bool silent = false; /* Save the application instance and main thread id */ hAppInstance = hInstance; @@ -182,14 +182,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, /* /install */ if (strncmp(&szCmdLine[i], BaculaInstallService, strlen(BaculaInstallService)) == 0) { /* Install Bacula as a service */ - bacService::InstallService(silent); + bacService::InstallService(); i += strlen(BaculaInstallService); continue; } /* /remove */ if (strncmp(&szCmdLine[i], BaculaRemoveService, strlen(BaculaRemoveService)) == 0) { /* Remove the Bacula service */ - bacService::RemoveService(silent); + bacService::RemoveService(); i += strlen(BaculaRemoveService); continue; } diff --git a/bacula/src/filed/win32/winservice.cpp b/bacula/src/filed/win32/winservice.cpp index 4d803e9ae0..a1c7ddd009 100755 --- a/bacula/src/filed/win32/winservice.cpp +++ b/bacula/src/filed/win32/winservice.cpp @@ -55,6 +55,7 @@ void set_service_description(SC_HANDLE hSCManager, SC_HANDLE hService, bacService init; extern DWORD g_platform_id; +extern bool silent; bacService::bacService() { @@ -343,7 +344,7 @@ void ServiceStop() // SERVICE INSTALL ROUTINE int -bacService::InstallService(bool silent) +bacService::InstallService() { const int pathlength = 2048; char path[pathlength]; @@ -484,7 +485,7 @@ _("Provides file backup and restore services. Bacula -- the network backup solut // SERVICE REMOVE ROUTINE int -bacService::RemoveService(bool silent) +bacService::RemoveService() { // How to remove the Bacula service depends upon the OS switch (g_platform_id) { diff --git a/bacula/src/filed/win32/winservice.h b/bacula/src/filed/win32/winservice.h index 06622ca994..157dea3b18 100755 --- a/bacula/src/filed/win32/winservice.h +++ b/bacula/src/filed/win32/winservice.h @@ -52,13 +52,13 @@ public: // Routine called by WinMain to cause Bacula to be installed // as a service. - int BaculaServiceMain(); + static int BaculaServiceMain(); // Routine to install the Apcupsd service on the local machine - int InstallService(bool silent); + static int InstallService(); // Routine to remove the Apcupsd service from the local machine - int RemoveService(bool silent); + static int RemoveService(); // SERVICE SUPPORT FUNCTIONS diff --git a/bacula/src/lib/crypto.c b/bacula/src/lib/crypto.c index 7cc359c2a3..c450b2bcaa 100644 --- a/bacula/src/lib/crypto.c +++ b/bacula/src/lib/crypto.c @@ -19,7 +19,7 @@ * license please contact Landon Fuller . */ /* - Copyright (C) 2005 Kern Sibbald + Copyright (C) 2005-2006 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c index 929dee7c26..2cf1a3fd1a 100644 --- a/bacula/src/lib/openssl.c +++ b/bacula/src/lib/openssl.c @@ -19,7 +19,7 @@ * license please contact Landon Fuller . */ /* - Copyright (C) 2005 Kern Sibbald + Copyright (C) 2005-2006 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/bacula/src/lib/tls.c b/bacula/src/lib/tls.c index 978e1aede9..0f5c3d2084 100644 --- a/bacula/src/lib/tls.c +++ b/bacula/src/lib/tls.c @@ -22,7 +22,7 @@ * Landon Fuller . */ /* - Copyright (C) 2005 Kern Sibbald + Copyright (C) 2005-2006 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak index 1fe3accd99..7f13588797 100644 --- a/bacula/src/win32/baculafd/baculafd.mak +++ b/bacula/src/win32/baculafd/baculafd.mak @@ -57,11 +57,11 @@ CLEAN : -@erase "$(INTDIR)\bsys.obj" -@erase "$(INTDIR)\btime.obj" -@erase "$(INTDIR)\btimers.obj" - -@erase "$(INTDIR)\chksum.obj" -@erase "$(INTDIR)\compat.obj" -@erase "$(INTDIR)\cram-md5.obj" -@erase "$(INTDIR)\crc32.obj" -@erase "$(INTDIR)\create_file.obj" + -@erase "$(INTDIR)\crypto.obj" -@erase "$(INTDIR)\daemon.obj" -@erase "$(INTDIR)\dlist.obj" -@erase "$(INTDIR)\edit.obj" @@ -154,11 +154,11 @@ LINK32_OBJS= \ "$(INTDIR)\bsys.obj" \ "$(INTDIR)\btime.obj" \ "$(INTDIR)\btimers.obj" \ - "$(INTDIR)\chksum.obj" \ "$(INTDIR)\compat.obj" \ "$(INTDIR)\cram-md5.obj" \ "$(INTDIR)\crc32.obj" \ "$(INTDIR)\create_file.obj" \ + "$(INTDIR)\crypto.obj" \ "$(INTDIR)\daemon.obj" \ "$(INTDIR)\dlist.obj" \ "$(INTDIR)\edit.obj" \ @@ -271,8 +271,6 @@ CLEAN : -@erase "$(INTDIR)\btime.sbr" -@erase "$(INTDIR)\btimers.obj" -@erase "$(INTDIR)\btimers.sbr" - -@erase "$(INTDIR)\chksum.obj" - -@erase "$(INTDIR)\chksum.sbr" -@erase "$(INTDIR)\compat.obj" -@erase "$(INTDIR)\compat.sbr" -@erase "$(INTDIR)\cram-md5.obj" @@ -281,6 +279,8 @@ CLEAN : -@erase "$(INTDIR)\crc32.sbr" -@erase "$(INTDIR)\create_file.obj" -@erase "$(INTDIR)\create_file.sbr" + -@erase "$(INTDIR)\crypto.obj" + -@erase "$(INTDIR)\crypto.sbr" -@erase "$(INTDIR)\daemon.obj" -@erase "$(INTDIR)\daemon.sbr" -@erase "$(INTDIR)\dlist.obj" @@ -430,11 +430,11 @@ BSC32_SBRS= \ "$(INTDIR)\bsys.sbr" \ "$(INTDIR)\btime.sbr" \ "$(INTDIR)\btimers.sbr" \ - "$(INTDIR)\chksum.sbr" \ "$(INTDIR)\compat.sbr" \ "$(INTDIR)\cram-md5.sbr" \ "$(INTDIR)\crc32.sbr" \ "$(INTDIR)\create_file.sbr" \ + "$(INTDIR)\crypto.sbr" \ "$(INTDIR)\daemon.sbr" \ "$(INTDIR)\dlist.sbr" \ "$(INTDIR)\edit.sbr" \ @@ -520,11 +520,11 @@ LINK32_OBJS= \ "$(INTDIR)\bsys.obj" \ "$(INTDIR)\btime.obj" \ "$(INTDIR)\btimers.obj" \ - "$(INTDIR)\chksum.obj" \ "$(INTDIR)\compat.obj" \ "$(INTDIR)\cram-md5.obj" \ "$(INTDIR)\crc32.obj" \ "$(INTDIR)\create_file.obj" \ + "$(INTDIR)\crypto.obj" \ "$(INTDIR)\daemon.obj" \ "$(INTDIR)\dlist.obj" \ "$(INTDIR)\edit.obj" \ @@ -944,97 +944,97 @@ SOURCE=..\lib\btimers.cpp !ENDIF -SOURCE=..\filed\chksum.cpp +SOURCE=..\compat\compat.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\chksum.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\compat.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\chksum.obj" "$(INTDIR)\chksum.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\compat.obj" "$(INTDIR)\compat.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - -SOURCE=..\compat\compat.cpp +SOURCE="..\lib\cram-md5.cpp" !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\compat.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\cram-md5.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\compat.obj" "$(INTDIR)\compat.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\cram-md5.obj" "$(INTDIR)\cram-md5.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -SOURCE="..\lib\cram-md5.cpp" +SOURCE=..\lib\crc32.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\cram-md5.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\cram-md5.obj" "$(INTDIR)\cram-md5.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\crc32.obj" "$(INTDIR)\crc32.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -SOURCE=..\lib\crc32.cpp +SOURCE=..\findlib\create_file.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\create_file.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\crc32.obj" "$(INTDIR)\crc32.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\create_file.obj" "$(INTDIR)\create_file.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -SOURCE=..\findlib\create_file.cpp +SOURCE=..\findlib\crypto.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -"$(INTDIR)\create_file.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\crypto.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "baculafd - Win32 Debug" -"$(INTDIR)\create_file.obj" "$(INTDIR)\create_file.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\crypto.obj" "$(INTDIR)\crypto.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF + SOURCE=..\lib\daemon.cpp !IF "$(CFG)" == "baculafd - Win32 Release" -- 2.39.5