Author: aschnell Date: Tue Sep 25 18:31:06 2007 New Revision: 7378 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7378&view=rev Log: - include original C header files Modified: trunk/libzypp-bindings/swig/KeyRing.i trunk/libzypp-bindings/swig/Pathname.i trunk/libzypp-bindings/swig/PublicKey.i trunk/libzypp-bindings/swig/RepoInfo.i trunk/libzypp-bindings/swig/RepoManager.i trunk/libzypp-bindings/swig/Target.i trunk/libzypp-bindings/swig/TmpPath.i trunk/libzypp-bindings/swig/perl5/perl.i trunk/libzypp-bindings/swig/python/python.i trunk/libzypp-bindings/swig/ruby/ruby.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/KeyRing.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/KeyRing.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/KeyRing.i (original) +++ trunk/libzypp-bindings/swig/KeyRing.i Tue Sep 25 18:31:06 2007 @@ -6,7 +6,7 @@ public: - KeyRing(const Pathname& baseTmpDir); + KeyRing(const zypp::Pathname& baseTmpDir); ~KeyRing(); void importKey(const PublicKey& key, bool trusted = false); Modified: trunk/libzypp-bindings/swig/Pathname.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Pathname.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Pathname.i (original) +++ trunk/libzypp-bindings/swig/Pathname.i Tue Sep 25 18:31:06 2007 @@ -1,42 +1,4 @@ -class Pathname -{ -public: - - Pathname(); - Pathname(const std::string&); - Pathname(const char*); - - const std::string & asString() const; - - bool empty() const; - bool absolute() const; - bool relative() const; - -}; - - -// #ifdef SWIGRUBY -// -// // Something like 'opts.repoCachePath = tmp_cache_path.path()' causes out and -// // in transformation. Can that be avoided? -// -// %typemap(in) const Pathname&, Pathname* { -// VALUE pathstring = rb_funcall( $input, rb_intern("to_s"), 0, 0); -// Pathname *p = new Pathname( (RSTRING(pathstring)->ptr) ); -// $1 = p; -// } -// -// %typemap(freearg) const Pathname&, Pathname* { -// delete $1; -// } -// -// %typemap(out) Pathname { -// rb_require("pathname"); -// VALUE klass = rb_const_get( rb_cObject, rb_intern("Pathname")); -// VALUE rbpathstr = rb_str_new2($1.asString().c_str()); -// $result = rb_funcall( klass, rb_intern("new"), 1, rbpathstr); -// } -// -// #endif +// TODO: tell make about dependencies +%include Modified: trunk/libzypp-bindings/swig/PublicKey.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/PublicKey.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/PublicKey.i (original) +++ trunk/libzypp-bindings/swig/PublicKey.i Tue Sep 25 18:31:06 2007 @@ -5,7 +5,7 @@ public: PublicKey(); - PublicKey(const Pathname& file); + PublicKey(const zypp::Pathname& file); ~PublicKey(); bool isValid() const; @@ -15,7 +15,7 @@ std::string id() const; std::string name() const; std::string fingerprint() const; - Pathname path() const; + zypp::Pathname path() const; }; Modified: trunk/libzypp-bindings/swig/RepoInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/RepoInfo.i (original) +++ trunk/libzypp-bindings/swig/RepoInfo.i Tue Sep 25 18:31:06 2007 @@ -71,7 +71,7 @@ * \note could be an empty pathname for repo * infos created in memory. */ - Pathname filepath() const; + zypp::Pathname filepath() const; /** * Add a base url. \see baseUrls @@ -121,7 +121,7 @@ * \short set the repository filepath * \param path File path */ - RepoInfo & setFilepath( const Pathname &filename ); + RepoInfo & setFilepath( const zypp::Pathname &filename ); std::ostream & dumpOn( std::ostream & str ) const; Modified: trunk/libzypp-bindings/swig/RepoManager.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoManager.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/RepoManager.i (original) +++ trunk/libzypp-bindings/swig/RepoManager.i Tue Sep 25 18:31:06 2007 @@ -1,13 +1,13 @@ - + std::list<RepoInfo> readRepoFile(const Url & repo_file); struct RepoManagerOptions { RepoManagerOptions(); - - Pathname repoCachePath; - Pathname repoRawCachePath; - Pathname knownReposPath; + + zypp::Pathname repoCachePath; + zypp::Pathname repoRawCachePath; + zypp::Pathname knownReposPath; }; class RepoManager @@ -15,24 +15,24 @@ public: RepoManager( const RepoManagerOptions &options = RepoManagerOptions() ); ~RepoManager(); - + enum RawMetadataRefreshPolicy { RefreshIfNeeded, RefreshForced }; - + enum CacheBuildPolicy { BuildIfNeeded, BuildForced }; - + enum RepoRemovePolicy { - + }; - + std::list<RepoInfo> knownRepositories() const; void refreshMetadata( const RepoInfo &info, RawMetadataRefreshPolicy policy = RefreshIfNeeded, @@ -53,5 +53,5 @@ const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); void removeRepository( const RepoInfo & info, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); - + }; Modified: trunk/libzypp-bindings/swig/Target.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Target.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/Target.i (original) +++ trunk/libzypp-bindings/swig/Target.i Tue Sep 25 18:31:06 2007 @@ -44,14 +44,14 @@ #ifndef STORAGE_DISABLED /** enables the storage target */ bool isStorageEnabled() const; - void enableStorage(const Pathname &root_r); + void enableStorage(const zypp::Pathname &root_r); #endif /** Set the log file for target */ - bool setInstallationLogfile(const Pathname & path_r); + bool setInstallationLogfile(const zypp::Pathname & path_r); /** Return the root set for this target */ - Pathname root() const; + zypp::Pathname root() const; /** return the last modification date of the target */ Date timestamp() const; Modified: trunk/libzypp-bindings/swig/TmpPath.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/TmpPath.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/TmpPath.i (original) +++ trunk/libzypp-bindings/swig/TmpPath.i Tue Sep 25 18:31:06 2007 @@ -1,45 +1,4 @@ -class TmpPath -{ -public: - - TmpPath(); - - explicit TmpPath( const Pathname & tmpPath_r ); - - virtual ~TmpPath(); - - Pathname path() const; - - static const Pathname & defaultLocation(); - -}; - - -class TmpFile : public TmpPath -{ -public: - - explicit TmpFile( const Pathname & inParentDir_r = defaultLocation(), - const std::string & prefix_r = defaultPrefix() ); - - static TmpFile makeSibling( const Pathname & sibling_r ); - - static const std::string & defaultPrefix(); - -}; - - -class TmpDir : public TmpPath -{ -public: - - explicit TmpDir( const Pathname & inParentDir_r = defaultLocation(), - const std::string & prefix_r = defaultPrefix() ); - - static TmpDir makeSibling( const Pathname & sibling_r ); - - static const std::string & defaultPrefix(); - -}; +// TODO: tell make about dependencies +%include Modified: trunk/libzypp-bindings/swig/perl5/perl.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/perl5/perl.i (original) +++ trunk/libzypp-bindings/swig/perl5/perl.i Tue Sep 25 18:31:06 2007 @@ -1,3 +1,13 @@ + +namespace zypp +{ + // These operators must be ignored otherwise the wrapper does + // not compile (using swig 1.3.29). + %ignore operator<<; + %ignore operator==; + %ignore operator!=; +} + %define iter(cls, storetype) %extend cls { cls::const_iterator iterator_incr(cls::const_iterator *it){ Modified: trunk/libzypp-bindings/swig/python/python.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/python.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/python/python.i (original) +++ trunk/libzypp-bindings/swig/python/python.i Tue Sep 25 18:31:06 2007 @@ -5,6 +5,11 @@ namespace zypp { + // These operators must be ignored otherwise the wrapper does + // not compile (using swig 1.3.29). + %ignore operator==; + %ignore operator!=; + // Just to avoid warnings. %ignore operator<<; } Modified: trunk/libzypp-bindings/swig/ruby/ruby.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/ruby.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/ruby/ruby.i (original) +++ trunk/libzypp-bindings/swig/ruby/ruby.i Tue Sep 25 18:31:06 2007 @@ -13,6 +13,14 @@ // Just to avoid warnings. %ignore operator!=; %ignore operator<<; + + namespace filesystem + { + // Same as above. + %ignore operator==; + %ignore operator!=; + %ignore operator<<; + } } Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev=7378&r1=7377&r2=7378&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Tue Sep 25 18:31:06 2007 @@ -144,7 +144,7 @@ void setPartitions(const DiskUsageCounter::MountPointSet &mp); */ Target_Ptr target() const; - void initializeTarget(const Pathname & root); + void initializeTarget(const zypp::Pathname & root); void finishTarget(); typedef ZYppCommitResult CommitResult; @@ -162,9 +162,9 @@ LocaleSet getAvailableLocales() const; void availableLocale( const Locale & locale_r ); */ - Pathname homePath() const; - Pathname tmpPath() const; - void setHomePath( const Pathname & path ); + zypp::Pathname homePath() const; + zypp::Pathname tmpPath() const; + void setHomePath( const zypp::Pathname & path ); Arch architecture() const; void setArchitecture( const Arch & arch ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org