Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 875822 is being indexed.

Use '.sql_h' filename extension for headers generated from '.sql' files.

This filename extension (or .sql.h) allows to easier distinguish headers

generated from .sql files.

* Makefile.in

(fast-clean, .SUFFIXES): Update.

(.sql.h): Rename to ...

(.sql.sql_h): ... this.

* build.conf

(private-built-includes): Update.

* build/generator/gen_win.py

(WinGeneratorBase._create_sqlite_headers): Update.

* subversion/libsvn_fs_fs/rep-cache.c: Include "rep-cache-db.sql_h" instead of

"rep-cache-db.h".

[ Reverted in r35846. ]

  1. … 3 more files in changeset.
A few cleanups for generating the sql headers on windows. I do not have a

Windows build, and thus have no way of testing this.

* build/generator/gen_win.py

(__init__): Update caller.

(_create_sqlite_headers): Renamed from _create_sqlite_header(), and made

a bit more extensible for adding future derived files.

Fix build with BSD make.

* Makefile.in: Don't use GNU-specific static pattern ("%.o: %c"-style

syntax) to build a header file from an sql file. Use suffix rules

instead, like the rest of the Makefile already does.

* build.conf,

subversion/libsvn_fs_fs/rep-cache.c: For suffix rules to work, the target

filename may contain only a single dot. So rename rep-cache-db.sql.h to

just rep-cache-db.h.

* build/generator/gen_win.py: Try not to break the Windows build and track

the rename made in build.conf and rep-cache.c.

  1. … 3 more files in changeset.
Python 3 compatibility:

Don't use 'cmp' argument of sort() in 'build' directory.

* build/generator/gen_make.py:

* build/generator/gen_msvc_dsp.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py: Don't use 'cmp' argument of sort().

  1. … 3 more files in changeset.
Follow-up to r35352, fix the Windows build by transforming the rep-sharing

sql schema file into a header file on Windows too.

* autogen.sh: Account for rename of transform-sql.py to transform_sql.py

* build/generator/gen_win.py

(WinGeneratorBase.__init__): Call _find_sqlite().

(WinGeneratorBase._create_sqlite_header): New, does for Windows what

autogen.sh and r35352 do for Linux.

* build/transform-sql.py: Rename from this...

* build/transform_sql.py: ...to this, because gen_win.py needs to import it

and imported modules must follow the same rules for valid variable names.

  1. … 3 more files in changeset.
Following up on r35263, reverted r35252 to re-enable --with-sqlite option to

gen-make.py on Windows.

* build/generator/gen_win.py

* gen-make.py

Reverse merged r35263

  1. … 1 more file in changeset.
Follow-up to r35241, use the sqlite amalgamation included in libsvn_subr

when building on Windows.

[Reverted in r35294]

* build/generator/gen_win.py

(GeneratorBase.parse_options): Remove self.sqlite_path initialization

and parsing of '--with-sqlite' option.

(WinGeneratorBase.__init__): Don't try to find sqlite.

(WinGeneratorBase.get_win_includes,

WinGeneratorBase.get_win_lib_dirs,

WinGeneratorBase.get_win_libs): Remove sqlite related stuff.

(WinGeneratorBase._find_sqlite): Remove.

* gen-make.py

(_usage_exit, Options): Remove --with-sqlite option.

  1. … 1 more file in changeset.
Python 3 compatibility:

Import io.StringIO when using Python 3.

* build/generator/gen_win.py:

* subversion/bindings/ctypes-python/test/wc.py:

* subversion/bindings/swig/python/tests/delta.py:

* subversion/bindings/swig/python/tests/mergeinfo.py:

* subversion/bindings/swig/python/tests/ra.py:

* subversion/bindings/swig/python/tests/repository.py:

* subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py:

* subversion/bindings/swig/python/tests/wc.py:

* subversion/tests/cmdline/svntest/tree.py:

