gen_msvc_dsp.py

2003. This support is unmaintained for quite some time and these compilers

and their C libraries are not even supported by Microsoft anymore.

* build/generator/gen_msvc_dsp.py

Remove file.

* build/generator/gen_vcnet_vcproj.py

(get_external_project): Remove function; falling back to ancestor.

* build/generator/gen_win.py

(get_external_project): Remove serf project hack that wasn't used since 1.7.

* build/generator/templates/msvc_dsp.ezt

* build/generator/templates/msvc_dsw.ezt

* build/generator/templates/svn_config.dsp.ezt

* build/generator/templates/svn_locale.dsp.ezt

Remove files.

* gen-make.py

Update documentation. Make --vsnet-version imply -t vcproj.

Fix python syntax warning caused by tab characters.

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

Minor error output improvement on 'svn info' comparison failures.

* subversion/tests/libsvn_subr/x509-test.c

* tools/dist/backport_tests.py

* tools/hook-scripts/control-chars.py

* tools/hook-scripts/validate-files.py

* tools/server-side/svnpubsub/svnpubsub/util.py

(svn:eol-style): Set to native.

* build/generator/gen_msvc_dsp.py

* build/generator/gen_vcnet_vcproj.py

Don't generate serf and zlib projects.

* build/generator/gen_win.py

Don't create build_zlib.bat

Stop filtering serf and zlib projects in specific cases.

* build/generator/gen_win_dependencies.py

Remove special is_src support that was only needed for

this ugly zlib/serf dependency case.

Bump minimal required serf version.

* build/generator/templates/build_zlib.ezt

* build/generator/templates/serf.dsp.ezt

* build/generator/templates/serf.vcproj.ezt

* build/generator/templates/serf.vcxproj.ezt

* build/generator/templates/zlib.dsp.ezt

* build/generator/templates/zlib.vcproj.ezt

* build/generator/templates/zlib.vcxproj.ezt

Remove unused templates.

* build.conf

Make serf and zlib normal external projects.

framework to allow forcefully including an include file before the actual c

file.

This ugly hack is necessary to allow compiling the 1.9+ Swig Ruby bindings on

Windows without changing the standard swig or ruby headers, as Swig starts

its generated files with a #include <ruby.h> before any other headers :(

This change makes the project generator handle include dirs, lib dirs,

forced headers and libraries in the same way: per configuration.

* build/generator/gen_msvc_dsp.py

(write_project): Remove includes from ezt data.

* build/generator/gen_vcnet_vcproj.py

(write_project): Remove includes from ezt data.

* build/generator/gen_win.py

(get_configs): Add includes and forced headers to the per configuration data.

* build/generator/templates/msvc_dsp.ezt

Update includes reference.

* build/generator/templates/vcnet_vcproj.ezt

Update includes reference. Support forcing an include.

* build/generator/templates/vcnet_vcxproj.ezt

Update includes reference. Support forcing an include.

Remove doubled semicolon.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

(swigutil_rb__pre_ruby.h): Add include for dependency tracking.

Fix reference to st.h for Ruby >= 1.9.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h

(swigutil_rb__pre_ruby.h): Add include for dependency tracking.

Fix reference to regex.h for Ruby >= 1.9.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h

New file

See this thread for more info:

http://svn.haxx.se/dev/archive-2012-06/0195.shtml

* build/ac-macros/neon.m4,

build/generator/templates/neon.vcproj.ezt,

build/generator/templates/neon.vcxproj.ezt,

build/generator/templates/neon.dsp.ezt:

Remove.

* build/generator/gen_vcnet_vcproj.py,

build/generator/gen_msvc_dsp.py,

build/generator/gen_win.py,

build/win32/vc6-build.bat.in,

build/win32/make_dist.py,

configure.ac,

Makefile.in:

Remove neon bits.

* get-deps.sh:

Don't bother fetching the neon deps.

* build.conf:

Remove libsvn_ra_neon, and neon as depenencies.

* everywhere:

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

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

done

and workspace files. Visual C++ 6.0 is no longer supported by Microsoft,

but is still the default compiler used for Windows support by the Apr and

Httpd projects.

* build/generator/gen_msvc_dsp.py

(write_project): Take template from the right folder.

(write): Fetch sql header dependencies.

Found by: joeswatosh

necessary changes in the python scripting to handle this also allowed moving

the remaining project templates .ezt files to the templates directory.

Please let me know if this patch breaks something for you.

* build/generator/build_locale.ezt

* build/generator/msvc_dsp.ezt

* build/generator/svn_locale.vcxproj.ezt

* build/generator/build_zlib.ezt

* build/generator/neon.dsp.ezt

* build/generator/serf.dsp.ezt

* build/generator/zlib.dsp.ezt

* build/generator/svn_config.vcproj.ezt

* build/generator/svn_config.vcxproj.ezt

* build/generator/msvc_dsw.ezt

* build/generator/svn_locale.vcproj.ezt

* build/generator/serf.vcxproj.ezt

