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 c31ee045dc1cbcb62ccc5029ea61b872e7fd1df6..617b3651af639f9534941d73ebbc73e2cf7a67d0 100644 (file)
--- 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 3f866ae39b60e4f8b0e01593c54036b3bdc85361..b1e27a132668ac4be47a6d6bf09a0c513a720f2b 100644 (file)
--- 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 d950c1a11956ae851943ce0667fcdd43a7f08e27..9f204cd8ab6e6c689a5e497d6dfc4ccacde9259c 100644 (file)
--- 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 113662ef8ee4b3eb91cf24901729e36058162a16..f3b904963bed96df2a8ea0464af78022450f8b40 100644 (file)
--- 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 (file)
index 0000000..4f60389
--- /dev/null
+++ b/bacula/src/win32/installer/bwx-console.conf.in
@@ -0,0 +1,10 @@
+#\r
+# Bacula User Agent (or Console) Configuration File\r
+#\r
+\r
+Director {\r
+  Name = @director_name@\r
+  DIRport = @director_port@\r
+  address = @director_address@\r
+  Password = "@director_password@"\r
+}\r

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 7d1179c05da5dc33f350cd0d5992df3d791a40f1..767bca0f296337b43c8f7e712850c428c873c39c 100644 (file)
--- 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\r
 ;\r
 ; D. Scott Barninger Nov 13 2004\r
-; added configuration editing for bconsole.conf and wx-console.conf\r
+; added configuration editing for bconsole.conf and bwx-console.conf\r
 ; better explanation in dialog boxes for editing config files\r
 ; added Start Menu items\r
 ; fix uninstall of config files to do all not just bacula-fd.conf\r
@@ -794,21 +794,21 @@ Section "Graphical Console" SecWxConsole
   File "${SRC_DIR}\wxmsw270_core_gcc_bacula.dll"\r
 !endif\r
 \r
-  File "${SRC_DIR}\wx-console.exe"\r
+  File "${SRC_DIR}\bwx-console.exe"\r
 \r
   ${If} $InstallType = ${MigrateInstall}\r
-  ${AndIf} ${FileExists} "$OldInstallDir\bin\wx-console.conf"\r
-    CopyFiles "$OldInstallDir\bin\wx-console.conf" "$APPDATA\Bacula"\r
+  ${AndIf} ${FileExists} "$OldInstallDir\bin\bwx-console.conf"\r
+    CopyFiles "$OldInstallDir\bin\bwx-console.conf" "$APPDATA\Bacula"\r
   ${Else}\r
-    File "/oname=$PLUGINSDIR\wx-console.conf" "wx-console.conf.in"\r
+    File "/oname=$PLUGINSDIR\bwx-console.conf" "bwx-console.conf.in"\r
     StrCpy $0 "$APPDATA\Bacula"\r
-    StrCpy $1 wx-console.conf\r
+    StrCpy $1 bwx-console.conf\r
     Call ConfigEditAndCopy\r
   ${EndIf}\r
 \r
   ; Create Start Menu entry\r
-  CreateShortCut "$SMPROGRAMS\Bacula\wx-console.lnk" "$INSTDIR\bin\wx-console.exe" '-c "$APPDATA\Bacula\wx-console.conf"' "$INSTDIR\bin\wx-console.exe" 0\r
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\wx-console.conf"'\r
+  CreateShortCut "$SMPROGRAMS\Bacula\bwx-console.lnk" "$INSTDIR\bin\bwx-console.exe" '-c "$APPDATA\Bacula\bwx-console.conf"' "$INSTDIR\bin\bwx-console.exe" 0\r
+  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$APPDATA\Bacula\bwx-console.conf"'\r
 SectionEnd\r
 \r
 SectionGroupEnd\r

diff --git a/bacula/src/win32/installer/wx-console.conf.in b/bacula/src/win32/installer/wx-console.conf.in
deleted file mode 100644 (file)
index 4f60389..0000000
--- a/bacula/src/win32/installer/wx-console.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#\r
-# Bacula User Agent (or Console) Configuration File\r
-#\r
-\r
-Director {\r
-  Name = @director_name@\r
-  DIRport = @director_port@\r
-  address = @director_address@\r
-  Password = "@director_password@"\r
-}\r

diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
index 97e52838eab4ef4223cb2a1d0f871b4c183a49e6..bb8a653e32a81582bce4606787927eedfc4df6cd 100755 (executable)
--- 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 (file)
index 0000000..b8e5f55
--- /dev/null
+++ b/bacula/src/win32/wx-console/bwx-console.manifest
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> \r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> \r
+  <assemblyIdentity \r
+    version="1.0.0.0" \r
+    processorArchitecture="X86" \r
+    name="Bacula.BWX-Console" \r
+    type="win32" /> \r
+  <description>Bacula bwx-console for Win32</description> \r
+  <dependency> \r
+    <dependentAssembly> \r
+      <assemblyIdentity \r
+        type="win32" \r
+        name="Microsoft.Windows.Common-Controls" \r
+        version="6.0.0.0" \r
+        processorArchitecture="X86" \r
+        publicKeyToken="6595b64144ccf1df" \r
+        language="*" /> \r
+    </dependentAssembly> \r
+  </dependency> \r
+</assembly> \r
+\r

diff --git a/bacula/src/win32/wx-console/wx-console.manifest b/bacula/src/win32/wx-console/wx-console.manifest
deleted file mode 100644 (file)
index 773a748..0000000
--- a/bacula/src/win32/wx-console/wx-console.manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> \r
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> \r
-  <assemblyIdentity \r
-    version="1.0.0.0" \r
-    processorArchitecture="X86" \r
-    name="Bacula.WX-Console" \r
-    type="win32" /> \r
-  <description>Bacula wx Console for Win32</description> \r
-  <dependency> \r
-    <dependentAssembly> \r
-      <assemblyIdentity \r
-        type="win32" \r
-        name="Microsoft.Windows.Common-Controls" \r
-        version="6.0.0.0" \r
-        processorArchitecture="X86" \r
-        publicKeyToken="6595b64144ccf1df" \r
-        language="*" /> \r
-    </dependentAssembly> \r
-  </dependency> \r
-</assembly> \r
-\r

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 53bceac55915d0116db7332742ff516ab572b80f..f4555944f9c2b6896e7d8670a016f0193c491d50 100644 (file)
--- 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.