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

Changeset 1544226 is being indexed.

Following up on r1544169, reduce the amount of new java warnings by

the change to a level that allows investigating issues.

* build/ac-macros/java.m4

* build/generator/

Suppress deprecation warnings.

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

(get_win_lib_dirs): Following up on r1544171, fix variable reference.

In the windows project generator: resolve a regression in linking swig

libraries when compiling subversion to shared libraries.

Libraries of dependency projects are not available when the

project is turned into a shared library.

* build/generator/


get_win_libs): Link to language specific libraries (E.g. perl516.lib)

from swig project instances for specific languages

* build/generator/

(get_proj_sources): Following up on r1544163 add missing whitespace.

* build/generator/

(get_proj_sources): Add -Xlint flag to the javac invocation.

In the Windows project generator: Turn httpd and mod_dav into 'regular'

dependencies instead of hardcoded magic in the project generator.

* build.conf



mod_dontdothat): Update dependencies.


mod_dav): New external targets.

* build/generator/

(get_win_includes): Remove now unneeded hardcoded include dirs.

(get_win_lib_dirs): Remove now unneeded hardcoded library dirs.

* build/generator/

(find_libraries): Call _find_httpd.

(_find_httpd): New function.

  1. … 2 more files in changeset.
Properly handle the 'when' option in build.conf on Windows. This filters

a few projects that currently can't be build on Windows.

* build/generator/

(get_install_targets): Filter projects that are disabled.

* build/generator/

(_windows_when): New variable.

  1. … 1 more file in changeset.
Re-implement the forced usage of shared libraries for our test suite using a

proper build.conf flag. The updated implementation resolves a few cases where

we linked some applications (E.g. op-depth-test) against both the shared and

the static version of the same library, because direct and indirect

dependencies were handled using different code paths.

This last problem caused test failures on the Windows shared library buildbot,

because svn_error_clear() unhooked a different function for its

maintainer-abort on error leaks, than the other library inserted.

* build.conf

(msvc-force-static): Document.










wc-test): Mark these tests as msvc-force-static they use functions that

aren't published from the libraries that define them.



wc-incomplete-tester): Mark these wc.db test helpers as msvc-force-static.

* build/generator/

(DependencyGraph.remove): New function.

(TargetExe): Read new value from build.conf.

(disable_shared): Don't touch msvc_export.

* build/generator/

(get_install_targets): Handle the magic of forcing static library usage here,

with the code that creates shared libraries.

(create_dll_target): Remove magic name logic.

  1. … 2 more files in changeset.
Revert the last few remaining pieces of r850307 (aka r10233), which made the

swig bindings on Windows link the 'core' library as central component from

every other swig library.

In the few months after this commit (read: somewhere in 2004) most of this

change was tweaked and partially reverted, but some magic was left.

Since this didn't work out as planned (as looked at 9 years later), hacks

were applied to work around all this. E.g some bindings forced a shared

library and then used explicit dll exporting/importing on Windows to get

things working.

This patch makes the bindings all use a proper shared library on Windows,

with the function exporting handled via the standard header file system we

use in other places.

* build.conf

(swig_core): Remove keyword that hasn't been used for at least 8 years.



libsvn_swig_ruby): Add svn-exports.

* build/generator/

(TargetLib.disable_shared): New function.

(TargetSWIG.__init__): Remove include_runtime initialization.

(TargetSWIGLib.disable_shared): New function.

* build/generator/

(get_install_targets): Call disable_shared instead of doing half its work locally.

(get_def_file): Remove disable_shared check.

(get_linked_win_depends): Remove disable_shared check.

* subversion/bindings/swig/core.i

(const void *value): Update caller.

(SWIGPERL init): Remove circular dependency hack.

* subversion/bindings/swig/include/svn_types.swg




PY_AS_VOID): Update caller.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c

(svn_swig_pl_bind_current_pool_fns): Remove


* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h

(svn_swig_pl_bind_current_pool_fns): Remove


* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c


svn_swig_py_get_parent_pool): Update caller.

(svn_swig_NewPointerObj): Rename to ...

(svn_swig_py_new_pointer_obj): ... this.

(svn_swig_NewPointerObjString): Rename to ...

(svn_swig_NewPointerObjString): ... this. Update caller.

(svn_swig_ConvertPtr): Rename to ...

(svn_swig_py_convert_ptr): ... this.

(svn_swig_ConvertPtrString): Update caller.

(svn_swig_MustGetPtr): Rename to ...

(svn_swig_py_must_get_ptr): ... this.

(make_ob_pool): Update caller.

(convert_to_swigtype): Update caller.


(svn_swig_py_struct_ptr_hash_from_dict): Update caller.

(svn_swig_py_unwrap_struct_ptr): Update caller.

(svn_swig_py_convert_txdelta_op_c_array): Update caller.

(swig_py_ra_reporter2): Make static.

(svn_swig_py_get_ra_reporter2): New function.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h

(SVN_SWIG_SWIGUTIL_EXPORT): Remove definition and all usages.

(svn_swig_NewPointerObj): Rename to ...

(svn_swig_py_new_pointer_obj): ... this.

(svn_swig_ConvertPtr): Rename to ...

(svn_swig_py_convert_ptr): ... this.

(svn_swig_MustGetPtr): Rename to ...

(svn_swig_py_must_get_ptr): ... this.

(svn_swig_py_get_ra_reporter2): New function.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h

(SVN_RB_SWIG_SWIGUTIL_EXPORT): Remove definition and all usages.

* subversion/bindings/swig/svn_ra.i

(const svn_ra_reporter2_t *reporter, void *report_baton): Update caller.


('perl'): Copy libsvn_swig_perl to $PATH instead of _Core.

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

(get_win_includes): Following up on r1506473, do a proper contains check.

* build/generator/

(get_win_includes): Following up on r1505131, don't translate the cxxhl

include path twice.

* build/generator/

(get_win_includes): Give libsvn_swig_[lang] the same include directories

as swig_[lang]_*, in an attempt to unbreak building Ruby on the Windows


In the Windows project file generator: extend the generator and the dependency

framework to allow forcefully including an include file before the actual c


This ugly hack is necessary to allow compiling the 1.9+ Swig Ruby bindings on

Windows without changing the standard swig or ruby headers, as Swig starts

its generated files with a #include <ruby.h> before any other headers :(

This change makes the project generator handle include dirs, lib dirs,

forced headers and libraries in the same way: per configuration.

* build/generator/

(write_project): Remove includes from ezt data.

* build/generator/

(write_project): Remove includes from ezt data.

* build/generator/

(get_configs): Add includes and forced headers to the per configuration data.

* build/generator/templates/msvc_dsp.ezt

Update includes reference.

* build/generator/templates/vcnet_vcproj.ezt

Update includes reference. Support forcing an include.

* build/generator/templates/vcnet_vcxproj.ezt

Update includes reference. Support forcing an include.

Remove doubled semicolon.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

(swigutil_rb__pre_ruby.h): Add include for dependency tracking.

Fix reference to st.h for Ruby >= 1.9.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h

(swigutil_rb__pre_ruby.h): Add include for dependency tracking.

Fix reference to regex.h for Ruby >= 1.9.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h

New file

  1. … 8 more files in changeset.
In the Windows project generator: Handle swig as a dependency library.

* build.conf



libsvn_swig_ruby): Use swig.

(swig): New external library.

* build/generator/


get_install_targets): Check for swig as library.

(get_win_includes): Simplify logic.

* build/generator/

(find_libraries): Only check for perl, python, ruby if swig is found.

(_find_ruby): Find more include paths in an attempt to really get it


(_find_swig): Modernize detection. Pass our own swig paths for includes.


_find_sqlite): Wrap lines.

  1. … 2 more files in changeset.
Replace specialized handling of the jdk paths in the windows project generator

