Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1501656 is being indexed.

Fix the ability to build against debug BDB on Windows.

Not sure this is the best way to fix this, the real problem here is that

when we look for BDB we have no idea if this is a debug or release build.

* build/generator/

(GeneratorBase._find_bdb): Look for the debug lib as well as release.

(WinGeneratorBase.__init__): Adjust output since it doesn't know if it

found a release or debug lib file at this layer.

Block building with BDB 6.

* build/ac-macros/berkeley-db.m4

(SVN_LIB_BERKELEY_DB_TRY): Block building with BDB 6, with a comment

explaining why.

(SVN_LIB_BERKELEY_DB): Document that only 4.x and 5.x are supported.

(--with-berkeley-db): Ditto. The help string does not evaluate the $,

but that is a preexisting bug that should be fixed separately.

* build/generator/

(GeneratorBase._find_bdb): Add a comment cautioning against enabling

BDB 6.

* Define $db_alt_version and use it in an error message.

  1. … 2 more files in changeset.
Fix Windows project file generator to not exclude .c files

generated by Swig from the build.

* build/generator/ (GeneratorBase.__init__):

Construct a set of all private include files that were explicitly

listed in build.conf.

(WinGeneratorBase.get_proj_sources): Only exclude from build those

dependencies that appear in the exclude list.

Tell the Visual Studio project file generator to not compile C files that

appear in the project's dependency list but are not in the source list.

This fixes the issue with embedding utf8proc sources in libsvn_subr.

* build/generator/ (WinGeneratorBase.get_proj_sources):

Mark header dependencies for exclusion from the build.

(ProjectItem): Set files to not excluded by default.

* build/generator/templates/vcnet_vcproj.ezt,

build/generator/templates/vcnet_vcxproj.ezt: Tweak the .vc(x)proj templates

to treat excluded sources differently, and to treat *.hpp as header files.

* build.conf (private-includes): Remove the .inline suffix from

utf8proc/utf8proc.c and utf8proc/utf8proc_data.c.

* subversion/libsvn_subr/utf8proc.c:

Update directive to include utf8proc/utf8proc.c.

* subversion/libsvn_subr/utf8proc/utf8proc.c: Rename from utf8proc.c.inline.

Update directive to include utf8proc_data.c.

* subversion/libsvn_subr/utf8proc/utf8proc_data.c:

Rename from utf8proc_data.c.inline.

  1. … 8 more files in changeset.
For issue #4371 ("Subversion requires Serf 1.2.1"), teach the build

system to expect Serf 1.2.1 now.




* build/generator/

Bump Serf required version to 1.2.1.

  1. … 3 more files in changeset.
windows build: Silence a false positive warning.

Tested by: jcorvel

* build/generator/

(GeneratorBase.write_errno_table): Make this an instance method, rather than

a static one. Use self.errno_filter.

(GeneratorBase.errno_filter): Provide default implementation.

* build/generator/

(WinGeneratorBase.errno_filter): Override the default implementation.

  1. … 1 more file in changeset.
* build/generator/

(_find_bdb): Look for BDB 5.0, 5.1, 5.2 and 5.3 versions.

Properly detect Ruby 1.9 on Windows.

* build/generator/

(WinGeneratorBase._find_ruby): Pass the -W0 option to ruby.exe to stifle

the warning about Config being deprecated and that RbConfig should be

used. Ruby just uses RbConfig anyway.