* build/generator/neon.vcxproj.ezt

* build/generator/zlib.vcxproj.ezt

* build/generator/neon.vcproj.ezt

* build/generator/serf.vcproj.ezt

* build/generator/zlib.vcproj.ezt Moved to build/generator/templates/.

* build/win32/svn_config.dsp

* build/win32/svn_locale.dsp

Moved to build/generator/templates/ with extension .dsp.ezt.

* build/generator/gen_vcnet_vcproj.py

(write): Move svn_config and svn_locale output to the projects directory.

* build/generator/gen_msvc_dsp.py

(write): Generate svn_config and svn_locale projects from a .ezt file, just

like the Visual Studio 2002-2010 versions.

* build/generator/gen_win.py

(WinGeneratorBase::__init__): Generate all files in the projectfiles directory

instead of a few in build/win32.

* build/generator/templates/msvc_dsp.ezt

* build/generator/templates/build_locale.ezt

* build/generator/templates/build_zlib.ezt

* build/generator/templates/svn_locale.vcxproj.ezt

* build/generator/templates/svn_config.dsp.ezt

* build/generator/templates/neon.dsp.ezt

* build/generator/templates/serf.dsp.ezt

* build/generator/templates/msvc_dsw.ezt

* build/generator/templates/zlib.dsp.ezt

* build/generator/templates/svn_locale.vcproj.ezt

* build/generator/templates/neon.vcxproj.ezt

* build/generator/templates/serf.vcxproj.ezt

* build/generator/templates/zlib.vcxproj.ezt

* build/generator/templates/neon.vcproj.ezt

* build/generator/templates/serf.vcproj.ezt

* build/generator/templates/zlib.vcproj.ezt

* build/generator/templates/svn_locale.dsp.ezt

Moved here from their old locations

* build/generator/templates/svn_config.vcxproj.ezt

* build/generator/templates/svn_config.vcproj.ezt

Moved here. Fix relative path to .sql files

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}apache.org>

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().

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.

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().

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

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.

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.

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

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.

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

lines on windows.

* build/generator/gen_win.py

(WinGeneratorBase.get_proj_sources):

clean up, get rid of some duplicate logic

(_find_swig):

don't set swig options here

* build/generator/gen_msvc_dsp.py.py

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project):

remove "swig_options" template variable

generator more consistently. The main effect of this is that paths in

outputted msvc files and makefiles use one kind of slash instead of

combinations of forward slashes and backslashes.

* build/generator/gen_base.py

(native_path, build_path, build_path_join, build_path_split,

build_path_splitfile, build_path_dirname, build_path_basename,

build_path_retreat, build_path_strip):

new path handling functions

(_strip_path, _retreat_dots):

removed, replaced by build_path_strip and build_path_retreat

(lots of places):

make use of new path functions

* build/generator/gen_make.py

(Generator.write, Generator.write_symbols):

make use of new path functions

* build/generator/gen_win.py

(WinGeneratorBase.parse_options, WinGeneratorBase.__init__):

stop converting all user entered paths into absolute paths,

instead try to use them as they are

(WinGeneratorBase.__init__)

set new "rootpath" member

(msvc_path, msvc_path_join, WinGeneratorBase.path, WinGeneratorBase.apath):

new path handling functions

(WinGeneratorBase.search_for, WinGeneratorBase.map_rootpath,

WinGeneratorBase.make_windirs):

removed

(WinGeneratorBase.get_configs, WinGeneratorBase.get_proj_sources,

WinGeneratorBase.get_output_dir, WinGeneratorBase.get_intermediate_dir,

WinGeneratorBase.get_def_file, WinGeneratorBase.get_external_project,

WinGeneratorBase.get_win_includes, WinGeneratorBase.get_win_lib_dirs):

make use of new path functions

(WinGeneratorBase._find_bdb, WinGeneratorBase.parse_options,

WinGeneratorBase.__init__, get_win_defines, , get_win_libs):

simplify bdb detection

* build/generator/gen_msvc_dsp.py

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project, Generator.write):

stop passing around rootpath parameters

and directories into windows generator base. This change has no effect

on generated makefiles or project files.

* build/generator/gen_base.py

(Target.__init__):

stop setting swig-windows-specific shared_dir variable here

(TargetSWIG.__init__):

here too

* build/generator/gen_win.py

(WinGeneratorBase.get_proj_sources):

stop resetting JavaTarget path values

(WinGeneratorBase.get_output_name, WinGeneratorBase.get_output_dir,

WinGeneratorBase.get_intermediate_dir):

new

* build/generator/gen_msvc_dsp.py

* build/generator/gen_vcnet_vcproj.py

(Generator.write_project):

set new template variables for output paths

* build/generator/msvc_dsp.ezt

* build/generator/vcnet_vcproj.ezt

use new template variables

