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

Changeset 882999 is being indexed.

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.

* build/generator/gen_win.py

(get_install_targets): Remove swig targets if we don't have a swig path.

Follow-up to r37562:

* build/generator/gen_win.py

(WinGeneratorBase._find_swig): Don't use syntax which is supported only by

Python >=2.5.

Follow-up to r37522:

* build/generator/gen_win.py

(WinGeneratorBase._find_swig): Don't try to use 'outfp' when it isn't defined.

Found by: rhuijben

* build/generator/gen_win.py

(WinGeneratorBase._find_swig): Use subprocess.Popen() instead of os.popen4()

for compatibility with Python 3.

Tested by: pburba

On Windows, shared libs for Python bindings should be *.pyd not *.dll.

* build/generator/gen_base.py (TargetSWIG.add_dependencies): Mark Python

wrapper shared libs as type "pyd" not "lib".

* build/generator/gen_make.py, build/generator/gen_win.py

(Generator._extension_map): Add mappings for the "pyd" object type.

* packages/python-windows/setup.py (package_data): Search for *.pyd.

Patch by: Marc Haesen <marc.haesen@oneaccess-net.com>

(Tweaked by me, from http://svn.haxx.se/dev/archive-2009-04/0585.shtml)

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

Try to import winreg module.

(_winreg was renamed to winreg.)

* build/generator/gen_win.py

(WinGeneratorBase._find_jdk): Try to import winreg module.

Create some infrastructure to add additional constraints/checks within the

WC datastore, for developers only.

* subversion/libsvn_wc/wc-checks.sql: new set of SQL commands to create

triggers to perform checks on all operations in the database.

* subversion/libsvn_wc:

(svn:ignore): ignore the wc-checks.h (generated) file

* Makefile.in: clean out the generated wc-checks.h

* build/generator/gen_win.py:

(WinGeneratoreBase._create_sqlite_headers): add new .sql file

* subversion/libsvn_wc/entries.c:

(svn_wc__entries_init): if SVN_DEBUG is defined, then exec all the

statements from wc-checks into the new database.

  1. … 4 more files in changeset.
Add support to build and use SQLite amalgamation version on Windows.

This change implements the same behavior as *nix build system does.

* build/generator/gen_win.py

(parse_options): set self.sqlite_path to sqlite-amalgamation

directory if --with-sqlite parameter not specified.

(get_win_defines): Add SVN_SQLITE_INLINE define in SQLite amalgamation used.

(get_win_includes,get_win_lib_dirs): Use headers and libraries from

correct location if we're using SQLite amalgamation.

(get_win_libs): Do not depend on sqlite3.lib if we're using SQLite

amalgamation.

(_find_sqlite): Try SQLite amalgamation if compiled SQLite not found

in specified location. Error if SQLite version less than 3.4.0.

Tested by: pburba

More merging from the explore-wc branch to trunk.

Revisions merged, and primary (desired) change:

35412: start generating wc-metadata.sql.h

35708: look for wc.db when checking the wc format

35721: be consistent and use wc-metadata.h

35722: move version detection into wc_db

35762: update svn:ignore on libsvn_wc

35861: correct CLEAN_FILES handling in Makefile.in

After handling a few conflicts, post-merge, I needed to #ifdef out some of

the new sqlite code in entries.c, and tweak svn_wc__db_version().

* subversion/libsvn_wc/entries.c:

(...): plain old merge

(svn_wc__entries_write_old, svn_wc__entries_init): add some #ifdef

guards around the new sqlite code.

* subversion/libsvn_wc/wc_db.c:

(...): plain old merge

(svn_wc__db_version): check for APR_ENOENT from the db version test

  1. … 10 more files in changeset.
Cleanup trailing whitespace:

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

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

done

This should have been done before the 1.6.x branch, so I'm going to merge

it over there, to avoid merge conflicts in the future.

  1. … 83 more files in changeset.
Oops. Added a paren too many.

* build/generator/gen_win.py:

(WinGeneratorBase._create_sqlite_headers): remove paren.

When transforming sql files, for the filename parameter, add '.sql' so

that the guard symbols have the proper extension.

* build/generator/gen_win.py:

(WinGeneratorBase._create_sqlite_headers): add .sql to the filename

Found by: Chris Foote <cafoote@yahoo.com>

Clean up the Python used in transform_sql.py, and make it even easier to

use than r35853 (ie. not forced to provide an output file).

* build/transform_sql.py:

(): use consistent string quoting throughout the file (single quotes)

(usage_and_exit): use a more conventional output form, signifying the

variable values, and that brackets mean "optional". detail the option.

remove a useless backslash.

(main): revise args to take file handles rather than names. use a single

re.sub() rather than a couple replace() calls to turn the filename

into a variable name. in the output, note the user should be running

gen-make.py (on Windows, where this script is used). remove an unused

replace() of newlines (the're all gone after the split()), and

simplify the hell out of the "got non-whitespace?" test.

(): adjust the sys.argv handling.

* build/transform_sql.sh: add a comment to fix emacs syntax coloring

* build/generator/gen_win.py:

(WinGeneratorBase._create_sqlite_headers): adjust parameters for

transform_sql.main()

  1. … 2 more files in changeset.
Revert r35748, in accordance with the sentiment described in this thread:

http://svn.haxx.se/dev/archive-2009-02/0151.shtml

[ There were accidental changes to subversion/tests/cmdline/commit_tess.py

committed with the revert. Those changes were themselves reverted in

r35848. ]

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

(parse_options): Skip generating libsvn_auth_kwallet and

libsvn_auth_gnome_keyring projects on Windows.

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.