* tools/hook-scripts/mailer/mailer.py: Import io.StringIO when using Python 3.

  1. … 9 more files in changeset.
Follow-up to r34465:

* build/generator/gen_win.py

(WinGeneratorBase.create_dll_target): Use dict.keys() instead of

dict.iterkeys() for compatibility with Python 3.

Fix 'RuntimeError: maximum recursion depth exceeded' in CSVN. The fix isn't

compatible with Python 3, because Python 3 doesn't contain UserDict module.

* subversion/bindings/ctypes-python/csvn/types.py

(Hash._keys): New.

(Hash.keys): Use Hash._keys().

(Hash.items): Renamed from ...

(Hash.iteritems): ... this.

  1. … 1 more file in changeset.
Python 3 compatibility:

Use dict.keys(), dict.values() and dict.items() instead of dict.iterkeys(),

dict.itervalues() and dict.iteritems().

Use list(dict.keys()), list(dict.values()) and list(dict.items()) instead of

dict.keys(), dict.values() and dict.items(). Function calls with 'for', 'in' or

len() weren't updated.

* build/generator/ezt.py:

* build/generator/gen_base.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* build/win32/make_dist.py:

* gen-make.py:

* subversion/bindings/ctypes-python/csvn/types.py:

* subversion/bindings/ctypes-python/examples/log.py:

* subversion/bindings/ctypes-python/examples/trunkify.py:

* subversion/bindings/swig/python/tests/mergeinfo.py:

* subversion/bindings/swig/python/tests/ra.py:

* subversion/bindings/swig/python/tests/wc.py:

* subversion/tests/cmdline/externals_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

* tools/bdb/svn-bdb-view.py:

* tools/dev/contribulyze.py:

* tools/dev/gen-javahl-errors.py:

* tools/dev/normalize-dump.py:

* tools/dev/trails.py:

* tools/dev/which-error.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/mailer.py:

* tools/hook-scripts/svnperms.py: Use dict.keys(), dict.values() and

dict.items() instead of dict.iterkeys(), dict.itervalues() and

dict.iteritems(). Use list(dict.keys()), list(dict.values()) and

list(dict.items()) instead of dict.keys(), dict.values() and dict.items().

  1. … 22 more files in changeset.
Python 3 compatibility:

Use list comprehensions or list(filter()) instead of filter().

* build/generator/gen_win.py:

* build/run_tests.py:

* subversion/tests/cmdline/changelist_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

* subversion/tests/cmdline/svntest/main.py:

* subversion/tests/cmdline/svntest/wc.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/mailer.py:

* win-tests.py: Use list comprehensions or list(filter()) instead of filter().

  1. … 8 more files in changeset.
Delete trailing whitespace.

Follow-up to r26317 and r27598.

* build/generator/extractor.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py:

* subversion/bindings/ctypes-python/csvn/repos.py:

* subversion/bindings/ctypes-python/csvn/wc.py:

* subversion/bindings/ctypes-python/examples/mucc.py:

* subversion/bindings/ctypes-python/setup.py:

* subversion/bindings/ctypes-python/test/localrepos.py:

* subversion/bindings/ctypes-python/test/remoterepos.py:

* subversion/bindings/ctypes-python/test/run_all.py:

* subversion/bindings/ctypes-python/test/svntypes.py:

* subversion/bindings/ctypes-python/test/wc.py:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:

* subversion/include/private/svn_auth_private.h:

* subversion/include/private/svn_sqlite.h:

* subversion/include/private/svn_wc_private.h:

* subversion/include/svn_auth.h:

* subversion/include/svn_checksum.h:

* subversion/include/svn_client.h:

* subversion/include/svn_cmdline.h:

* subversion/include/svn_dirent_uri.h:

* subversion/include/svn_path.h:

* subversion/include/svn_props.h:

* subversion/libsvn_client/commit_util.c:

* subversion/libsvn_client/copy.c:

* subversion/libsvn_client/deprecated.c:

* subversion/libsvn_client/export.c:

