[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] to fix Subversion 1.2.x perl binding build on Win32

From: Kevin Light <klight_at_walkertechnical.com>
Date: 2005-08-16 23:07:53 CEST

In case anyone is interested, attached is a patch to the source
subversion-1.2.1.zip release which will fix the VC++ 6.0 build system
files so that the Perl bindings are correctly built. There is also a
correction to native/Core.pm SVN::Core::VERSION to resolve an error
thrown when perl modules are built.

This patch is against the root of the Subversion-1.2.1.zip release.

* build/generator/gen_win.py
* build/win32/msvc-dsp/swig_perl_client_msvc.dsp
* build/win32/msvc-dsp/swig_perl_core_msvc.dsp
* build/win32/msvc-dsp/swig_perl_delta_msvc.dsp
* build/win32/msvc-dsp/swig_perl_fs_msvc.dsp
* build/win32/msvc-dsp/swig_perl_ra_msvc.dsp
* build/win32/msvc-dsp/swig_perl_repos_msvc.dsp
* build/win32/msvc-dsp/swig_perl_wc_msvc.dsp
  Change all of the reporter_t to reporter2_t h2i statements in the
  Win32 build system to correctly build the Subversion 1.2.x Perl
  bindings (Fixes set_path method missing from Ra.pm error during
  SVN::Mirror build).

* subversion/bindings/swig/perl/native/Core.pm
  Change native/Core.pm SVN::Core::VERSION assignment to fix a
  concatenation error (on Win32). This throws a warning during the Perl
  build of SVN::Mirror.

==== Patch <Win32SubversionPerlSWIGFix> level 1
Source: [No source]
Target: e8d2fdfb-39b0-2d41-bf16-9407c9ce92c1:/:1
Log:
This patch is against the root of the Subversion-1.2.1.zip release.

* build/generator/gen_win.py
* build/win32/msvc-dsp/swig_perl_client_msvc.dsp
* build/win32/msvc-dsp/swig_perl_core_msvc.dsp
* build/win32/msvc-dsp/swig_perl_delta_msvc.dsp
* build/win32/msvc-dsp/swig_perl_fs_msvc.dsp
* build/win32/msvc-dsp/swig_perl_ra_msvc.dsp
* build/win32/msvc-dsp/swig_perl_repos_msvc.dsp
* build/win32/msvc-dsp/swig_perl_wc_msvc.dsp
  Change all of the reporter_t to reporter2_t h2i statements in the
  Win32 build system to correctly build the Subversion 1.2.x Perl
  bindings (Fixes set_path method missing from Ra.pm error during
  SVN::Mirror build).

* subversion/bindings/swig/perl/native/Core.pm
  Change native/Core.pm SVN::Core::VERSION assignment to fix
  concatenation error (on Win32). This throws a warning during the Perl
  build of SVN::Mirror.

=== build/generator/gen_win.py
==================================================================
--- build/generator/gen_win.py (revision 1)

+++ build/generator/gen_win.py (patch Win32SubversionPerlSWIGFix level 1)

@@ -322,7 +322,7 @@

 

         objects = (("svn_delta_editor_t", "svn_delta.h", "delta_editor.hi"),

                    ("svn_ra_plugin_t", "svn_ra.h", "ra_plugin.hi"),

- ("svn_ra_reporter_t", "svn_ra.h", "ra_reporter.hi"))

+ ("svn_ra_reporter2_t", "svn_ra.h", "ra_reporter.hi"))

 

         pfile = self.path("subversion/bindings/swig/perl/native/h2i.pl")

 

=== build/win32/msvc-dsp/swig_perl_client_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_client_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_client_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_core_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_core_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_core_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_delta_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_delta_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_delta_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_fs_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_fs_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_fs_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_ra_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_ra_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_ra_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_repos_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_repos_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_repos_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== build/win32/msvc-dsp/swig_perl_wc_msvc.dsp
==================================================================
--- build/win32/msvc-dsp/swig_perl_wc_msvc.dsp (revision 1)

+++ build/win32/msvc-dsp/swig_perl_wc_msvc.dsp (patch Win32SubversionPerlSWIGFix level 1)

@@ -123,7 +123,7 @@

 InputPath=..\..\..\subversion\include\svn_ra.h

 

 ..\..\..\subversion\bindings\swig\ra_reporter.hi : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

- perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

+ perl ..\..\..\subversion\bindings\swig\perl\native\h2i.pl ..\..\..\subversion\include\svn_ra.h svn_ra_reporter2_t > ..\..\..\subversion\bindings\swig\ra_reporter.hi

 

 # End Custom Build

 

=== subversion/bindings/swig/perl/native/Core.pm
==================================================================
--- subversion/bindings/swig/perl/native/Core.pm (revision 1)

+++ subversion/bindings/swig/perl/native/Core.pm (patch Win32SubversionPerlSWIGFix level 1)

@@ -3,8 +3,7 @@

 
 package SVN::Core;
 use SVN::Base qw(Core svn_ VERSION);
-$SVN::Core::VERSION = "$SVN::Core::VER_MAJOR.$SVN::Core::VER_MINOR." .
- "$SVN::Core::VER_MICRO";
+$SVN::Core::VERSION = "$SVN::Core::VER_MAJOR.$SVN::Core::VER_MINOR." . "$SVN::Core::VER_MICRO";
 
 =head1 NAME
 

==== BEGIN SVK PATCH BLOCK ====
Version: svk 1.02 (MSWin32)

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
UASqDowg2MFhA8cc/Rsrxi4z
==== END SVK PATCH BLOCK ====

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 16 23:07:41 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.