gen_vcnet_vcproj.py

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

Changeset 880443 is being indexed.

Scrub trailing whitespace throughout (see r35894).

  1. … 146 more files in changeset.
In the Windows build and tests, be more robust when invoking Python scripts

by using the full path to the Python interpreter. (This avoids assuming

that 'python foo.py' or 'foo.py' will run the script.)

Thanks to Bert and gstein.

* build/generator/svn_config.vcproj.ezt

(sql): Add the Python interpreter's path to the command.

* build/generator/gen_vcnet_vcproj.py

(Generator.write): Pass the interpreter's pass to the template.

* subversion/tests/cmdline/svneditor.bat:

Run svneditor.py using the python in %SVN_TEST_PYTHON%.

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

(use_editor):

Set SVN_TEST_PYTHON.

  1. … 3 more files in changeset.
Add sql file translation to the stub svn_config project in the Visual Studio

solution, to remove the gen_make.py requirement on query/schema changes.

* build/generator/gen_vcnet_vcproj.py

(write): Gather sql dependencies and send these to the svn_config project

template.

* build/generator/svn_config.vcproj.ezt

Generate custom build targets for the sql projects.

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

Try to use hashlib module.

* build/generator/gen_vcnet_vcproj.py

(Generator.makeguid):

* tools/dev/scramble-tree.py

(hashDir.gen_seed): Try to use hashlib module.

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

(generator.write_project): Following up on r32012, also use utility projects

for java compilation, to fix the Javahl build on VS2008.

* build/generator/gen_vcnet_vcproj.py

(write): Don't add projects to the 'dll' group when we are building a

static build.

* build/generator/gen_vcnet_vcproj.py

(Generator.makeguid): Delete code used only by Python 1.*.

* subversion/bindings/ctypes-python/README

(BUILDING CSVN): Update.

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

(): Don't define Py_RETURN_NONE.

* subversion/tests/cmdline/info_tests.py

(match_xml_element): Directly compare dictionaries.

(same_dict): Delete.

* tools/client-side/server-version.py: Delete probably outdated comment.

* tools/hook-scripts/mailer/mailer.py: Delete code used only by Python <2.3.

  1. … 5 more files in changeset.
Use sorted() to simplify some code.

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/gen_vcnet_vcproj.py:

* build/win32/make_dist.py:

* doc/tools/bin/find-xsl.py:

* gen-make.py:

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

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

* subversion/tests/cmdline/changelist_tests.py:

* subversion/tests/cmdline/svnadmin_tests.py:

* subversion/tests/cmdline/svnlook_tests.py:

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

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

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

* tools/dev/contribulyze.py:

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

* tools/dev/normalize-dump.py:

* tools/dev/which-error.py:

* tools/examples/svnshell.py:

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

* tools/po/l10n-report.py: Use sorted() to simplify some code.

  1. … 20 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.
Python 3 compatibility:

Don't assing values to True/False keywords.

* build/generator/gen_make.py:

* build/generator/gen_msvc_dsp.py:

* build/generator/gen_vcnet_vcproj.py:

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

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

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

* tools/dev/contribulyze.py:

* tools/hook-scripts/log-police.py:

* tools/hook-scripts/mailer/mailer.py: Don't assing values to True/False keywords.

  1. … 8 more files 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.
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.
* build/generator/gen_vcnet_vcproj.py

(Generator.write): Following up on r33515 and r33542. Keep the Windows

buildbot happy by moving the java projects to the solution root.

(The buildbot should build __JAVAHL__ and no separate projects)

* build/generator/gen_vcnet_vcproj.py

(Generator.write): Following up on r33515, Move projects with name

starting with '__' to the solution root.

Create a few solution groups in the Visual C++ 2005 and 2008 solutions to

make it easier to find the module I'm working on.

This doesn't change the build, but groups the projects in the Visual Studio

IDE. The groups created are Libraries,

Libraries/Dlls, Libraries/Swig, Libraries/Java, Programs and Tests.

* build/generator/gen_vcnet_vcproj.py

(Generator.write): Calculate the group to place the project in and

provide the group to the ProjectItem constructor for usage by the

template writer.

* build/generator/vc2005_sln.ezt

(Template): Add 6 predefined group projects and add a group placement

block. This block declares in which parent a project should be shown.

  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.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.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 to r32012.

* build/generator/gen_vcnet_vcproj.py

(write_project): Remove duplicate condition.

Fix Visual Studio meta-projects on VS2008.

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project): Change the meta-project targets (such as

__ALL__) to Utility project types so they don't cause issues when building

with VS2008.

Make generated solution and project files compatible with VS2008 and

MSBuild 3.5 if the --vsnet-version=2008 option is used.

Patch by: Bert Huijben <b.huijben@competence.biz>

* build/generator/gen_vcnet_vcproj.py

Check for new version and use VS2005 solution template

* build/generator/gen_win.py

Allow more versions and set solution and project version for VS2008

Fixed a typo in the error case

* build/generator/vc2005_sln.ezt

Updated to insert "2005" or "2008" based on the selected version.

* gen-make.py

Updated --help documentation

  1. … 3 more files in changeset.
Channeling Erik Hülsmann, remove all trailing whitespace within our source

tree:

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

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

done

Inspired by: ehu

  1. … 449 more files in changeset.
Grammar police; nothing to see, move along.

* notes/wc-improvements, notes/webdav-general-summary,

build/ac-macros/neon.m4, build/generator/gen_vcnet_vcproj.py,

build/generator/gen_base.py, subversion/libsvn_wc/copy.c,

subversion/libsvn_wc/status.c, subversion/libsvn_subr/io.c,

subversion/libsvn_client/copy.c, subversion/tests/cmdline/copy_tests.py,

subversion/tests/cmdline/commit_tests.py, tools/client-side/svn-graph.pl,

tools/dev/trails.py, doc/user/lj_article.txt, INSTALL,

packages/windows-innosetup/tools/svnpath/main.c,

packages/windows-innosetup/is_main.pas,

packages/windows-innosetup/Readme.txt,

packages/windows-innosetup/templates/svn_version.iss:

"it's" expands to "it is" or "it has". Don't use it where the possesive

was intended.

  1. … 18 more files in changeset.
A follow-up to r23004.

* build/generator/gen_vcnet_vcproj.py

(Generator.getguid): Explicitly close the "proj" file.

Fix dependencies for VS200x solution generation.

Since we aren't generating the apr project files for VS200x anymore

we need to make sure the solution file we generate contains the

correct guids or else project dependencies will not work.

* build/generator/gen_vcnet_vcproj.py

(Generator.getguid): New method to get the guid of an existing project

if it has one.

(Generator.write): Use getguid if it is an external project and fall

back to makeguid as needed.

Allow checked-out versions of APR, APR-util, APR-iconv to work by letting

Visual Studio do the conversion for us instead of producing corrupt solutions

out of the box.

* build/generator/gen_vcnet_vcproj.py

(get_external_project): Override with fallback logic to dsp's if we don't

have a vcproj file already so we don't produce corrupt solutions.

In the Windows build provide separate debug information files

for the static libraries.

* build/win32/make_dist.py

Fix svn.exe directory and include new pdb files.

* build/generator/gen_vcnet_vcproj.py

(write_project): Setup output pdb name for template.

* build/generator/gen_msvc_dsp.py

(write_project): Ditto.

* build/generator/msvc_dsp.ezt

Add compiler directive to set output pdb name.

* build/generator/vcnet_vcproj.ezt

Ditto.

* build/generator/gen_win.py

(get_output_pdb): New function to get pdb file name.

  1. … 5 more files in changeset.