gen_vcnet_vcproj.py

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

Changeset 875686 is being indexed.

* 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.
Don't carry around our own Visual Studio project files for Apache/APR.

They only worked for APR 0.9.x and the user just needs to manually

convert them once.

* INSTALL

Document that the user must convert the APR .dsp's to .vcproj's.

* build/generator/gen_vcnet_vcproj.py

(write): Don't install our own APR .vcproj files anymore.

* build/generator/libaprutil.vcproj.ezt

Removed.

* build/generator/libapr.vcproj.ezt

Removed.

* build/generator/gen_uri_delims.vcproj.ezt

Removed.

* build/generator/libapriconv_ccs_modules.vcproj.ezt

Removed.

* build/generator/libapriconv_ces_modules.vcproj.ezt

Removed.

* build/generator/xml.vcproj.ezt

Removed.

* build/generator/libapriconv.vcproj.ezt

Removed.

  1. … 8 more files in changeset.
Implement generation of project files for building Serf on

Windows.

NOTE: This doesn't add option to link Subversion with Serf

on Windows. It is only add ability to build ra_serf. Option

to enable Subversion use ra_serf will be committed later.

* build.conf

(serf): Rename external project to be serf instead of libserf,

since we use static linking on Windows.

* build/generator/gen_vcnet_vcproj.py

* build/generator/gen_msvc_dsp.py

(write): Write serf project file too.

* build/generator/gen_win.py

(parse_options): Parse new option '--with-serf'.

(get_external_project): Change location of serf project,

if serf path is specified.

(get_win_includes): Add serf path to includes list.

(write_serf_project_file): New method for generation serf project

file.

* build/generator/serf.dsp.ezt

* build/generator/serf.vcproj.ezt

New templates for serf project files.

* gen-make.py

Add new option '--with-serf' to usage text and options list.

  1. … 6 more files in changeset.
Make generated solution and project files compatible with MSBuild,

VS2005, and VC2005 Express if the --vsnet-version=2005 option is used.

Patch by: George Wieggers <george.wieggers@gmail.com>

Tweaked by: me

* build/generator/gen_vcnet_vcproj.py

(write): Strip off extraneous " chars and use the new template

for the 2005 versions of MS compilers/builders.

* build/generator/vc2005_sln.ezt

New solution file template for 2005 versions.

  1. … 1 more file in changeset.
Teach the Windows build to compile ZLib 1.2.x from sources, using MASM

if available. This simplifies the build, and (finally!) allows us to

build debug-mode Windows binaries without getting warnings about

clashes between the release and debug C runtime DLLs.

* build.conf (zlib): New dummy project.

* build/generator/gen_win.py

(WinGeneratorBase.__init__): If we're building ZLib, see if we have

an assembler avaliable, and generate build_zlib.bat.

(WinGeneratorBase.adjust_win_depends): Build ZLib before Neon.

(WinGeneratorBase.write_zlib_project_file): New.

(WinGeneratorBase._find_ml): New. Look for the MASM assembler.

* build/generator/build_zlib.ezt: New. Template for build_zlib.bat.

* build/generator/build_neon.ezt: In debug mode, link with the debug ZLib.

* build/generator/zlib.dsp.ezt: New. Template for zlib.dsp.

* build/generator/zlib.vcproj.ezt: New. Template for zlib.vcproj.

* build/generator/gen_msvc_dsp.py (Generator.write),

build/generator/gen_vcnet_vcproj.py (Generator.write):

Call write_zlib_project_file.

* build/win32: Ignore the generated build_zlib.bat

  1. … 8 more files in changeset.
Build generator: Some cleanups. First, don't list names for generators which

have not been implemented. Second, simplify the Generator interface by removing

the configurable output file name - it was an unused and flawed concept, since

2 of the 3 generators generate multiple files anyway.

* gen-make.py (gen_modules): Remove stub entries for non-implemented generator

modules. It is trivial to add a line here if/when an additional generator

is implemented.

(main): Remove the 'not yet implemented' error, it's no longer accurate.

Remove oname parameter, no longer call default_output, and pass no parameter

to write().

* build/generator/gen_vcnet_vcproj.py (Generator.default_output): Remove.

(write): Take no parameters. Use a literal name for the solution file.

* build/generator/gen_vcnet_nmake.py (Generator.default_output): Remove.

(write): Take no parameters. Use a literal name for the workspace file.

* build/generator/gen_make.py (Generator.default_output): Remove.

(write): Take no parameters. Use a literal name for the output file.

  1. … 3 more files in changeset.
Update the Win32 build and packaging scripts:

-- the location of the Neon sources and libintl can be customised;

-- add some missing libraries and the *.mo files to the distribution.

* gen-make.py: Add options --with-neon and --with-libintl.

* build/generator/gen_win.py

(WinGeneratorBase.parse_options): Handle --with-neon and --with-libintl.

(WinGeneratorBase.__init__): Use the neon path parameter when generating

build_neon.bat.

(WinGeneratorBase.get_win_includes): Point at the Neon and libibintl

include directories.

(WinGeneratorBase.get_win_libs): Point at intl.lib.

(WinGeneratorBase.write_neon_project_file): New.

(WinGeneratorBase.move_proj_file): Move here from gen_vcnet_vcproj.py

and add an optional list of parameters for template generation.

* build/generator/gen_vcnet_vcproj.py

(Generator.move_proj_file): Move to WinGeneratorBase.

(Generator.write): Use write_neon_project_file to generate neon.vcproj.

* build/generator/gen_msvc_dsp.py

(Generator.write): Use write_neon_project_file to generate neon.dsp.

* build/generator/build_neon.ezt: Parametrize the Neon source path.

* build/generator/neon.dsp.ezt: New. Used to generate neon.dsp.

* build/generator/neon.vcproj.ezt: Don't hardcode the list of Neon files.

* build/win32/neon.dsp: Remove. This file is now generated.

* win-tests.py: Optionally copy intl.dll where the test programs

can find it.

* build/win32/make_dist.py

(OptFile.run): Correctly handle the case where the path gets expanded

from the config but the file itself doesn't exist.

(InstallMoFiles): New class. Puts *.mo files in the correct place

in the package tree.

(_disttree): Add missing files to the distribution list.

(_make_dist): Add message translations to the base zip file.

* build/win32/make_dist.conf.template: Set default relative path

for Expat libraries.

* build/win32: Ignore all generated .dsp and .vcproj files.

  1. … 11 more files in changeset.