Checkout Tools
  • last updated 15 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1053998 is being indexed.

Just padding my stats.

(Actually, doing my regular trailing whitespace removal, similar to r875968.)

* everywhere:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

  1. … 166 more files in changeset.
Move projects generated by the Windows build to the right locations. The

necessary changes in the python scripting to handle this also allowed moving

the remaining project templates .ezt files to the templates directory.

Please let me know if this patch breaks something for you.

* build/generator/build_locale.ezt

* build/generator/msvc_dsp.ezt

* build/generator/svn_locale.vcxproj.ezt

* build/generator/build_zlib.ezt

* build/generator/neon.dsp.ezt

* build/generator/serf.dsp.ezt

* build/generator/zlib.dsp.ezt

* build/generator/svn_config.vcproj.ezt

* build/generator/svn_config.vcxproj.ezt

* build/generator/msvc_dsw.ezt

* build/generator/svn_locale.vcproj.ezt

* build/generator/serf.vcxproj.ezt

* build/generator/neon.vcxproj.ezt

* build/generator/zlib.vcxproj.ezt

* build/generator/neon.vcproj.ezt

* build/generator/serf.vcproj.ezt

* build/generator/zlib.vcproj.ezt Moved to build/generator/templates/.

* build/win32/svn_config.dsp

* build/win32/svn_locale.dsp

Moved to build/generator/templates/ with extension .dsp.ezt.

* build/generator/gen_vcnet_vcproj.py

(write): Move svn_config and svn_locale output to the projects directory.

* build/generator/gen_msvc_dsp.py

(write): Generate svn_config and svn_locale projects from a .ezt file, just

like the Visual Studio 2002-2010 versions.

* build/generator/gen_win.py

(WinGeneratorBase::__init__): Generate all files in the projectfiles directory

instead of a few in build/win32.

* build/generator/templates/msvc_dsp.ezt

* build/generator/templates/build_locale.ezt

* build/generator/templates/build_zlib.ezt

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

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

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

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

* build/generator/templates/msvc_dsw.ezt

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

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

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

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

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

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

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

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

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

Moved here from their old locations

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

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

Moved here. Fix relative path to .sql files

  1. … 40 more files in changeset.
Detect the version of ZLib we build as part of the Windows build. This in

preparation of handling newer ZLibs different then older versions.

* build/generator/gen_win.py

(WinGeneratorBase::__init__): Call _find_zlib() to detect the zlib version

and pass zlib version to build_zlib.ezt

(WinGeneratorBase::write_zlib_project_file): Pass zlib version to project

template.

(WinGeneratorBase::_find_zlib): New function.

Allow setting an explicit jdk version to use for building on Windows. This

allows building with a 64 bit JDK when using a 32 bit python (or the

other way around) on Windows x64.

* gen-make.py

(_usage_exit): Show help for --with-jdk.

(global): Parse 'with-jdk' option.

* build/generator/gen_win.py

(parse_options): Set jdk_path to None and fill

from options.

(_find_jdk): If already set, just print the jdk path.

  1. … 1 more file in changeset.
Follow-up to r875957, check for rb_errinfo() when using Ruby 1.9 on Windows.

Define HAVE_RB_ERRINFO if rb_errinfo() is available.

* build/generator/gen_win.py

Import string.

(get_win_defines): Define HAVE_RB_ERRINFO if rb_errinfo() is available.

(_find_ruby): Get the version of Ruby we are linking to.

Remove generation of sql headers from gen_win.py since they're already

generated by gen_base.py on all platforms.

* build/generator/gen_win.py

(WinGeneratorBase. __init__): Remove call to _create_sqlite_headers().

(WinGeneratorBase._create_sqlite_headers): Remove.

Follow-up to r953308.

* build/generator/gen_win.py

(write_serf_project_file): Use *.h wildcard for header files.

Update Visual Studio generator to work with latest serf 0.6.x release.

* build/generator/gen_win.py