with using the standard dependency framework.

* build.conf

(libsvnjavahl): Mark dependency on the jdk.

(java-sdk): New external library project. Currently not really a library.

* build/generator/

(get_install_targets): Check for library existance.

(get_win_includes): Remove unused common include dir and jdk includes.

(get_win_lib_dirs): Easy out on libraries that don't link dependencies


(get_win_libs): Remove unused code.

* build/generator/

(get_win_lib_dirs): Add optional library.

(find_libraries): Always locate the jdk.

(_find_jdk): Create a library instance with build information.



_find_libintl): Fix printing warnings.

  1. … 2 more files in changeset.
Extend the dependency handling in the Windows project generator by allowing

dependencies to define multiple defines and include directories.

The defines allow major code cleanup and the multiple include directories

will be necessary to switch the jdk/javahl detection.

* build/generator/

(get_win_defines): Include defines from external dependencies. Remove all

custom defines that should be handled by the dependencies.

(get_win_includes): Handle multiple includes. Handle the path normalization

in one place instead of everywhere except a few others.

(get_win_lib_dirs): Remove sqlite_inline reference.

* build/generator/

(SVNCommonLibrary): Support multiple include directories and defines.


_find_apr_util_and_expat): Handle defines for static apr.

(_find_bdb): Publish that we have BDB.

(_find_ruby): Provide ruby define.

(_find_serf): Provide serf defines.

(_find_sasl): Publish that we have sasl.

(_find_sqlite): Handle inline define for amalgamation support.

  1. … 1 more file in changeset.
In the Windows project generator: Move printing the list of found libraries to

the generator code.

* build/generator/

(__init__): Print sorted list here.

* build/generator/

(find_libraries): Remove printing here, as conceptually this output is not

a task of the library detection.

  1. … 1 more file in changeset.
Only write subversion/libsvn_subr/, when its content has changed

instead of on every invocation of

Visual Studio's dependency checker recompiles files that include this

.inc file (read: libsvn_subr). Which then results in relinking libsvn_subr

and everything that uses it after every invocation.

* build/generator/

(write_file_if_changed): Move helper function from to here.

(write_errno_table): To allow using it from this function.

* build/generator/

(write_file_if_changed): Remove function here.

  1. … 1 more file in changeset.
When localization is not enabled in the build, don't generate a 'locale'

project in the Windows project generator.

* build/generator/


Don't generate build_locale.bat if there is nothing to build.


(get_install_targets): Remove the 'locale' project from the install

list if there is no locale support to build.

In the Windows project handling: Convert our Sqlite detection to the depency

framework. Improve handling of the reference macros.

* build/generator/



get_win_libs): Properly parse reference from string.

* build/generator/

(_optional_libraries): New variable.

(__init__): Always find sqlite.

(_find_sqlite): Update implementation to store result in library table.

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

Apply a Windows specific build.conf patch to optimize the MSBuild project

needs-build checking.

This is a Windows specific reversion of r1464496 (and similar to r1464496),

which applied this change to all platforms.

Following up on r1504625, improve some version checks.

* build/generator/

(get_win_defines): Convert values to integers before comparing.

* build/generator/

(_find_perl): Obtain more detailed version for diagnostics.

(_find_python): Use os.path.join() to avoid an error when calling this

function from the test runner.

  1. … 1 more file in changeset.
In the Windows project generator: Switch the perl, python and ruby linkage

detection to the generic library system to remove move more per project

custom code.

* build.conf

(libsvn_swig_py): Link to python.

(libsvn_swig_perl): Link to perl.

(libsvn_swig_ruby): Link to ruby.

(perl, python, ruby): New external libraries.

* build/generator/

(get_install_targets): Automatically drop swig targets based on language


(get_linked_win_depends): Include the external libraries from swig libraries

in the individual swig modules.

(get_win_defines): Move the common defines to the top. Only declare

HAVE_RB_ERRINFO in ruby projects.

(get_win_includes): Remove language specific include handling.