* subversion/libsvn_client/externals.c:

* subversion/libsvn_client/info.c:

* subversion/libsvn_client/merge.c:

* subversion/libsvn_client/mergeinfo.h:

* subversion/libsvn_client/ra.c:

* subversion/libsvn_client/repos_diff.c:

* subversion/libsvn_fs_base/bdb/checksum-reps-table.c:

* subversion/libsvn_fs_base/bdb/checksum-reps-table.h:

* subversion/libsvn_fs_base/bdb/miscellaneous-table.c:

* subversion/libsvn_fs_base/bdb/reps-table.c:

* subversion/libsvn_fs_base/dag.c:

* subversion/libsvn_fs_base/dag.h:

* subversion/libsvn_fs_base/err.h:

* subversion/libsvn_fs_base/fs.c:

* subversion/libsvn_fs_base/reps-strings.c:

* subversion/libsvn_fs_base/tree.c:

* subversion/libsvn_fs_base/tree.h:

* subversion/libsvn_fs_base/util/fs_skels.c:

* subversion/libsvn_fs_fs/dag.h:

* subversion/libsvn_fs_fs/fs_fs.h:

* subversion/libsvn_fs/fs-loader.c:

* subversion/libsvn_fs/fs-loader.h:

* subversion/libsvn_fs_fs/rep-cache.c:

* subversion/libsvn_fs_fs/rep-cache.h:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_ra/compat.c:

* subversion/libsvn_ra_neon/log.c:

* subversion/libsvn_ra_neon/session.c:

* subversion/libsvn_ra_serf/log.c:

* subversion/libsvn_ra_serf/update.c:

* subversion/libsvn_ra_serf/util.c:

* subversion/libsvn_ra_serf/win32_auth_sspi.c:

* subversion/libsvn_repos/hooks.c:

* subversion/libsvn_repos/log.c:

* subversion/libsvn_repos/repos.h:

* subversion/libsvn_subr/checksum.c:

* subversion/libsvn_subr/cmdline.c:

* subversion/libsvn_subr/config_file.c:

* subversion/libsvn_subr/config_win.c:

* subversion/libsvn_subr/dirent_uri.c:

* subversion/libsvn_subr/dso.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/nls.c:

* subversion/libsvn_subr/simple_providers.c:

* subversion/libsvn_subr/sqlite.c:

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c:

* subversion/libsvn_subr/stream.c:

* subversion/libsvn_subr/win32_crypto.c:

* subversion/libsvn_wc/adm_ops.c:

* subversion/libsvn_wc/diff.c:

* subversion/libsvn_wc/props.c:

* subversion/libsvn_wc/status.c:

* subversion/libsvn_wc/tree_conflicts.c:

* subversion/libsvn_wc/tree_conflicts.h:

* subversion/libsvn_wc/update_editor.c:

* subversion/libsvn_wc/wc_db.h:

* subversion/svn/cl.h:

* subversion/svndumpfilter/main.c:

* subversion/svnlook/main.c:

* subversion/svn/propedit-cmd.c:

* subversion/svn/propget-cmd.c:

* subversion/svnserve/main.c:

* subversion/svn/status-cmd.c:

* subversion/svn/tree-conflicts.c:

* subversion/svn/util.c:

* subversion/tests/cmdline/commit_tests.py:

* subversion/tests/cmdline/copy_tests.py:

* subversion/tests/cmdline/info_tests.py:

* subversion/tests/cmdline/log_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/prop_tests.py:

* subversion/tests/cmdline/revert_tests.py:

* subversion/tests/cmdline/stat_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

* subversion/tests/cmdline/svntest/tree.py:

* subversion/tests/cmdline/switch_tests.py:

* subversion/tests/cmdline/tree_conflict_tests.py:

* subversion/tests/cmdline/update_tests.py:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/tests/libsvn_subr/checksum-test.c:

* subversion/tests/libsvn_subr/dirent_uri-test.c:

