[PATCH] VS.NET build with apr-util and BDB

This is a very simple patch that allows gen_make.py with
--enable-bdb-in-apr-util to function correctly on a Visual Studio 200X
build
using the -t vcproj option.

The w32locatedb.pl script in the apr-util distribution modifies header
files
and the VC6 project files, however the gen_make.py with the -t vcproj
option
doesn't replicate the changes made by w32locatedb.pl in the .vcproj
files.
Since w32locatedb.pl is still executed to modify the header files we
only
need to alter the .vcproj files.

I noticed there was a patch from 'Jon Foster' that partially addressed
this
issue but didn't appear to be resolved.
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=75898

My build command line is:
python gen-make.py -t vcproj --vsnet-version=2003
--with-berkeley-db=db4-win32
  --with-openssl=..\openssl-0.9.7d --with-zlib=..\zlib-1.2.2
--enable-nls
  --enable-bdb-in-apr-util --with-apr=..\apr --with-apr-util=..\apr-util
  --with-apr-icon=..\apr-iconv --with-libintl=..\svn-win32-libintl

Log message follows:

Allow Visual Studio .NET to build apr-util correctly with the
gen_make.py
--enable-bdb-in-apr-util switch.

* gen_win.py
  ( def write(self) ): Modified the calling of move_proj_file() for
  libaprutil.vcproj.ezt to pass an extra template parameter for the BDB
path
  based on wether self.configure_apr_util is set or not.

* libaprutil.vcproj.ezt
  (VCCLCompilerTool.AdditionalIncludeDirectories Debug/Release):
  Added bdb include path if 'bdbpath' template variable is set.
  (VCCLCompilerTool.PreprocessorDefinitions Debug/Release):
  Define APU_USE_DB instead of APU_USE_SDBM if 'bdbpath' template
variable is
  set.
  (VCCLCompilerTool.AdditionalDependencies Debug/Release):
  Added libdb42d.lib in debug or libdb42.lib in release build if
'bdbpath'
  template variable is set.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org