(write_serf_project_file): Include auth/*.c and auth/*.h files to generated

serf project.

* build/generator/gen_win.py

(WinGeneratorBase): Allow building agains Sqlite 3.6.23.1. Ignore the patch number

* build/generator/gen_win.py

(get_proj_sources): Following up on r926613, apply the same fix as

r930042 did for the swig build for a shared library build. Also

remove some accidentally added whitespace.

Fix the swig build on Windows (broken since r926613) and use a simpler

construct to check a prefix.

* build/generator/gen_win.py

(get_proj_sources): Add description to swig custom build operations

(get_proj_sources): Use .startswith() instead of a range check.

I love doing parallel builds... but it would be nice if it shows the

same errors every time, instead of generating different ones.

* build.conf

(javahl-tests, javahl-compat-tests):

Add more missing dependencies in the javahl support.

* build/generator/gen_win.py

(adjust_win_depends):

Following up on r926876 and r926884 apply a more generic

java check, to hopefully avoid further patches here.

  1. … 1 more file in changeset.
* build.conf

(javahl-compat-java): Add dependency on javahl-java

* build/generator/gen_win.py

(adjust_win_depends): Apply transformations on javahl-compat-java.

  1. … 1 more file in changeset.
Fix JavaHL dependency calculation on Windows.

* build.conf

(libsvnjavahl): Add dependency on javahl_callback_javah.

* build/generator/gen_win.py

(adjust_win_depends): Apply dependency transformations on

javahl-callback-javah.

  1. … 1 more file in changeset.
Add some more usefull command output than 'Performing Custom Build' on

compiling java files from Visual Studio/MSBuild.

* build/generator/gen_win.py

(get_proj_sources): Fix scope of a few variables and generate a

description to pass to the custom build.

* build/generator/templates/vcnet_vcproj.ezt

* build/generator/templates/vcnet_vcxproj.ezt

(*): Apply custom description.

  1. … 2 more files in changeset.
Fix the JavaHL build on Windows.

* build/generator/gen_win.py

(GeneratorBase::get_configs): Target Java 1.5.

* subversion/bindings/javahl/native/JNIUtil.h

(POP_AND_RETURN_NOTHING): New macro.

* subversion/bindings/javahl/native/JNIUtil.cpp

* subversion/bindings/javahl/native/ProgressListener.cpp

* subversion/bindings/javahl/native/Revision.cpp

* subversion/bindings/javahl/native/SVNAdmin.cpp

(*): Update calls of POP_AND_RETURN() with no arguments to use

POP_AND_RETURN_NOTHING()

  1. … 4 more files in changeset.
Trailing whitespace scrub.

* subversion/libsvn_subr/prompt.c,

subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/native/CreateJ.cpp,

subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,

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

subversion/bindings/swig/ruby/test/test_wc.rb,

subversion/bindings/swig/ruby/svn/wc.rb,

subversion/tests/libsvn_subr/mergeinfo-test.c,

subversion/tests/cmdline/mergeinfo_tests.py,

subversion/tests/cmdline/log_tests.py,

subversion/tests/cmdline/upgrade_tests.py,

subversion/tests/cmdline/lock_tests.py,

subversion/tests/cmdline/switch_tests.py,

subversion/tests/cmdline/merge_authz_tests.py,

subversion/tests/cmdline/update_tests.py,

subversion/tests/cmdline/svntest/actions.py,

subversion/tests/cmdline/patch_tests.py,

subversion/tests/cmdline/merge_tests.py,

subversion/tests/cmdline/checkout_tests.py,

subversion/tests/libsvn_fs_fs/fs-pack-test.c,

subversion/libsvn_ra_svn/client.c,

subversion/svn/cl.h,

subversion/svn/notify.c,

subversion/include/svn_io.h,

subversion/include/svn_wc.h,

subversion/include/private/svn_wc_private.h,

subversion/libsvn_wc/util.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/wc_db.h,

subversion/libsvn_wc/upgrade.c,

subversion/libsvn_wc/workqueue.c,

subversion/libsvn_client/switch.c,

subversion/libsvn_client/externals.c,

subversion/libsvn_client/merge.c,

subversion/libsvn_client/patch.c,

subversion/libsvn_client/revert.c,

subversion/libsvn_client/copy.c,

subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/update.c,

subversion/libsvn_client/commit_util.c,

subversion/libsvn_client/cleanup.c,

subversion/libsvn_ra_neon/ra_neon.h,

subversion/libsvn_repos/load.c,

subversion/libsvn_fs_fs/fs_fs.c,

subversion/libsvn_fs_fs/fs.h,

build/generator/gen_vcnet_vcproj.py,

build/generator/gen_win.py:

Scrub trailing whitespace.

  1. … 54 more files in changeset.
Follow-up to r905787:

* build/generator/gen_win.py

(WinGeneratorBase._create_sqlite_headers): Track parameter list change

for transform_sql.main().

Patch by: joeswatosh

Enable generating Visual Studio/C++ 2010 projects with the project file

generator. This will need some further tweaking, but after this commit

you can get working binaries with VS 2010 Beta 2.

* build/generator/svn_locale.vcxproj.ezt

New template.

* build/generator/gen_vcnet_vcproj.py

(write_project):

Declare config types for new projects. Replace commonly used variable

reference with its MSBuild version. Pass more variables to the ezt file.

Write .vcxproj and .vcxproj.filters files for VS 2010.

(write): Pass explicit project guid to templates to make sure they are

stable even when generating for the first time. Retrieve valid

project extension. Remove _vcnet suffix from project file names, to make

the project names match the file name (MSBuild requirement). Move

dependency generation a bit to allow passing it to the project files.

Remove obsolete quoting and unquoting code inherited from the old VS

6.0 generator.

* build/generator/svn_config.vcxproj.ezt

* build/generator/serf.vcxproj.ezt

* build/generator/neon.vcxproj.ezt

* build/generator/zlib.vcxproj.ezt

New template. Have to be in the generator dir (limitation in python code)

* build/generator/templates/vcnet_vcproj.ezt

Moved to the template directory

* build/generator/templates/vcnet_vcxproj_filters.ezt

* build/generator/templates/vcnet_vcxproj.ezt

New templates

* build/generator/templates/vcnet_sln.ezt

Remove unneeded block close.

* build/generator/svn_config.vcproj.ezt

* build/generator/serf.vcproj.ezt

* build/generator/neon.vcproj.ezt

Use passed project guid.

* build/generator/vcnet_vcproj.ezt

Moved to templates directory

* build/generator/zlib.vcproj.ezt

Use passed project guid.

* build/generator/gen_win.py

Pass project guids

* build/win32

Add *.vcxproj to svn:ignore

  1. … 15 more files in changeset.
* gen_win.py

(*): Use print() instead of stderr.write() for outputting all

notifications except fatal errors to make the generator

output its notifications in order.

Without this patch stderr and stdout output can be delayed,

making the log somewhat distorted.

As small step for adding Visual Studio 2010 support, switch some internal

defaults to prefer the newer solution formats over the 2002/2003 formats.

Also move the solution templates to the recently introduced templates

directory.

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project): Update property user

(Generator.write): Pass solution and studio versions and information on

where to generate dependencies. Use the old template for 2002 and 2003

versions and the new template for all newer versions.

* build/generator/gen_win.py

(GeneratorBase.parse_options): Rename Visual Studio/C++ variables to match

their usage and to help further processing. Add studio version and

project extension variables. Stop using version numbers

(WinGeneratorBase.__init__): Write the stored version instead of

determining the version from the project version. Choose the supported

targets based on the VC version

* build/generator/templates/vcnet_sln.ezt

Copied from build/generator/vc2005_sln.ezt. Write passed Visual Studio

version and only write dependencies if the dependency storage location

is the solution.

* build/generator/templates/vcnet_vc7_sln.ezt

Copied from build/generator/vcnet_sln.ezt

* build/generator/vc2005_sln.ezt

* build/generator/vcnet_sln.ezt

Deleted

  1. … 5 more files in changeset.
In preparation for adding Visual Studio 2010 support, move the project guid

generation to the creation of the targets and provide the guid to the project

templates.

Visual Studio moves the dependency references from the solution file to the

project files and requires guid references for the IDE.

* build/generator/gen_vcnet_vcproj.py

(imports): Remove md5 import

(Generator.write_project): Rename variable and pass project guid to ezt.

(Generator.makeguid): Move to gen_win.py.

* build/generator/gen_win.py

(imports): Import md5 support

(GeneratorBase.makeguid): Moved here from gen_vcnet_vcproj.py.

(GeneratorBase.write): Get guid from target instead of generating it and

store the result on the target to allow retrieving it when writing the

project file.

* build/generator/vcnet_vcproj.ezt

Write ProjectGUID in vcproj file.

  1. … 2 more files in changeset.
Follow-up to r882679: Fix Windows build.

* build/generator/gen_win.py

(_create_sqlite_headers): Add libsvn_fs_fs/revprops-db.sql to the SQL

sources list.

Apply ASF license headers to a number of files included under that license

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}apache.org>

  1. … 175 more files in changeset.
Scrub trailing whitespace throughout (see r35894).

  1. … 146 more files in changeset.
* build/generator/gen_win.py

(GeneratorBase._find_bdb): Support Berkeley DB 4.8.

Follow-up to r39285:

* build/generator/gen_win.py

(WinGeneratorBase._find_serf): Don't hardcode minimal version of Serf in

a message.

I introduced a bug in my mods to Edmund's patch. He found; here's the fix.

* build/generator/gen_win.py:

(_get_serf_version): correct a couple variable names

Fixed gen_win.py such that it checks for the presence of the Serf library

(which it does prior to this patch) and also outputs the library version

(which is what this patch does). It also checks if the serf version >=

0.3.0. If not, ra_serf is not built.

* build/generator/gen_win.py:

(_get_serf_version): New function to return the serf library version.

(_find_serf): Added a version check and if a valid version is found,

ra_serf is built; otherwise, it isn't. If the version cannot be

determined, ra_serf will still be built. The user is the informed of

the results.

Patch by: Edmund Wong <ed@kdtc.net>

Suggested by: danielsh

Patch heavily tweaked by: gstein

* build/generator/gen_win.py

(get_install_targets): Following up on r38305, skip swig file generation

if swig_libdir is not available. This matches other tests for swig and

should fix the Windows buildbot.