From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 22 Apr 2007 21:23:27 +0000 (+0000)
Subject: Update Win32 build to include new files, new symbols, and
X-Git-Tag: Release-2.2.0~675
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=def6967db1fd6557127a76e9d3a078bda29191f8;p=bacula%2Fbacula

Update Win32 build to include new files, new symbols, and
     renamed files.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4602 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/win32/dll/Makefile b/bacula/src/win32/dll/Makefile
index c31ee045dc..617b3651af 100644
--- a/bacula/src/win32/dll/Makefile
+++ b/bacula/src/win32/dll/Makefile
@@ -53,6 +53,7 @@ LIB_OBJS = \
 	$(OBJDIR)/bnet.o \
 	$(OBJDIR)/bnet_server.o \
 	$(OBJDIR)/bpipe.o \
+	$(OBJDIR)/breg.o \
 	$(OBJDIR)/bregex.o \
 	$(OBJDIR)/bsock.o \
 	$(OBJDIR)/bsnprintf.o \
diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index 3f866ae39b..b1e27a1326 100644
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -147,7 +147,7 @@ _Z10bnet_closeP5BSOCK
 _Z10bnet_fsendP5BSOCKPKcz
 _Z10init_bsockP3JCRiPKcS2_iP8sockaddr
 _Z10term_bsockP5BSOCK
-_Z12bnet_connectP3JCRixPKcPcS3_ii
+_Z12bnet_connectP3JCRixxPKcPcS3_ii
 _Z12is_bnet_stopP5BSOCK
 _Z13bnet_get_peerP5BSOCKPci
 _Z13bnet_strerrorP5BSOCK
@@ -173,6 +173,16 @@ _Z23bnet_stop_thread_serverP10pthread_t_
 _Z11run_programPciS_
 _Z23run_program_full_outputPciS_
 
+; breg.c:
+_Z12get_bregexpsPKc
+_Z19bregexp_build_wherePciS_S_S_
+_Z12free_bregexpP7BREGEXP
+_Z13free_bregexpsP5alist
+_Z11new_bregexpPKc
+_Z14apply_bregexpsPKcP5alistPPc
+_Z21bregexp_escape_stringPcS_c
+_Z28bregexp_get_build_where_sizePcS_S_
+
 ; bregex.c:
 b_regcomp
 b_regerror