* **/**

Run tools/dev/ to remove all trailing whitespace

before we branch 1.8, like we did before creating previous branches.

No functional changes.

  1. … 199 more files in changeset.
Follow up to r1354410 which dropped the JavaHL targets in the absense of a jdk.

It appears to contain an copy-paste-o that also removes the swig targets in

the absense of a jdk.

* build/generator/

(get_install_targets): Drop the line the removes the swig targets when there

is no jdk.

Approved by: danielsh

* build/generator/

(get_win_includes): Add fake include for the cxxhl projects to allow them

to find their header files on Windows.

* build/generator/

Apply some educated guesses on how future Visual Studio versions can be

supported, given how VS 2010 and VS 2012 bumped their formats.

Make the regexes a bit stricter.

* build/generator/

(_find_sqlite): Following up on r1449422, fix error message. Also use the

optional 4th component of the version for diagnostics.

On Windows, use similar version checks for serf, apr, aprutil and sqlite

instead of many slightly different checks.

Also print the version numbers found to allow easy access on the buildbot.

Note that this bumps required versions of several dependencies to what

they already are on the unix builds.

* build/generator/

(_find_serf): Require serf 1.2.0 or later

(_find_apr): Require apr 0.9.0 or later

(_find_apr_util): Require aprutil 0.9.0 or later

(_find_sqlite): Require sqlite 3.7.12 or later.

(_find_zlib): Print version in the same format.

* build/generator/

(create_dll_target): Add exception for entries-dump to unbreak windows

shared library build support.

On Windows, don't strip the Content-Type field from .po files during their compilation.

GNU libintl, by default, converts the l10n strings into the locale encoding, while Subversion requires UTF-8. This conversion can be suppressed by calling bind_textdomain_codeset, but certain old versions of libintl don't have that, so the Unix build system checks for the existence of that function, and if it's not present, strips the Content-Type header from the .po files (which prevents encoding conversion, as well, but makes msgfmt complain).

When building on Windows, this stripping is done unconditionally, but is completely unnecessary:

- On Windows, we only support linking with svn-win32-libintl, which is hacked to disable all encoding conversions.

- Even if someone links with with his own version of libintl, it's a safe bet that it will be new enough to support bind_textdomain_codeset, so we can just call that.

This patch removes Content-Type stripping on Windows, which gets rid of msgfmt warnings, as well as simplifies the build system.

* build/generator/build_locale.ezt: Remove the invocation.

* build/generator/

(POFile.__init__): don't store the .spo file name.

* build/ Delete.

* subversion/libsvn_subr/nls.c:

(svn_nls_init): Move the bind_textdomain_codeset call out of the #ifdef WIN32 block, so it's executed on Windows, as well.

* subversion/svn_private_config.hw: Indicate that bind_textdomain_codeset is available if NLS is enabled.

Approved by: brane

  1. … 4 more files in changeset.
Teach serf build on Windows to use static APR/Util and OpenSSL.

Note: The APR_STATIC support requires a patch to serf.mak,


* New option --with-static-openssl.

* build/generator/ (write_serf_project_file):

Send configuration for static APR and OpenSSL linking to the serf

project file generator.

* build/generator/templates/serf.vcproj.ezt,

build/generator/templates/serf.vcxproj.ezt: Update nmake command templates.

  1. … 3 more files in changeset.
APR's static builds use LibD/LibR to store the build artefacts.

* build/generator/ (get_win_lib_dirs): Translate APR/APR-Util

artefact paths if linking against static APR libs.

* build/generator/

(get_install_targets): Drop the JavaHL targets from the build if we can't find a

jdk, just like how we handle serf, bdb and swig.

Don't build libsvn_ra_neon, in preparation for its removal.

See this thread for more info:

* build/ac-macros/neon.m4,





* build/generator/,





Remove neon bits.


Don't bother fetching the neon deps.

* build.conf:

Remove libsvn_ra_neon, and neon as depenencies.

  1. … 12 more files in changeset.
Update references to Visual Studio 11 to Visual Studio 2012.


Update documentation

* build/generator/

Accept 2012 argument and provide the right text for the .sln file

  1. … 1 more file in changeset.
Purge trailing whitespace, in the spirit of r1138109.

  1. … 97 more files in changeset.
* build/generator/

(_find_perl): Following up on r1291797, fix the invocation of perl

to actually retrieve the requested information.

Following up on r1291740, use relative paths for zlib in a few more places.

* build/generator/

(WinGeneratorBase): Use relative paths in .bat file.

(write_zlib_project_file): Use relative path to output folder.

Locate the library and header directories for perl on Windows, just like how

we handle them for ruby and python.

* build/generator/

(get_win_includes): Add perl includes if necessary.

(get_win_lib_dirs): Add perl libdir if necessary.

(_find_perl): Ask the required information from perl.

Use relative paths in more cases in the Visual C++ project files. This looks

more like how Visual Studio would create these files and makes it easier to

access a development working copy on a network drive.

* build/generator/

(find_rootpath): Use os.path.relpath instead of a simple reimplementation.



write_serf_project_file): Calculate relative paths instead of abspaths.

Extend our project generator to allow generating Visual Studio 11 compatible

projects. This requires bumping the solution and toolset version.

* build/generator/

(write_project): Add toolset_version variable for templates.

* build/generator/

(GeneratorBase): Allow generating for Visual Studio 11.

(move_proj_file): Add toolset_version variable for templates.

* build/generator/templates/svn_locale.vcxproj.ezt

* build/generator/templates/svn_config.vcxproj.ezt

* build/generator/templates/neon.vcxproj.ezt

* build/generator/templates/serf.vcxproj.ezt

* build/generator/templates/zlib.vcxproj.ezt

* build/generator/templates/vcnet_vcxproj.ezt

Set the toolset version dynamically.

  1. … 7 more files in changeset.
* build/generator/

(GeneratorBase.parse_options): Don't build mod_dontdothat if building without

httpd, just like how we handle mod_dav_svn and mod_authz_svn.

* build/generator/

(get_win_defines): Add _CRT_SECURE_NO_WARNINGS here instead of in the


* build/generator/templates/vcnet_vcxproj.ezt

* build/generator/templates/vcnet_vcproj.ezt

Remove _CRT_SECURE_NO_WARNINGS definition and define WIN64 in x64 builds.

  1. … 2 more files in changeset.
* build/generator/

(get_win_libs, write_serf_project_file): Following up on r1148043 (and a fix

in serf) dynamically generate serf library names based on the serf version.