(get_win_lib_dirs): Remove language specific libdir handling.

(get_win_libs): Remove language specific library knowledge.

[python uses a Visual C++ linker trick]

Suppress warnings for optional libraries when not found.

* build/generator/

(find_libraries): Always locate languages.



_find_python): Tweak to new framework. Invoke perl just once.

(_find_serf): Generate proper path.

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

(get_win_includes): Make swig include directory manipulation a

bit clearer by assuming that we have swig when we create such a project.

In the Windows project generator: Make libintl a proper optional dependency,

instead of specializing the includes/libpath/library everywhere.

* build.conf

(libsvn_subr): Use libintl.

(intl): New marker project

* build/generator/

(get_win_includes): Just add includes. Remove libintl support.

Remove duplicated items.

(get_win_lib_dirs): Simplify addition. Remove duplicated items.

(get_win_libs): Remove specialized handling of libintl.

* build/generator/

(SVNCommonLibrary): Add extra_include_dir option.

(find_libraries): Call _find_libintl.

(_find_apr): Really handle an install location.

(_find_openssl): Properly set bin_dir

(_find_libintl): New function.


(Options.add): Make overwriting old values optional.

(.): Don't override every --apr-* argument via --with-httpd.


(locate_libs): Remove libintl specific copying.

  1. … 4 more files in changeset.
In the windows project generator: Handle Cyrus sasl as a proper dependency

instead of local patches to the generator.


Handle sasl as a standard dependency, instead of by using sasl knowledge.

* build/generator/

(get_win_defines): Detect sasl by checking libraries collection.


get_win_lib_dirs): Don't add sasl include dir to all projects, but handle

via dependencies.

(get_win_libs): Remove specialized handling.

* build/generator/

(imports): Remove unused ugly import.

(find_libraries): Find sasl.

(_find_sasl): New function.

  1. … 2 more files in changeset.

Don't generate a zlib project and bat file if we are using an install source.

Suppress warnings when compiling without serf or bdb.

* generator/

Fix Exception when BDB is not found.

Remove now duplicated BDB version information output.

* generator/

Check the right variable for static openssl.

Remove TAB character

Found by: Masaru Tsuchiyama <m.tmatma{_AT_}>

  1. … 1 more file in changeset.
In the Windows project file generator: update openssl and serf to the new

dependency framework. The serf in-tree build needs openssl and we need

openssl for running the tests.

* build/generator/

(get_install_targets): Don't build a serf project if we use an installed


(get_external_project): Update check to avoid .serf_lib

(get_win_defines): Use modern checks for library availability.



get_win_libs): Remove hardcoded serf handling.

(write_serf_project_file): Use modern check.

* build/generator/

(GenDependenciesBase): Remove now unused variable.

(find_libraries): Organize library find calls. Avoid 2 lines for openssl.

(_find_zlib): Find ml from here.

(_find_db): Remove unneeded '\n'

(_find_openssl): New function.

(_get_serf_version): Add include dir argument to allow probing in more


(_find_serf): Fill library object.

  1. … 1 more file in changeset.
In the Windows projectfile generator: hook the ZLib dependency in the new

framework. This support for specifying a zlib install instead of source

directory. In this case no zlib makefile project is created.

* build/generator/

(get_install_targets): Filter on library instances instead of library

specific variables.

(get_win_depends): Allow retrieving all external library dependencies of a


(get_externallib_depends): New function.

(get_win_includes): Determine the include directories based on the

dependencies instead of hardcoded on project name for the already

converted dependencies.

(get_win_lib_dirs): Determine the library directories based on the

dependencies instead of hardcoded.

(get_win_libs): Remove unhandled case for zlib.


* build/generator/

(SVNCommonLibrary): Add is_src variable.

(_find_apr_util_and_expat): Apply minimal version check

(_find_zlib): Parse version and locations of ZLib. Move to sane location.

(_find_zlib): Remove old function here.

  1. … 1 more file in changeset.