gen_vcnet_vcproj.py

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

Changeset 889551 is being indexed.

Further Visual Studio 2010 tweaks: Fix the names of the libraries

to match our versioning convention. Make project paths absolute to

resolve warnings while building and remove some extra semicolons.

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project):

Pass output name without extension to ezt.

* build/generator/templates/vcnet_vcxproj.ezt

Fix fall through values, semicolons and project directories.

  1. … 1 more file in changeset.
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.
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.
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.
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.