Branko Cibej wrote:
> This seems to work fine on Windows, but I'm worried about the change
> in gen_base.py -- I can't easily test it on Unix right now. Could
> somebody
> who regularly builds SWIG bindings on Unix test this patch, please?
The changes to gen_base worked on windows and not unix because the .dsp projects
called swig with the -noproxy option while the makefile invoked swig
without -noproxy. A new patch which leaves out -noproxy on windows and doesn't
require changes to gen_base.py is attached.
This new patch conflicts with DJ's refactoring patch. If you commit his patch
first, I can update and resubmit this one.
Log Message:
* build/generator/gen_win.py (WinGeneratorBase.get_win_defines): Removed
STATIC_LINKED preprocessor definition for swig bindings.
* build/generator/msvc_dsp.ezt: Got rid of -noproxy argument for swig.
Added new property sources.swig_target which holds the same path
sources.swig_output except that swig_output uses forward slashes
and swig_target uses backslashes
* build/generator/gen_msvc_dsp.py (Generator.write_project): Removed
extraneous arguments to two _item constructor calls.
Added new source property "swig_target".
* subversion/bindings/swig/INSTALL: Updated instructions.
begin 666 swig5.diff
M26YD97@Z(&)U:6QD+V=E;F5R871O<B]M<W9C7V1S<"YE>G0*/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/0HM+2T@8G5I;&0O9V5N97)A=&]R+VUS=F-?9'-P+F5Z
M= DH<F5V:7-I;VX@-C,R,RD**RLK(&)U:6QD+V=E;F5R871O<B]M<W9C7V1S
M<"YE>G0)*'=O<FMI;F<@8V]P>2D*0$ @+38X+#@@*S8X+#@@0$ *( H@26YP
M=710871H/5MS;W5R8V5S+G!A=&A="B *+5MS;W5R8V5S+G-W:6=?;W5T<'5T
M72 Z("0H4T]54D-%*2 B)"A)3E1$25(I(B B)"A/551$25(I(@HM"7-W:6<@
M+5MS;W5R8V5S+G-W:6=?;&%N9W5A9V5=("UN;W!R;WAY6V9O<B!I;F-L=61E
M<UT@+4DB6VEN8VQU9&5S72);96YD72 M;R!;<V]U<F-E<RYS=VEG7V]U='!U
M=%T@)"A);G!U=%!A=&@I"BM;<V]U<F-E<RYS=VEG7W1A<F=E=%T@.B D*%-/
M55)#12D@(B0H24Y41$E2*2(@(B0H3U541$E2*2(**PES=VEG("U;<V]U<F-E
M<RYS=VEG7VQA;F=U86=E75MF;W(@:6YC;'5D97-=("U)(EMI;F-L=61E<UTB
M6V5N9%T@+6\@6W-O=7)C97,N<W=I9U]O=71P=71=("0H26YP=710871H*0H@
M"0H@(R!%;F0@0W5S=&]M($)U:6QD"B *26YD97@Z(&)U:6QD+V=E;F5R871O
M<B]G96Y?=VEN+G!Y"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T*+2TM(&)U:6QD
M+V=E;F5R871O<B]G96Y?=VEN+G!Y"2AR979I<VEO;B V,S(S*0HK*RL@8G5I
M;&0O9V5N97)A=&]R+V=E;E]W:6XN<'D)*'=O<FMI;F<@8V]P>2D*0$ @+3,U
M,"PW("LS-3 L-B! 0 H@"B @(" @:68@:7-I;G-T86YC92AT87)G970L(&=E
M;E]B87-E+E-724=,:6)R87)Y*3H*(" @(" @(&9A:V5D969I;F5S+F%P<&5N
M9"@B4U=)1U]'3$]"04PB*0HM(" @(" @9F%K961E9FEN97,N87!P96YD*")3
M5$%424-?3$E.2T5$(BD*( H@(" @(&EF(&-F9R ]/2 G1&5B=6<G.@H@(" @
M(" @9F%K961E9FEN97,N97AT96YD*%LB7T1%0E5'(BPB4U9.7T1%0E5'(ETI
M"DEN9&5X.B!B=6EL9"]G96YE<F%T;W(O9V5N7VUS=F-?9'-P+G!Y"CT]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T*+2TM(&)U:6QD+V=E;F5R871O<B]G96Y?;7-V
M8U]D<W N<'D)*')E=FES:6]N(#8S,C,I"BLK*R!B=6EL9"]G96YE<F%T;W(O
M9V5N7VUS=F-?9'-P+G!Y"2AW;W)K:6YG(&-O<'DI"D! ("TV-BPX("LV-BPW
M($! "B @(" @(" @(')S<F,@/2!S=')I;F<N<F5P;&%C92AO<RYP871H+FIO
M:6XH<F]O='!A=&@L('-R8RDL(&]S+G-E<"P@)UQ<)RD*(" @(" @(" @:68@
M)RTG(&EN(')S<F,Z"B @(" @(" @(" @<G-R8R ]("<B)7,B)R E(')S<F,*
M+2 @(" @(" @<V]U<F-E<RYA<'!E;F0H7VET96TH<&%T:#UR<W)C+"!R96QD
M:7(]<F5L9&ER+"!S=VEG7VQA;F=U86=E/4YO;F4L"BT@(" @(" @(" @(" @
M(" @(" @(" @(" @(" @('-W:6=?;W5T<'5T/4YO;F4I*0HK(" @(" @("!S
M;W5R8V5S+F%P<&5N9"A?:71E;2AP871H/7)S<F,L(')E;&1I<CUR96QD:7(L
M('-W:6=?;&%N9W5A9V4]3F]N92DI"B *(" @("!I9B!I<VEN<W1A;F-E*'1A
M<F=E="P@9V5N7V)A<V4N4U=)1TQI8G)A<GDI.@H@(" @(" @9F]R(&]B:B!I
M;B!S96QF+F=R87!H+F=E=%]S;W5R8V5S*&=E;E]B87-E+D147TQ)3DLL('1A
M<F=E="DZ"D! ("TW-2PQ-" K-S0L,3@@0$ *(" @(" @(" @("!F;W(@8V]B
M:B!I;B!S96QF+F=R87!H+F=E=%]S;W5R8V5S*&=E;E]B87-E+D147T]"2D5#
M5"P@;V)J*3H*(" @(" @(" @(" @(&EF(&ES:6YS=&%N8V4H8V]B:BP@9V5N
M7V)A<V4N4U=)1T]B:F5C="DZ"B @(" @(" @(" @(" @(&-S<F,@/2!R;V]T
M<&%T:" K("=<7"<@*R!S=')I;F<N<F5P;&%C92AC;V)J+F9N86UE+" G+R<L
M("=<7"<I"BT@(" @(" @(" @(" @('-O=7)C97,N87!P96YD*%]I=&5M*'!A
M=&@]8W-R8RP@<F5L9&ER/4YO;F4L('-W:6=?;&%N9W5A9V4]3F]N92P*+2 @
M(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @<W=I9U]O=71P=70]
M3F]N92DI"BL@(" @(" @(" @(" @('-O=7)C97,N87!P96YD*%]I=&5M*'!A
M=&@]8W-R8RP@<F5L9&ER/4YO;F4L('-W:6=?;&%N9W5A9V4]3F]N92DI"B *
M*R @(" @(" @(" @(" @(R!O=71P=70@<&%T:"!P87-S960@=&\@<W=I9R!H
M87,@=&\@=7-E(&9O<G=A<F0@<VQA<VAE<RP@;W1H97)W:7-E"BL@(" @(" @
M(" @(" @(",@=&AE(&=E;F5R871A=&5D('!Y=&AO;B!F:6QE<R H9F]R('-H
M861O=R!C;&%S<V5S*2!W:6QL(&)E('-A=F5D"BL@(" @(" @(" @(" @(",@
M=&\@=&AE('=R;VYG(&1I<F5C=&]R>0HK(" @(" @(" @(" @("!C;W5T(#T@
M<W1R:6YG+G)E<&QA8V4H;W,N<&%T:"YJ;VEN*')O;W1P871H+"!C;V)J+F9N
M86UE*2P@;W,N<V5P+" G+R<I"BL*(" @(" @(" @(" @(" @9F]R(&EF:6QE
M(&EN('-E;&8N9W)A<&@N9V5T7W-O=7)C97,H9V5N7V)A<V4N1%1?4U=)1U]#
M+"!C;V)J*3H*(" @(" @(" @(" @(" @("!I<W)C(#T@<F]O='!A=&@@*R G
M7%PG("L@<W1R:6YG+G)E<&QA8V4H:69I;&4L("<O)RP@)UQ<)RD*(" @(" @
M(" @(" @(" @("!S;W5R8V5S+F%P<&5N9"A?:71E;2AP871H/6ES<F,L(')E
M;&1I<CU.;VYE+" *(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @
M(" @("!S=VEG7VQA;F=U86=E/71A<F=E="YL86YG+ HM(" @(" @(" @(" @
M(" @(" @(" @(" @(" @(" @(" @(" @('-W:6=?;W5T<'5T/6-S<F,I*0HK
M(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @('-W:6=?=&%R
M9V5T/6-S<F,L('-W:6=?;W5T<'5T/6-O=70I*0H@(" @(" @(" *(" @("!S
M;W5R8V5S+G-O<G0H;&%M8F1A('@L('DZ(&-M<"AX+G!A=&@L('DN<&%T:"DI
M"B *26YD97@Z('-U8G9E<G-I;VXO8FEN9&EN9W,O<W=I9R])3E-404Q,"CT]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T*+2TM('-U8G9E<G-I;VXO8FEN9&EN9W,O
M<W=I9R])3E-404Q,"2AR979I<VEO;B V,S(S*0HK*RL@<W5B=F5R<VEO;B]B
M:6YD:6YG<R]S=VEG+TE.4U1!3$P)*'=O<FMI;F<@8V]P>2D*0$ @+34U+#<@
M*S4U+#<@0$ *(" @(" @("!F:6QE<RP@<F5S=6QT:6YG(&EN(&$@8V]L;&5C
M=&EO;B!O9B N8R!S;W5R8V4@9FEL97,N("!)="!W:6QL"B @(" @(" @=&AE
M;B!C;VUP:6QE(&%N9"!L:6YK('1H;W-E("YC(&9I;&5S(&EN=&\@4'ET:&]N
M(&QI8G)A<FEE<RX*( HM(" @(" @($]N(%=I;F1O=W,L(&)U:6QD('1H92!P
M>71H;VY?*B!P<F]J96-T<R!I;B!6:7-U86P@4W1U9&EO+@HK(" @(" @($]N
M(%=I;F1O=W,L(&)U:6QD('1H92!?7U-724=?4%E42$].7U\@<')O:F5C="!I
M;B!6:7-U86P@4W1U9&EO+@H@"B @(" R+B @3VX@56YI>"!S>7-T96US+"!R
M=6X@)VUA:V4@:6YS=&%L;"US=VEG+7!Y)R H87,@<F]O="P@='EP:6-A;&QY
M*0H@(" @(" @(&9R;VT@=&AE('1O<"!O9B!T:&4@4W5B=F5R<VEO;B!S;W5R
M8V4@=')E92X@(%1H:7,@=VEL;"!C;W!Y"D! ("TW,2PQ." K-S$L,C,@0$ *
M(" @(" @("!E>&%M<&QE(&]F(&1O:6YG('1H:7,@9F]R(&)U:6QD:6YG(')P
M;7,@;&]O:W,@;&EK90H@(" @(" @("=M86ME(&EN<W1A;&PM<W=I9RUP>2!$
M15-41$E2/2124$U?0E5)3$1?4D]/5"]U<W(G+@H@"BT@(" @(" @3VX@5VEN
M9&]W<RP@8V]P>2!T:&4@<W5B=F5R<VEO;EQB:6YD:6YG<UQS=VEG7'!Y=&AO
M;EQS=FX@9F]L9&5R('1O"BT@(" @(" @/%!95$A/3CY<3&EB7'-I=&4M<&%C
M:V%G97,L(&%N9"!T:&5N(&-O<'D@=&AE"BT@(" @(" @4F5L96%S95QS=6)V
M97)S:6]N7&)I;F1I;F=S7'-W:6=<<'ET:&]N7"HN9&QL(&9I;&5S('1O"BT@
M(" @(" @/%!95$A/3CY<3&EB7'-I=&4M<&%C:V%G97-<<W9N+@HK(" @(" @
M($]N(%=I;F1O=W,L(&-R96%T92!T=V\@9F]L9&5R<SH*( HM(" @(" @($]P
M=&EO;F%L;'DL('EO=2!C86X@<G5N('1H92!F;VQL;W=I;F<@8V]M;6%N9"!T
M;R!C;VUP:6QE('1H92!P>71H;VX**R @(" @(" @(#Q0651(3TX^7$QI8EQS
M:71E+7!A8VMA9V5S7'-V;@HK(" @(" @(" @/%!95$A/3CY<3&EB7'-I=&4M
M<&%C:V%G97-<;&EB<W9N"BL**R @(" @("!#;W!Y('-U8G9E<G-I;VY<8FEN
M9&EN9W-<<W=I9UQP>71H;VY<<W9N7"HN<'D@:6YT;R!T:&4@<W9N(&9O;&1E
M<BX**R @(" @("!#;W!Y('-U8G9E<G-I;VY<8FEN9&EN9W-<<W=I9UQP>71H
M;VY<*BYP>2!A;F0**R @(" @("!296QE87-E7'-U8G9E<G-I;VY<8FEN9&EN
M9W-<<W=I9UQP>71H;VY<*BYD;&P@:6YT;R!T:&4@;&EB<W9N(&9O;&1E<BX*
M*PHK(" @(" @($]P=&EO;F%L;'DL('EO=2!C86X@<G5N('1H92!F;VQL;W=I
M;F<@8V]M;6%N9',@=&\@8V]M<&EL92!T:&4@<'ET:&]N"B @(" @(" @<V]U
M<F-E<R!I;G1O(&)Y=&5C;V1E.@HM(" @(" @( HK"B @(" @(" @("!P>71H
M;VX@/%!95$A/3CY<;&EB7&-O;7!I;&5A;&PN<'D@/%!95$A/3CY<3&EB7'-I
M=&4M<&%C:V%G97-<<W9N"BT@(" @(" @(" **R @(" @(" @('!Y=&AO;B \
M4%E42$]./EQL:6)<8V]M<&EL96%L;"YP>2 \4%E42$]./EQ,:6)<<VET92UP
M86-K86=E<UQL:6)S=FX**PH@(" @(" @(%1H:7,@8V%N(&UA:V4@=&AE(&UO
M9'5L97,@;&]A9"!F87-T97(@9F]R('5S97)S('=I=&AO=70@=W)I=&4@86-C
M97-S"BT@(" @(" @=&\@/%!95$A/3CY<3&EB7'-I=&4M<&%C:V%G97-<<W9N
M+B @(" @(" **R @(" @("!T;R!T:&4@<VET92UP86-K86=E<R!D:7)E8W1O
M<GDN"B *(" @(#,N("!697)I9GD@=&AA="!A;B G<W9N)R!P86-K86=E(&AA
M<R!B965N(&EN<W1A;&QE9"!C;W)R96-T;'DN("!9;W4@8V%N"B @(" @(" @
M9&\@=&AI<R!B>2!R=6YN:6YG('!Y=&AO;B!V:6$@)W!Y=&AO;B M8R B9G)O
7;2!S=FX@:6UP;W)T(&-L:65N="(G+@H`
`
end
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 24 05:36:48 2003