(http://www.contactor.se/~dast/svn/archive-2004-06/0683.shtml)

* subversion\bindings\swig\INSTALL

* build\win32\gen_swig_runtime.py

* build\generator\msvc_dsp.ezt

* build\generator\gen_vcnet_vcproj.py

* build\generator\gen_win.py

* build\generator\gen_msvc_dsp.py

put these back

have no effect on the generated makefiles or project files.

* build/generator/gen_base.py

(Target.__init__, TargetJavaHeaders.__init__,

TargetJavaClasses.__init__): Get rid of "needs_windows_custom_build" member.

(TargetJavaHeaders.get_windows_custom_build,

TargetJavaHeaders.get_windows_custom_target,

TargetJavaClasses.get_windows_custom_build,

TargetJavaClasses.get_windows_custom_target): Removed.

* build/generator/gen_win.py

(WinGeneratorBase.get_proj_sources): Move in code from

get_windows_custom* methods in gen_base.py that makes the custom

build command lines. Shortened the code a little but preserved

original logic.

* build/generator/gen_msvc_dsp.py

* build/generator/gen_vcnet_vcproj.py

(Generator.get_project_quote, Generator.quote): Change quote functions

javahl-javah

removing the extra-classes option

libsvnjavahl

add a description to add the resource file to the projects

__JAVAHL__

add top level project like __SWIG_JAVA__

* gen-make.py

add --with-junit option like the configure --with-junit option

* build/generator/msvc_dsp.ezt

replace the hardcode build rules for swig with general build rule

* build/generator/gen_vcnet_vcproj.py

add method get_project_quote for writing quotes into the project file.

* build/generator/vcnet_vcproj.ezt

replace the hardcode build rules for swig with general build rule

* build/generator/gen_base.py

DependencyNode.__hash__

use member name of member filename contains an empty string

DependencyNode.__cmp__

use member name of member filename contains an empty string

Target.__init__

init marker needs_windows_custom_build to None

TargetJavaHeaders.__init__

set marker need_windows_custom_build to "Yes" and remove the

extra-classes option

TargetJavaHeaders.add_dependencies

removing the extra-classes option

TargetJavaHeaders.get_windows_custom_build

implement new method

TargetJavaHeaders.get_windows_custom_target

implement new method

TargetJavaClasses.__init__

set marker need_windows_custom_build to "Yes"

TargetJavaClasses.get_windows_custom_build

implement new method

TargetJavaClasses.get_windows_custom_target

implement new method

* build/generator/gen_win.py

WinGeneratorBase.__init__

Add new --with-junit option

WinGeneratorBase.parse_options

Add new --with-junit option

WinGeneratorBase.get_proj_sources

Add support for generating "custom build" steps

Changed the "custom build" steps for swig projects to new

general style

* build/generator/gen_msvc_dsp.py

add method get_project_quote for writing quotes into the project file.

* subversion/bindings/java/javahl/native/svnjavahl.dsp

remove now unused project file

* subversion/bindings/java/javahl/native/svnjavahl.dsw

remove now unused project file

* subversion/bindings/java/javahl/README

adjust build instructions for windows

* build/win32/gen_swig_runtime.py (Include, If, Endif): New generator

classes, based on Literal.

(languages[python], languages[perl]): Conditionally include the

language-specific precommon.swg.

(languages[chicken]): Use Include instead of Literal.

(__main__): Accept an optional path to the SWIG library dir.

* build/generator/gen_win.py: Import 're' for parsing the SWIG version.

(WinGeneratorBase.__init__): Move library discovery out of this method

to _find_bdb, _find_perl and _find_swig.

(WinGeneratorBase.get_proj_sources): Pass self.swig_libdir into

ProjectItems for SWIG targets.

(WinGeneratorBase.get_win_defines WinGeneratorBase.get_win_includes):

Add SWIG target-specific includes and defines.

(WinGeneratorBase._find_bdb): New. Extracted fron __init__.

(WinGeneratorBase._find_perl): New. Extracted fron __init__. Tweak the

generated messages a bit.

(WinGeneratorBase._find_swig, WinGeneratorBase._find_swig_libdir): New.

* build/generator/gen_msvc_dsp.py, build/generator/gen_vcnet_vcproj.py:

Pass self.swig_options to EZT as 'swig_options'.

* build/generator/msvc_dsp.ezt, build/generator/vcnet_vcproj.ezt:

Expand [swig_options] in the swig invocation spell, pass

[sources.swig_libdir] to the SWIG runtime generator.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h,

subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h:

Conditionally define runtime function names, as SWIG 1.3.21 seems

to create those defines.

localization requirements.

* build/win32/svn_locale.dsp

New project file for locale build target.

* build/generator/gen_msvc_dsp.py

Add support for the new TargetI18N target type.

support is working.

* build/generator/gen_vcnet_vcproj.py

(write): Skip I18N projects for now.

* build/generator/gen_msvc_dsp.py

(write): Ditto.

Affected files:

* build.conf

* build/generator/gen_vcnet_vcproj.py

* build/generator/gen_base.py

* build/generator/gen_win.py

* build/generator/gen_make.py

* build/generator/gen_msvc_dsp.py