[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Win32 build with VS.NET

From: Jon Foster <jon_at_jon-foster.co.uk>
Date: 2004-08-29 15:51:53 CEST

Hi,

With the attached patch I can build Subversion (trunk) on Win32 using
VS.NET. Without this patch, libaprutil.dll fails to link because it
cannot find the Berkely DB symbols.

I am using aprutil copied into the subversion directory, I am not
building Apache.

Revision 10702 by djh says it is "second part of adding VSNet version
to vcproj generator [...]. The last part will involve templatizing the
BDB location in the apr projects files.". I guess the attached patch
is the "last part" - D.J., is this vaguely what you meant? (I hope
you hadn't already done this - if so, my apologies & feel free to
reject this patch).

Log message as requested in HACKING:

Make Windows Visual Studio .NET build use Berkely DB library.
Fixes undefined symbol errors linking libaprutil.dll.

    * build/generator/gen_vcnet_vcproj.py
      (move_proj_file): New bdbpath variable to be expanded.

    * build/generator/libaprutil.vcproj.ezt
      Add BDB include path and library

Kind regards,

Jon Foster

[Patch as attachment to prevent mangling by Mozilla Mail]

Index: src-trunk/build/generator/gen_vcnet_vcproj.py
===================================================================
--- src-trunk/build/generator/gen_vcnet_vcproj.py (revision 10754)
+++ src-trunk/build/generator/gen_vcnet_vcproj.py (working copy)
@@ -104,6 +104,7 @@
     source_template = name + '.ezt'
     data = {
       'version' : self.vsnet_proj_ver,
+ 'bdbpath': self.bdb_path,
       }
     self.write_with_template(dest_file, source_template, data)
 
Index: src-trunk/build/generator/libaprutil.vcproj.ezt
===================================================================
--- src-trunk/build/generator/libaprutil.vcproj.ezt (revision 10754)
+++ src-trunk/build/generator/libaprutil.vcproj.ezt (working copy)
@@ -20,7 +20,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
+ AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,[bdbpath]/include,./xml/expat/lib"
                                 PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
                                 RuntimeLibrary="3"
                                 PrecompiledHeaderFile=".\Debug/libaprutil.pch"
@@ -35,7 +35,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib mswsock.lib"
+ AdditionalDependencies="ws2_32.lib mswsock.lib [bdbpath]/lib/libdb42.lib"
                                 OutputFile=".\Debug/libaprutil.dll"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
@@ -77,8 +77,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
- PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+ AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,[bdbpath]/include,./xml/expat/lib" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="TRUE"
@@ -94,7 +93,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib mswsock.lib"
+ AdditionalDependencies="ws2_32.lib mswsock.lib [bdbpath]/lib/libdb42.lib"
                                 OutputFile=".\Release/libaprutil.dll"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Aug 29 15:52:03 2004

This is an archived mail posted to the Subversion Dev mailing list.