> Now I'd like to see a few things changed, if you don't mind. :-)
Ok. I was able to handle these things:
> * Move the unique() function to gen_base.py. There are quite a few
> places where we can use it.
> * Prefix the project names with "swig_"; e.g., "swig_python_core"
> instead of just "python_core". This will make the project lists
> more readable.
> * Add new pseudo projects (in build.conf): __SWIG_PYTHON__ and
> __SWIG_JAVA__, to build all the relevant bindings in one fell
> swoop. * Put the target description back in, so that we get
> version info in the generated DLLs.
But not these:
> * Change the SWIG custom build commands to generate the C files in
> the build tree (Release or Debug), _not_ the source tree. This
> means tweaking the source file definitions for the C files, too.
> * Fix the link warnings about not finding aprutil_src.pdb or
> xml_src.pdb -- I guess that means adding library dependencies to
> the link lines for the DLLs.
I couldn't figure out a way to tell Visual C++ to compile different C source
files depending on the configuration (release or debug). I tried putting
conditionals ('!IF "$(CFG)" == "whatever" / !ENDIF) around the SOURCE=...
statements in the project files, but that made only them unloadable. So swig
still outputs the C files in the source tree since it's a neutral location.
I couldn't do anything about the link warnings since I don't get them and I
don't know what causes them.
Patch is attached.
- Russ
Log Message:
* build.conf: added description strings for swig libraries and two new
utility targets, __SWIG_PYTHON__ and __SWIG_JAVA__.
* build/generator/gen_base.py (GeneratorBase.__init__): added new parser
option "language" which is needed for the new __SWIG_*_ targets.
(TargetSWIG.add_dependencies): changed to set the description attribute
on each newly created SWIGLibrary.
Declared a new class called TargetSwigUtility which inherits from
TargetUtility for swig utility targets.
* build/generator/gen_win.py: (unique) transplanted this function from
gen_msvc_dsp.py
(WinGeneratorBase.get_unique_win_depends): now adds SWIGLibraries as
dependencies of TargetSwigUtility targets.
* build/generator/gen_msvc_dsp.py: (unique) moved this function to a
gen_win.py
(Generator.write_project): no longer assigns None to the SWIGLibraries'
"desc" attributes.
begin 666 swig3.diff
M26YD97@Z(&)U:6QD+F-O;F8-"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T-"BTM
M+2!B=6EL9"YC;VYF"2AR979I<VEO;B V,C<T*0HK*RL@8G5I;&0N8V]N9@DH
M=V]R:VEN9R!C;W!Y*0I 0" M,C(P+#0R("LR,C L-#D@0$ *('!A=&@@/2!S
M=6)V97)S:6]N+V)I;F1I;F=S+W-W:6<*('-O=7)C97,@/2!S=FY?8VQI96YT
M+FD*(&QI8G,@/2!L:6)S=FY?8VQI96YT"BMD97-C<FEP=&EO;B ](%-U8G9E
M<G-I;VX@0VQI96YT($QI8G)A<GD@0FEN9&EN9W,*( H@6W-W:6=?9&5L=&%=
M"B!T>7!E(#T@<W=I9PH@<&%T:" ]('-U8G9E<G-I;VXO8FEN9&EN9W,O<W=I
M9PH@<V]U<F-E<R ]('-V;E]D96QT82YI"B!L:6)S(#T@;&EB<W9N7V1E;'1A
M"BMD97-C<FEP=&EO;B ](%-U8G9E<G-I;VX@1&5L=&$@3&EB<F%R>2!":6YD
M:6YG<PH@"B!;<W=I9U]F<UT*('1Y<&4@/2!S=VEG"B!P871H(#T@<W5B=F5R
M<VEO;B]B:6YD:6YG<R]S=VEG"B!S;W5R8V5S(#T@<W9N7V9S+FD*(&QI8G,@
M/2!L:6)S=FY?9G,**V1E<V-R:7!T:6]N(#T@4W5B=F5R<VEO;B!&4R!,:6)R
M87)Y($)I;F1I;F=S"B *(%MS=VEG7W)A70H@='EP92 ]('-W:6<*('!A=&@@
M/2!S=6)V97)S:6]N+V)I;F1I;F=S+W-W:6<*('-O=7)C97,@/2!S=FY?<F$N
M:0H@;&EB<R ](&QI8G-V;E]R80HK9&5S8W)I<'1I;VX@/2!3=6)V97)S:6]N
M(%)!($QI8G)A<GD@0FEN9&EN9W,*( H@6W-W:6=?<F5P;W-="B!T>7!E(#T@
M<W=I9PH@<&%T:" ]('-U8G9E<G-I;VXO8FEN9&EN9W,O<W=I9PH@<V]U<F-E
M<R ]('-V;E]R97!O<RYI"B!L:6)S(#T@;&EB<W9N7W)E<&]S"BMD97-C<FEP
M=&EO;B ](%-U8G9E<G-I;VX@4F5P;W-I=&]R>2!,:6)R87)Y($)I;F1I;F=S
M"B *(%MS=VEG7W=C70H@='EP92 ]('-W:6<*('!A=&@@/2!S=6)V97)S:6]N
M+V)I;F1I;F=S+W-W:6<*('-O=7)C97,@/2!S=FY?=V,N:0H@;&EB<R ](&QI
M8G-V;E]W8PHK9&5S8W)I<'1I;VX@/2!3=6)V97)S:6]N(%=#($QI8G)A<GD@
M0FEN9&EN9W,*( H@6W-W:6=?8V]R95T*('1Y<&4@/2!S=VEG"B!P871H(#T@
M<W5B=F5R<VEO;B]B:6YD:6YG<R]S=VEG"B!S;W5R8V5S(#T@8V]R92YI"B!L
M:6)S(#T@;&EB<W9N7W-U8G(@)"A35DY?05!27TQ)0E,I"BMD97-C<FEP=&EO
M;B ](%-U8G9E<G-I;VX@0V]R92!,:6)R87)Y($)I;F1I;F=S"B *(",@4U=)
M1R!U=&EL:71Y(&QI8G)A<GD@9F]R(%!Y=&AO;B!M;V1U;&5S"B!;;&EB<W9N
M7W-W:6=?<'E="D! ("TV,C L-2 K-C(W+#$W($! "B!R96QE87-E(#T@+BY<
M+BY<4F5L96%S95QS=FXM<V5T=7 N97AE"B!D96)U9R ]("XN7"XN7$1E8G5G
M7'-V;BUS971U<"YE>&4*( HK6U]?4U=)1U]0651(3TY?7UT**W1Y<&4@/2!S
M=VEG7W5T:6QI='D**W!A=&@@/2!B=6EL9"]W:6XS,@HK;&EB<R ]('-W:6=?
M8VQI96YT('-W:6=?9&5L=&$@<W=I9U]F<R!S=VEG7W)A('-W:6=?<F5P;W,@
M<W=I9U]W8R!S=VEG7V-O<F4@;&EB<W9N7W-W:6=?<'D**VQA;F=U86=E(#T@
M<'ET:&]N"BL**UM?7U-724=?2D%605]?70HK='EP92 ]('-W:6=?=71I;&ET
M>0HK<&%T:" ](&)U:6QD+W=I;C,R"BML:6)S(#T@<W=I9U]C;&EE;G0@<W=I
M9U]D96QT82!S=VEG7V9S('-W:6=?<F$@<W=I9U]R97!O<R!S=VEG7W=C('-W
M:6=?8V]R92!L:6)S=FY?<W=I9U]J879A"BML86YG=6%G92 ](&IA=F$**PH@
M(R M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"B *26YD97@Z(&)U
M:6QD+V=E;F5R871O<B]G96Y?8F%S92YP>0T*/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/0T*+2TM(&)U:6QD+V=E;F5R871O<B]G96Y?8F%S92YP>0DH<F5V:7-I
M;VX@-C(W-"D**RLK(&)U:6QD+V=E;F5R871O<B]G96Y?8F%S92YP>0DH=V]R
M:VEN9R!C;W!Y*0I 0" M.#,L-B K.#,L.2! 0 H@"B @(" @("!I9B!P87)S
M97(N9V5T*'1A<F=E="P@)W!R;VIE8W1?;F%M92<I.@H@(" @(" @("!T87)G
M971?;V(N<')O:F5C=%]N86UE(#T@<&%R<V5R+F=E="AT87)G970L("=P<F]J
M96-T7VYA;64G*0HK(" @(" @(" **R @(" @(&EF('!A<G-E<BYH87-?;W!T
M:6]N*'1A<F=E="P@)VQA;F=U86=E)RDZ"BL@(" @(" @('1A<F=E=%]O8BYL
M86YG=6%G92 ]('!A<G-E<BYG970H=&%R9V5T+" G;&%N9W5A9V4G*0H@"B @
M(" @("!S96QF+G1A<F=E='-;=&%R9V5T72 ]('1A<F=E=%]O8@H@"D! ("TU
M,C$L-B K-3(T+#D@0$ *( H@(" @(" @(R!T:&4@<W!E8VEF:65D(&EN<W1A
M;&P@87)E82!D97!E;F1S('5P;VX@=&AE(&QI8G)A<GD*(" @(" @(&=R87!H
M+F%D9"A$5%])3E-404Q,+"!S96QF+FEN<W1A;&P@*R G+2<@*R!A8F)R978L
M(&QI8G)A<GDI"BL@(" @(" **R @(" @(",@<&%S<R!487)G97135TE')W,@
M9&5S8W)I<'1I;VX@;VYT;R!I=',@4U=)1TQI8G)A<FEE<PHK(" @(" @;&EB
M<F%R>2YD97-C(#T@<V5L9BYD97-C"B *(",C(R!)(&1O;B=T('1H:6YK('1H
M:7,@<VAO=6QD(&)E(%1A<F=E=$QI;FME9"P@8G5T("=A<'(G('5S97,@=&AE
M("=L:6)S)PH@(R,C(&]P=&EO;BP@=VAI8V@@;65A;G,@=V4@;F5E9"!T;R!M
M86ME('1H:7,@5&%R9V5T3&EN:V5D('-O('1H870@=&AE"D! ("TU-# L-B K
M-30V+#@@0$ *(&-L87-S(%1A<F=E=%5T:6QI='DH5&%R9V5T4W!E8VEA;"DZ
M"B @(&1E9F%U;'1?:6YS=&%L;" ]("=U=&EL:71Y)PH@"BMC;&%S<R!487)G
M9713=VEG571I;&ET>2A487)G9715=&EL:71Y*3H**R @9&5F875L=%]I;G-T
M86QL(#T@)W-W:6=?=71I;&ET>2<*( H@7V)U:6QD7W1Y<&5S(#T@>PH@(" G
M97AE)R Z(%1A<F=E=$5X92P*0$ @+34U,"PV("LU-3@L-R! 0 H@(" G<')O
M:F5C="<@.B!487)G9710<F]J96-T+ H@(" G97AT97)N86PG(#H@5&%R9V5T
M17AT97)N86PL"B @("=U=&EL:71Y)R Z(%1A<F=E=%5T:6QI='DL"BL@("=S
M=VEG7W5T:6QI='DG(#H@5&%R9V5T4W=I9U5T:6QI='DL"B @('T*( H@"DEN
M9&5X.B!B=6EL9"]G96YE<F%T;W(O9V5N7W=I;BYP>0T*/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/0T*+2TM(&)U:6QD+V=E;F5R871O<B]G96Y?=VEN+G!Y"2AR
M979I<VEO;B V,C<T*0HK*RL@8G5I;&0O9V5N97)A=&]R+V=E;E]W:6XN<'D)
M*'=O<FMI;F<@8V]P>2D*0$ @+3(U-RPV("LR-3<L,3(@0$ *(" @(" @(&EF
M(&YO="!I<VEN<W1A;F-E*&]B:BP@9V5N7V)A<V4N5&%R9V5T*3H*(" @(" @
M(" @8V]N=&EN=64*( HK(" @(" @:68@:7-I;G-T86YC92AO8FHL(&=E;E]B
M87-E+E1A<F=E=%-724<I.@HK(" @(" @("!T;F%M92 ](&]B:BYI;G-T86QL
M("L@)RTG("L@9V5N7V)A<V4N;&%N9U]A8F)R979;=&%R9V5T+FQA;F=U86=E
M70HK(" @(" @("!F;W(@9&5P(&EN('-E;&8N9W)A<&@N9V5T7W-O=7)C97,H
M9V5N7V)A<V4N1%1?24Y35$%,3"P@=&YA;64I.@HK(" @(" @(" @(&1E<'-;
M9&5P72 ]($YO;F4**R @(" @(" @8V]N=&EN=64**R @(" @(" @"B @(" @
M(" C(&EF('1H92!O8FIE8W0@:7,@:6X@)W-U8B<L('1H96X@<VMI<"!I= H@
M(" @(" @:68@;V)J(&YO="!I;B!S=6(Z"B @(" @(" @(&1E<'-;;V)J72 ]
M($YO;F4*0$ @+30T,RPS("LT-#DL."! 0 H@"B @(" @<F%I<V4@3F]T26UP
M;&5M96YT961%<G)O<@H@"BMD968@=6YI<75E*'-E<2DZ"BL@(&0@/2N(&0N
M:V5Y<R@I"DEN9&5X.B!B=6EL9"]G96YE<F%T;W(O9V5N7VUS=F-?9'-P+G!Y
M#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]#0HM+2T@8G5I;&0O9V5N97)A=&]R
M+V=E;E]M<W9C7V1S<"YP>0DH<F5V:7-I;VX@-C(W-"D**RLK(&)U:6QD+V=E
M;F5R871O<B]G96Y?;7-V8U]D<W N<'D)*'=O<FMI;F<@8V]P>2D*0$ @+30W
M+#<@*S0W+#8@0$ *(" @(" @('1A<F=T>7!E(#T@(E=I;C,R("AX.#8I($1Y
M;F%M:6,M3&EN:R!,:6)R87)Y(@H@(" @(" @=&%R9W9A;" ]("(P># Q,#(B
M"B @(" @("!T87)G970N;W5T<'5T7VYA;64@/2!O<RYP871H+F)A<V5N86UE
M*'1A<F=E="YF;F%M92D*+2 @(" @('1A<F=E="YD97-C(#T@3F]N90H@(" @
M(" @=&%R9V5T+FES7V%P86-H95]M;V0@/2 P"B @(" @96QS93H*(" @(" @
M(')A:7-E(&=E;E]B87-E+D=E;D5R<F]R*")#86YN;W0@8W)E871E('!R;VIE
M8W0@9F]R("5S(B E('1A<F=E="YN86UE*0I 0" M,3(T+#@@*S$R,RPX($!
M"B @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @
M(" @(" @(" @("!.;VYE+"!.;VYE+"!S96QF+F-F9RP*(" @(" @(" @(" @
M(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @($YO
M;F4I"B *+2 @("!I;G-T86QL7W1A<F=E=',@/2!U;FEQ=64H<V5L9BYG<F%P
M:"YG971?86QL7W-O=7)C97,H9V5N7V)A<V4N1%1?24Y35$%,3"D*+2 @(" @
M(" @(" @(" @(" @(" @(" @(" @(" @*R!S96QF+G1A<F=E=',N=F%L=65S
M*"DI"BL@(" @:6YS=&%L;%]T87)G971S(#T@9V5N7W=I;BYU;FEQ=64H<V5L
M9BYT87)G971S+G9A;'5E<R@I"BL@(" @(" @(" @(" @(" @(" @("L@<V5L
M9BYG<F%P:"YG971?86QL7W-O=7)C97,H9V5N7V)A<V4N1%1?24Y35$%,3"DI
M"B *(" @(" C('-O<G0@=&AE<V4@9F]R(&]U='!U="!S=&%B:6QI='DL('1O
M('=A=&-H(&]U="!F;W(@<F5G<F5S<VEO;G,N"B @(" @:6YS=&%L;%]T87)G
M971S+G-O<G0H*0I 0" M,30P+#8@*S$S.2PX($! "B @(" @("!P;W,@/2!S
M=')I;F<N9FEN9"AN86UE+" G+71E<W0G*0H@(" @(" @:68@<&]S(#X](# Z
M"B @(" @(" @(&1S<%]N86UE(#T@)W1E<W1?)R K('-T<FEN9RYR97!L86-E
M*&YA;65;.G!O<UTL("<M)RP@)U\G*0HK(" @(" @96QI9B!I<VEN<W1A;F-E
M*'1A<F=E="P@9V5N7V)A<V4N4U=)1TQI8G)A<GDI.@HK(" @(" @("!D<W!?
M;F%M92 ]("=S=VEG7R<@*R!S=')I;F<N<F5P;&%C92AN86UE+" G+2<L("=?
M)RD*(" @(" @(&5L<V4Z"B @(" @(" @(&1S<%]N86UE(#T@<W1R:6YG+G)E
M<&QA8V4H;F%M92P@)RTG+" G7R<I"B @(" @("!T87)G970N9'-P7VYA;64@
M/2!D<W!?;F%M90I 0" M,C,Q+#D@*S(S,BPS($! "B!C;&%S<R!?:71E;3H*
M(" @9&5F(%]?:6YI=%]?*'-E;&8L("HJ:W<I.@H@(" @('9A<G,H<V5L9BDN
M=7!D871E*&MW*0HM"BUD968@=6YI<75E*'-E<2DZ"BT@(&0@/2N(&0N:V5Y
$<R@I"@``
`
end
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 18 07:54:52 2003