From 29279057b97916f5270df8afa7c1eeac6357f0f1 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 7 Feb 2007 10:27:54 +0000 Subject: [PATCH] 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 --- bacula/src/win32/External-msvc | 4 ++-- bacula/src/win32/bacula.sln | 2 -- bacula/src/win32/build-depkgs-msvc.cmd | 10 ++++----- bacula/src/win32/libbac/libbac.vcproj | 28 +++++++++++++++++++++++-- bacula/src/win32/libbac/msvc/bacula.def | 15 +++++++------ 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/bacula/src/win32/External-msvc b/bacula/src/win32/External-msvc index f5be3d1f55..7da03d193a 100644 --- 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 429b639b6e..a81b5edd3d 100644 --- 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}" ProjectSection(SolutionItems) = preProject build-depkgs-mingw32 = build-depkgs-mingw32 - build-depkgs-msvc.cmd = build-depkgs-msvc.cmd build-msvc.cmd = build-msvc.cmd build-win32-cross-tools = build-win32-cross-tools External-mingw32 = External-mingw32 - External-msvc = External-msvc README.mingw32 = README.mingw32 README.vc8 = README.vc8 README.win32 = README.win32 diff --git a/bacula/src/win32/build-depkgs-msvc.cmd b/bacula/src/win32/build-depkgs-msvc.cmd index 5d73f6c16d..3a7e8f4051 100644 --- 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 XCOPY ..\pgsql\include\postgres_ext.h ..\..\include\ /Y 2>&1 LIB /def:src\interfaces\libpq\libpqdll.def /out:..\..\lib\libpqdll.lib /machine:x86 /subsystem:console - XCOPY ..\pgsql\lib\libpq.dll ..\..\bin\ /Y - XCOPY ..\pgsql\lib\comerr32.dll ..\..\bin\ /Y - XCOPY ..\pgsql\lib\krb5_32.dll ..\..\bin\ /Y - XCOPY ..\pgsql\lib\libintl-2.dll ..\..\bin\ /Y - XCOPY ..\pgsql\lib\libiconv-2.dll ..\..\bin\ /Y + XCOPY ..\pgsql\bin\libpq.dll ..\..\bin\ /Y + XCOPY ..\pgsql\bin\comerr32.dll ..\..\bin\ /Y + XCOPY ..\pgsql\bin\krb5_32.dll ..\..\bin\ /Y + XCOPY ..\pgsql\bin\libintl-2.dll ..\..\bin\ /Y + XCOPY ..\pgsql\bin\libiconv-2.dll ..\..\bin\ /Y EXIT /B 0 :pstgreSQL_Error1 ECHO Unable to download postgreSQL binaries from %URL_POSTGRESQL% diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj index 41b08d796e..7e7ebc353f 100644 --- a/bacula/src/win32/libbac/libbac.vcproj +++ b/bacula/src/win32/libbac/libbac.vcproj @@ -1094,6 +1094,26 @@ /> + + + + + + + + @@ -1565,11 +1585,11 @@ > + + diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def index 3a1208e2c1..5dd7f30f2e 100644 --- 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 ?qnext@@YAPAUb_queue@@PAU1@0@Z ?qdchain@@YAPAUb_queue@@PAU1@@Z - + ; runscript.obj ?new_runscript@@YAPAVRUNSCRIPT@@XZ ?reset_default@RUNSCRIPT@@QAEX_N@Z @@ -450,19 +450,22 @@ fnmatch ?sm_dump@@YAX_N@Z ?sm_check@@YAXPBDH_N@Z ?sm_static@@YAXH@Z - -; tls.obj + +; tls.obj ?new_tls_context@@YAPAUTLS_Context@@PBD000P6AHPADHPBX@Z20_N@Z ?free_tls_context@@YAXPAUTLS_Context@@@Z - -; tree.obj + +; tree.obj ?new_tree@@YAPAUs_tree_root@@H@Z ?free_tree@@YAXPAUs_tree_root@@@Z ?insert_tree_node@@YAPAUs_tree_node@@PAD0HPAUs_tree_root@@PAU1@@Z ?strrchr@@YAPADPADH@Z ?tree_getpath@@YAHPAUs_tree_node@@PADH@Z ?tree_cwd@@YAPAUs_tree_node@@PADPAUs_tree_root@@PAU1@@Z - +; rblist +?insert@rblist@@QAEPAXPAXP6AH00@Z@Z +?next@rblist@@QAEPAXPAX@Z + ; util.obj ?is_buf_zero@@YA_NPADH@Z ?lcase@@YAXPAD@Z -- 2.39.5