Author: dmacvicar Date: Wed Dec 5 16:45:39 2007 New Revision: 8035 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8035&view=rev Log: When using shared .i files across language bindings use #idef SWIG_LANG so the directves are not included in other languages (which fails) or use a per-language file for them. Modified: trunk/libzypp-bindings/swig/ResTraits.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/ResTraits.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResTraits.i?rev=8035&r1=8034&r2=8035&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/ResTraits.i (original) +++ trunk/libzypp-bindings/swig/ResTraits.i Wed Dec 5 16:45:39 2007 @@ -15,24 +15,25 @@ %template(ResTraitsResolvable) ResTraits<Resolvable>; -%pythoncode -{ - def KindOfPackage(): - return KindOfResolvable( "package" ) - def KindOfSrcPackage(): - return KindOfResolvable( "srcpackage" ) - def KindOfPatch(): - return KindOfResolvable( "patch" ) - def KindOfPattern(): - return KindOfResolvable( "pattern" ) - def KindOfProduct(): - return KindOfResolvable( "product" ) - def KindOfAtom(): - return KindOfResolvable( "atom" ) - def KindOfScript(): - return KindOfResolvable( "script" ) - def KindOfMessage(): - return KindOfResolvable( "message" ) - def KindOfLanguage(): - return KindOfResolvable( "language" ) -} +#ifdef SWIGPYTHON +%pythoncode %{ +def KindOfPackage(): + return KindOfResolvable( "package" ) +def KindOfSrcPackage(): + return KindOfResolvable( "srcpackage" ) +def KindOfPatch(): + return KindOfResolvable( "patch" ) +def KindOfPattern(): + return KindOfResolvable( "pattern" ) +def KindOfProduct(): + return KindOfResolvable( "product" ) +def KindOfAtom(): + return KindOfResolvable( "atom" ) +def KindOfScript(): + return KindOfResolvable( "script" ) +def KindOfMessage(): + return KindOfResolvable( "message" ) +def KindOfLanguage(): + return KindOfResolvable( "language" ) +%} +#endif Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev=8035&r1=8034&r2=8035&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Wed Dec 5 16:45:39 2007 @@ -13,12 +13,12 @@ %{ /* Includes the header in the wrapper code */ #include "zypp/base/PtrTypes.h" -#include -#include -#include -#include -#include -#include +#include "zypp/Edition.h" +#include "zypp/ResTraits.h" +#include "zypp/ResStore.h" +#include "zypp/ZYppFactory.h" +#include "zypp/ZYpp.h" +#include "zypp/Pathname.h" #include "zypp/base/ReferenceCounted.h" #include "zypp/ResObject.h" #include "zypp/ResPoolManager.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org