diff --git a/bacula/src/win32/filed/vss_generic.cpp b/bacula/src/win32/filed/vss_generic.cpp
index d950c1a119..9f204cd8ab 100644
--- a/bacula/src/win32/filed/vss_generic.cpp
+++ b/bacula/src/win32/filed/vss_generic.cpp
@@ -541,9 +541,9 @@ void VSSClientGeneric::QuerySnapshotSet(GUID snapshotSetID)
 
       // Print the shadow copy (if not filtered out)
       if (Snap.m_SnapshotSetId == snapshotSetID)  {
-         for (char ch='A'-'A';ch<='Z'-'A';ch++) {
+         for (int ch='A'-'A';ch<='Z'-'A';ch++) {
             if (wcscmp(Snap.m_pwszOriginalVolumeName, m_wszUniqueVolumeName[ch]) == 0) {       
-               wcsncpy (m_szShadowCopyName[ch],Snap.m_pwszSnapshotDeviceObject, MAX_PATH-1);               
+               wcsncpy(m_szShadowCopyName[ch],Snap.m_pwszSnapshotDeviceObject, MAX_PATH-1);               
                break;
             }
          }
diff --git a/bacula/src/win32/installer/Makefile b/bacula/src/win32/installer/Makefile
index 113662ef8e..f3b904963b 100644
--- a/bacula/src/win32/installer/Makefile
+++ b/bacula/src/win32/installer/Makefile
@@ -35,7 +35,7 @@ BACULA_BINARIES := \
 	btape.exe \
 	dbcheck.exe \
 	scsilist.exe \
-	wx-console.exe
+	bwx-console.exe
 
 DEPKGS_BINARIES := \
 	libeay32.dll \
diff --git a/bacula/src/win32/installer/bwx-console.conf.in b/bacula/src/win32/installer/bwx-console.conf.in
new file mode 100644
index 0000000000..4f60389ea4
--- /dev/null
+++ b/bacula/src/win32/installer/bwx-console.conf.in
@@ -0,0 +1,10 @@
+#
+# Bacula User Agent (or Console) Configuration File
+#
+
+Director {
+  Name = @director_name@
+  DIRport = @director_port@
+  address = @director_address@
+  Password = "@director_password@"
+}
diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 7d1179c05d..767bca0f29 100644
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -6,7 +6,7 @@
 ;    added a number of elements from Christopher Hull's installer
 ;
 ; D. Scott Barninger Nov 13 2004
-; added configuration editing for bconsole.conf and wx-console.conf
+; added configuration editing for bconsole.conf and bwx-console.conf
 ; better explanation in dialog boxes for editing config files
 ; added Start Menu items
 ; fix uninstall of config files to do all not just bacula-fd.conf
@@ -794,21 +794,21 @@ Section "Graphical Console" SecWxConsole
   File "${SRC_DIR}\wxmsw270_core_gcc_bacula.dll"
 !endif
 
-  File "${SRC_DIR}\wx-console.exe"
+  File "${SRC_DIR}\bwx-console.exe"
 
   ${If} $InstallType = ${MigrateInstall}
-  ${AndIf} ${FileExists} "$OldInstallDir\bin\wx-console.conf"
-    CopyFiles "$OldInstallDir\bin\wx-console.conf" "$APPDATA\Bacula"
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bwx-console.conf"
+    CopyFiles "$OldInstallDir\bin\bwx-console.conf" "$APPDATA\Bacula"
   ${Else}
-    File "/oname=$PLUGINSDIR\wx-console.conf" "wx-console.conf.in"
+    File "/oname=$PLUGINSDIR\bwx-console.conf" "bwx-console.conf.in"
     StrCpy $0 "$APPDATA\Bacula"
-    StrCpy $1 wx-console.conf
+    StrCpy $1 bwx-console.conf
     Call ConfigEditAndCopy
   ${EndIf}
 
   ; Create Start Menu entry
-  CreateShortCut "$SMPROGRAMS\Bacula\wx-console.lnk" "$INSTDIR\bin\wx-console.exe" '-c "$APPDATA\Bacula\wx-console.conf"' "$INSTDIR\bin\wx-console.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\wx-console.conf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\bwx-console.lnk" "$INSTDIR\bin\bwx-console.exe" '-c "$APPDATA\Bacula\bwx-console.conf"' "$INSTDIR\bin\bwx-console.exe" 0
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bwx-console.conf"'
 SectionEnd
 
 SectionGroupEnd
diff --git a/bacula/src/win32/installer/wx-console.conf.in b/bacula/src/win32/installer/wx-console.conf.in
deleted file mode 100644
index 4f60389ea4..0000000000
--- a/bacula/src/win32/installer/wx-console.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @director_name@
-  DIRport = @director_port@
-  address = @director_address@
-  Password = "@director_password@"
-}
diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
index 97e52838ea..bb8a653e32 100755
--- a/bacula/src/win32/wx-console/Makefile
+++ b/bacula/src/win32/wx-console/Makefile
@@ -64,17 +64,18 @@ CONSOLE_LIBS = \
 
 .PHONY: all clean
 
-all: $(BINDIR)/wx-console.exe
+all: $(BINDIR)/bwx-console.exe
 
 clean:
 	$(call clean_obj,$(ALL_OBJS))
+	$(call clean_exe,$(BINDIR)/bwx-console.exe)
 	$(call clean_exe,$(BINDIR)/wx-console.exe)
 
 #
 # Rules
 #
 
-$(BINDIR)/wx-console.exe: $(CONSOLE_OBJS) $(LIBS_BACULA)
+$(BINDIR)/bwx-console.exe: $(CONSOLE_OBJS) $(LIBS_BACULA)
 	$(call link_winapp,$(CONSOLE_LIBS))
 
 $(OBJDIR)/wx-console_private.res: wx-console_private.rc
diff --git a/bacula/src/win32/wx-console/bwx-console.manifest b/bacula/src/win32/wx-console/bwx-console.manifest
new file mode 100644
index 0000000000..b8e5f55f04
--- /dev/null
+++ b/bacula/src/win32/wx-console/bwx-console.manifest
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+  <assemblyIdentity 
+    version="1.0.0.0" 
+    processorArchitecture="X86" 
+    name="Bacula.BWX-Console" 
+    type="win32" /> 
+  <description>Bacula bwx-console for Win32</description> 
+  <dependency> 
+    <dependentAssembly> 
+      <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.Windows.Common-Controls" 
+        version="6.0.0.0" 
+        processorArchitecture="X86" 
+        publicKeyToken="6595b64144ccf1df" 
+        language="*" /> 
+    </dependentAssembly> 
+  </dependency> 
+</assembly> 
+
diff --git a/bacula/src/win32/wx-console/wx-console.manifest b/bacula/src/win32/wx-console/wx-console.manifest
deleted file mode 100644
index 773a748d10..0000000000
--- a/bacula/src/win32/wx-console/wx-console.manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity 
-    version="1.0.0.0" 
-    processorArchitecture="X86" 
-    name="Bacula.WX-Console" 
-    type="win32" /> 
-  <description>Bacula wx Console for Win32</description> 
-  <dependency> 
-    <dependentAssembly> 
-      <assemblyIdentity 
-        type="win32" 
-        name="Microsoft.Windows.Common-Controls" 
-        version="6.0.0.0" 
-        processorArchitecture="X86" 
-        publicKeyToken="6595b64144ccf1df" 
-        language="*" /> 
-    </dependentAssembly> 
-  </dependency> 
-</assembly> 
-
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 53bceac559..f4555944f9 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,8 @@
 
 General:
 22Apr07
+kes  Update Win32 build to include new files, new symbols, and    
+     renamed files.
 kes  Implement socket level heartbeat (tcp_keepidle)
 ebl  Commit File relocation patch
 kes  Make bat have 'make install' target.