* subversion/tests/libsvn_subr/path-test.c:

* subversion/tests/libsvn_subr/target-test.c:

* subversion/tests/libsvn_wc/tree-conflict-data-test.c:

* tools/examples/svnlook.py: Delete trailing whitespace.

  1. … 112 more files in changeset.
Python 3 compatibility:

Use list comprehensions or list(map()) instead of map().

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* build/generator/swig/header_wrappers.py:

* build/run_tests.py:

* subversion/tests/cmdline/changelist_tests.py:

* subversion/tests/cmdline/checkout_tests.py:

* subversion/tests/cmdline/getopt_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/svnadmin_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

* subversion/tests/cmdline/svntest/main.py:

* subversion/tests/cmdline/svntest/verify.py:

* subversion/tests/cmdline/tree_conflict_tests.py:

* tools/bdb/skel.py:

* tools/dev/iz/find-fix.py:

* tools/dev/svn-merge-revs.py:

* tools/dist/write-announcement.py:

* tools/hook-scripts/mailer/mailer.py:

* win-tests.py: Use list comprehensions or list(map()) instead of map().

  1. … 20 more files in changeset.
Following up on r33539, perform some code cleanup in gen_win.py.

* build/generator/gen_win.py

(GeneratorBase._find_swig), (GeneratorBase._find_neon),

(GeneratorBase._find_apr), (GeneratorBase._find_apr_util),

(GeneratorBase._find_sqlite):

Don't compile regexes only used once, and use map() to remove doing

the same conversion three times.

Suggested by: gstein

Add some extra SQLite detection to the windows project generator. Return an

error when SQLite is not found and a warning when the version is not

up to date.

This behavior matches that of apr, zlib and other dependencies.

* build/generator/gen_win.py

(GeneratorBase.parse_options): Default sqlite_path to 'sqlite' instead

of None.

(GeneratorBase.__init__): Don't return an error if sqlite_path is not

set. Call _find_sqlite() to check sqlite installation and version.

(GeneratorBase._find_sqlite): Add new function that verifies that sqlite

is available and checks the SQLite version (>= 3.4 now).

Following up on r33520, break the windows build from gen_win.py instead of

when compiling, if sqlite is not available.

This patch reverts r33387, r33160, r33159 and some parts of r33105.

* build/generator/gen_win.py

(WinGeneratorBase.__init__): Write error if --with-sqlite is not provided.

(WinGeneratorBase.get_win_defines), (WinGeneratorBase.get_win_lib_dirs),

(WinGeneratorBase.get_win_libs): Assume sqlite is always available.

* build/generator/gen_win.py

(get_proj_sources): Add dependency on the build.conf to the .def file

generation from Visual C++ projects. This fixes added and removed

export headers in build.conf without cleaning the entire workingcopy.

Found by: danielsh

Generate Visual C++ project files with Source and Header files filters like

Visual C++ 2002-2008 would do when you created the project files manually

there.

This enhances the development experience in Visual C++ and doesn't change

the build itself.

* build/generator/gen_win.py

(get_proj_sources): Add extension property to the returned ProjectItem

instances. Set the extension to '' where we don't have a real file

extension.

* build/generator/vcnet_vcproj.ezt

Generate a 'Header Files' filter containing all headers used by the

project and a 'Source Files' filter containing all other files.

  1. … 1 more file in changeset.
Python 3 compatibility:

Use str.replace() instead of string.replace().

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/gen_msvc_dsp.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* build/generator/swig/header_wrappers.py:

* build/strip-po-charset.py: Use str.replace() instead of string.replace().

  1. … 6 more files in changeset.
Python 3 compatibility:

Use str.strip(), str.lstrip() and str.rstrip() instead of string.strip(),

string.lstrip() and string.rstrip().

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* build/generator/util/executable.py:

* subversion/tests/cmdline/commit_tests.py:

* tools/backup/hot-backup.py.in:

* tools/dev/iz/find-fix.py:

