Since PostgreSQL 8.1.4 is no longer available upgrade to 8.1.6.

Update msvc build for new rblist.

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

diff --git a/bacula/src/win32/External-msvc b/bacula/src/win32/External-msvc
index f5be3d1f55715d24e2844faccaf8a1f07df68b90..7da03d193aa555071e518119ec2948b3ade7e743 100644 (file)
--- a/bacula/src/win32/External-msvc
+++ b/bacula/src/win32/External-msvc
@@ -24,8 +24,8 @@ PCRE|http://superb-west.dl.sourceforge.net/sourceforge/pcre/pcre-6.3.tar.bz2
 PTHREADS|ftp://sources.redhat.com/pub/pthreads-win32/pthreads-2004-06-22x.exe|pthreads-2004-06-22x|true
 OPENSSL|http://www.openssl.org/source/openssl-0.9.8b.tar.gz
 MYSQL|http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-noinstall-5.0.27-win32.zip|mysql-5.0.27-win32
-POSTGRESQL|ftp://ftp2.us.postgresql.org/postgresql/binary/v8.1.4/win32/postgresql-8.1.4-1-binaries-no-installer.zip|pgsql
-POSTGRESQL_SRC|ftp://ftp4.us.postgresql.org/pub/postgresql/source/v8.1.4/postgresql-8.1.4.tar.bz2
+POSTGRESQL|ftp://ftp2.us.postgresql.org/postgresql/binary/v8.1.6/win32/postgresql-8.1.6-1-binaries-no-installer.zip|pgsql
+POSTGRESQL_SRC|ftp://ftp4.us.postgresql.org/pub/postgresql/source/v8.1.6/postgresql-8.1.6.tar.bz2
 SQLITE|http://www.sqlite.org/sqlite-3.3.8.tar.gz
 WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.zip
 NSIS_BIN|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17.zip

diff --git a/bacula/src/win32/bacula.sln b/bacula/src/win32/bacula.sln
index 429b639b6ef8afb87898d74fbe2399dd0afcf03f..a81b5edd3df8cebac8ec96f517f6036fab6164b9 100644 (file)
--- a/bacula/src/win32/bacula.sln
+++ b/bacula/src/win32/bacula.sln
@@ -41,11 +41,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825DFFD0-4747-43CA-8326-529655E31935}"\r
        ProjectSection(SolutionItems) = preProject\r
                build-depkgs-mingw32 = build-depkgs-mingw32\r
-               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd\r
                build-msvc.cmd = build-msvc.cmd\r
                build-win32-cross-tools = build-win32-cross-tools\r
                External-mingw32 = External-mingw32\r
-               External-msvc = External-msvc\r
                README.mingw32 = README.mingw32\r
                README.vc8 = README.vc8\r
                README.win32 = README.win32\r

diff --git a/bacula/src/win32/build-depkgs-msvc.cmd b/bacula/src/win32/build-depkgs-msvc.cmd
index 5d73f6c16d5b092e2c779a99655171d5e6442c12..3a7e8f405176592fcdbe1ddbb074c851e1162376 100644 (file)
--- a/bacula/src/win32/build-depkgs-msvc.cmd
+++ b/bacula/src/win32/build-depkgs-msvc.cmd
@@ -225,11 +225,11 @@ REM       do_patch postgresql.patch
        XCOPY ..\pgsql\include\libpq-fe.h ..\..\include\ /Y 2>&1\r
        XCOPY ..\pgsql\include\postgres_ext.h ..\..\include\ /Y 2>&1\r
        LIB /def:src\interfaces\libpq\libpqdll.def /out:..\..\lib\libpqdll.lib /machine:x86 /subsystem:console\r
-       XCOPY ..\pgsql\lib\libpq.dll ..\..\bin\ /Y\r
-       XCOPY ..\pgsql\lib\comerr32.dll ..\..\bin\ /Y\r
-       XCOPY ..\pgsql\lib\krb5_32.dll ..\..\bin\ /Y\r
-       XCOPY ..\pgsql\lib\libintl-2.dll ..\..\bin\ /Y\r
-       XCOPY ..\pgsql\lib\libiconv-2.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\bin\libpq.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\bin\comerr32.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\bin\krb5_32.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\bin\libintl-2.dll ..\..\bin\ /Y\r
+       XCOPY ..\pgsql\bin\libiconv-2.dll ..\..\bin\ /Y\r
        EXIT /B 0\r
 :pstgreSQL_Error1\r
        ECHO Unable to download postgreSQL binaries from %URL_POSTGRESQL%\r

diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj
index 41b08d796e19863a1a9a2c67a6bec0795cd8e77e..7e7ebc353fa65071c89a9508f79b555cc671815a 100644 (file)
--- a/bacula/src/win32/libbac/libbac.vcproj
+++ b/bacula/src/win32/libbac/libbac.vcproj
@@ -1094,6 +1094,26 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\lib\rblist.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\lib\runscript.c"\r
                                >\r
@@ -1565,11 +1585,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\findlib\protos.h"\r
+                               RelativePath="..\..\lib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\lib\protos.h"\r
+                               RelativePath="..\..\findlib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1580,6 +1600,10 @@
                                RelativePath="..\..\lib\queue.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\lib\rblist.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\lib\runscript.h"\r
                                >\r

diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def
index 3a1208e2c1246e2aad3317f3a0832df1e27534e2..5dd7f30f2eda8179b08816c1587d959f12d6214e 100644 (file)
--- a/bacula/src/win32/libbac/msvc/bacula.def
+++ b/bacula/src/win32/libbac/msvc/bacula.def
@@ -391,7 +391,7 @@ fnmatch
 ?qinsert@@YAXPAUb_queue@@0@Z\r
 ?qnext@@YAPAUb_queue@@PAU1@0@Z\r
 ?qdchain@@YAPAUb_queue@@PAU1@@Z\r
- \r
+\r
 ; runscript.obj \r
 ?new_runscript@@YAPAVRUNSCRIPT@@XZ\r
 ?reset_default@RUNSCRIPT@@QAEX_N@Z\r
@@ -450,19 +450,22 @@ fnmatch
 ?sm_dump@@YAX_N@Z\r
 ?sm_check@@YAXPBDH_N@Z\r
 ?sm_static@@YAXH@Z\r
- \r
-; tls.obj \r
+\r
+; tls.obj\r
 ?new_tls_context@@YAPAUTLS_Context@@PBD000P6AHPADHPBX@Z20_N@Z\r
 ?free_tls_context@@YAXPAUTLS_Context@@@Z\r
- \r
-; tree.obj \r
+\r
+; tree.obj\r
 ?new_tree@@YAPAUs_tree_root@@H@Z\r
 ?free_tree@@YAXPAUs_tree_root@@@Z\r
 ?insert_tree_node@@YAPAUs_tree_node@@PAD0HPAUs_tree_root@@PAU1@@Z\r
 ?strrchr@@YAPADPADH@Z\r
 ?tree_getpath@@YAHPAUs_tree_node@@PADH@Z\r
 ?tree_cwd@@YAPAUs_tree_node@@PADPAUs_tree_root@@PAU1@@Z\r
- \r
+; rblist\r
+?insert@rblist@@QAEPAXPAXP6AH00@Z@Z\r
+?next@rblist@@QAEPAXPAX@Z\r
+\r
 ; util.obj \r
 ?is_buf_zero@@YA_NPADH@Z\r
 ?lcase@@YAXPAD@Z\r