* tools/dev/normalize-dump.py: Use str.strip(), str.lstrip() and str.rstrip()

instead of string.strip(), string.lstrip() and string.rstrip().

  1. … 6 more files in changeset.
Python 3 compatibility:

Use str.join() instead of string.join().

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* build/generator/swig/header_wrappers.py:

* subversion/libsvn_subr/genctype.py:

* subversion/tests/cmdline/commit_tests.py:

* tools/dev/iz/find-fix.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/mailer.py:

* tools/hook-scripts/mailer/tests/mailer-t1.sh: Use str.join() instead of

string.join().

  1. … 10 more files in changeset.
Python 3 compatibility:

Use str.split() instead of string.split().

* build/generator/ezt.py:

* build/generator/gen_base.py:

* build/generator/gen_win.py:

* build/generator/swig/header_wrappers.py:

* build/generator/util/executable.py:

* tools/dev/iz/find-fix.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/mailer.py:

* win-tests.py: Use str.split() instead of string.split().

  1. … 8 more files in changeset.
Python 3 compatibility:

Use str.lower() and str.upper() instead of string.lower() and string.upper().

* build/generator/ezt.py:

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* win-tests.py: Use str.lower() and str.upper() instead of string.lower() and

string.upper().

  1. … 5 more files in changeset.
Python 3 compatibility:

Use str.count() instead of string.count().

* build/generator/gen_base.py:

* build/generator/gen_win.py: Use str.count() instead of string.count().

  1. … 1 more file in changeset.
Python 3 compatibility:

Use str.find() instead of string.find().

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py: Use str.find() instead of string.find().

  1. … 1 more file in changeset.
Follow up r33359. In the Windows build system, only add dependency on

the sqlite library when its path was specified to gen-make.py.

* build/generator/gen_win.py

(WinGeneratorBase.get_win_libs): Check for the sqlite libraries before

including it as a dependency to the targets.

Follow-up to r33335:

Fix compatibility with Python 2.*.

* build/generator/gen_win.py:

* build/get-py-info.py:

* build/win32/make_dist.py:

* win-tests.py: Fix calls to print().

Found by: lgo

Suggested by: gstein

  1. … 3 more files in changeset.
Python 3 compatibility:

Update calls to print() in 'build' directory, 'gen-make.py' and 'win-tests.py'.

* build/generator/extractor.py:

* build/generator/gen_win.py:

* build/generator/swig/checkout_swig_header.py:

* build/generator/swig/external_runtime.py:

* build/generator/swig/header_wrappers.py:

* build/get-py-info.py:

* build/getversion.py:

* build/run_tests.py:

* build/strip-po-charset.py:

* build/win32/make_dist.py:

* gen-make.py:

* win-tests.py: Call print() or file.write().

  1. … 11 more files in changeset.
Python 3 compatibility:

Don't use 'has_key'.

* build/generator/ezt.py:

* build/generator/gen_base.py:

* build/generator/gen_win.py:

* gen-make.py:

* subversion/bindings/swig/python/svn/repos.py:

* subversion/bindings/swig/python/tests/client.py:

* subversion/bindings/swig/python/tests/ra.py:

* subversion/tests/cmdline/changelist_tests.py:

* subversion/tests/cmdline/info_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

* subversion/tests/cmdline/svntest/entry.py:

* subversion/tests/cmdline/svntest/main.py:

* tools/backup/hot-backup.py.in:

* tools/bdb/erase-all-text-data.py:

* tools/bdb/svn-bdb-view.py:

* tools/client-side/change-svn-wc-format.py:

* tools/dev/contribulyze.py:

* tools/dev/normalize-dump.py:

* tools/dev/verify-history.py:

* tools/examples/blame.py:

* tools/hook-scripts/mailer/mailer.py:

* tools/hook-scripts/svnperms.py: Use 'in' instead of 'has_key'.

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

Following up to r33159, use append to add a path to the list of include

directories.