September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7136 - in /trunk/libzypp/devel/devel.shaas: PdbToZypp/ PdbToZypp/swig/ old/ src/
by haass＠svn.opensuse.org 07 Sep '07

07 Sep '07

Author: haass Date: Fri Sep 7 12:14:47 2007 New Revision: 7136 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7136&view=rev Log: changed to cmake Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/ trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i Removed: trunk/libzypp/devel/devel.shaas/src/ Modified: trunk/libzypp/devel/devel.shaas/old/Makefile trunk/libzypp/devel/devel.shaas/old/main.cc Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt Fri Sep 7 12:14:47 2007 @@ -0,0 +1,45 @@ +PROJECT(pdbtozypp) + +SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) + +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -O2 -Wall -W -fpic -D_REENTRANT" ) + +FIND_PROGRAM(SWIG_EXECUTABLE + NAMES swig-1.3 swig + PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin +) + +IF ( NOT SWIG_EXECUTABLE ) + MESSAGE( FATAL_ERROR " swig not found" ) +ELSE ( NOT SWIG_EXECUTABLE ) + MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" ) +ENDIF ( NOT SWIG_EXECUTABLE ) + +FIND_PACKAGE(Zypp REQUIRED) +IF ( NOT ZYPP_LIBRARY ) + MESSAGE( FATAL_ERROR " zypp not found" ) +ELSE ( NOT ZYPP_LIBRARY ) + MESSAGE( STATUS "zypp found" ) +ENDIF ( NOT ZYPP_LIBRARY ) + +SET( pdbtozypp_SRCS + db.cc + pdbtozypp.cc + resolvable.cc + ) + +SET( pdbtozypp_HEADERS + db.h + pdbtozypp.h + resolvable.h + ) + +INSTALL( FILES ${pdbtozypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/pdbtozypp" ) + +ADD_LIBRARY(pdbtozypp SHARED ${pdbtozypp_SRCS}) +TARGET_LINK_LIBRARIES(pdbtozypp ${ZYPP_LIBRARY} ) +TARGET_LINK_LIBRARIES(pdbtozypp -lmysqlclient ) + +INSTALL(TARGETS pdbtozypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) + +ADD_SUBDIRECTORY(swig) Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc Fri Sep 7 12:14:47 2007 @@ -0,0 +1,91 @@ +#include "db.h" +#include <iostream> + +using std::string; + +//Constructor + +database::database(string nHost, string nUsername, string nPassword, string nDatabase, unsigned int nPort, string nSocket, unsigned long nClient_flag){ + host = nHost; + username = nUsername; + password = nPassword; + db = nDatabase; + port = nPort; + socket = nSocket; + client_flag = nClient_flag; + + conn = mysql_init(NULL); +} + +//Destructor + +database::~database(){ +} + +//Connect to db + +unsigned int database::connect(){ + if(mysql_real_connect(conn, host.c_str(), username.c_str(), password.c_str(), db.c_str(), port, socket.c_str(), client_flag) == NULL){ + + if(mysql_error(conn) != "") + std::cout << mysql_error(conn) << std::endl; + return mysql_errno(conn); + } + + return 1; +} + +//Close db connection + +void database::close(){ + mysql_close(conn); +} + +//Execute given SQL-Statement + +unsigned int database::sqlexecute(string sqlcom){ + + if(mysql_query(conn, sqlcom.c_str())){ + if(mysql_error(conn) != "") + std::cout << mysql_error(conn) << std::endl; + return mysql_errno(conn); + } + + if((result = mysql_store_result(conn)) == NULL){ + if(mysql_error(conn) != "") + std::cout << mysql_error(conn) << std::endl; + return mysql_errno(conn); + } + + unsigned int numrows = mysql_num_rows(result); + unsigned int numfields = mysql_num_fields(result); + + //std::cout << "Zeilen: " << numrows << " Spalten: " << numfields << std::endl; + + return 1; + +} + +//Pushes the fetchbuffer in a vector + +std::vector< std::vector<string> > database::getResult(){ + + std::vector< std::vector<string> > outResult; + int vecCtr = 0; + unsigned int numfields = mysql_num_fields(result); + + while ((fetchbuffer = mysql_fetch_row(result)) != NULL){ + //if(mysql_error(conn) != "") + // std::cout << mysql_error(conn) << "\n"; + std::vector<string> temp; + outResult.push_back(temp); + + for(unsigned int i = 0; i < numfields; i++){ + outResult[vecCtr].push_back(fetchbuffer[i] ? fetchbuffer[i] : "NULL"); + } + vecCtr++; + + } + + return outResult; +} Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h Fri Sep 7 12:14:47 2007 @@ -0,0 +1,33 @@ +#include <mysql/mysql.h> +#include <string> +#include <vector> + +#ifndef DB_H +#define DB_H + +using std::string; + +class database{ + private: + string host; + string username; + string password; + string db; + unsigned int port; + string socket; + unsigned long client_flag; + MYSQL* conn; + MYSQL_ROW fetchbuffer; + MYSQL_RES* result; + + public: + database(string host, string username, string password, string db, unsigned int port = 0, string socket = "", unsigned long client_flag = 0); + ~database(); + unsigned int connect(); + void close(); + unsigned int sqlexecute(string sqlcom); + std::vector< std::vector<string> > getResult(); +}; + + +#endif Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc Fri Sep 7 12:14:47 2007 @@ -0,0 +1,205 @@ +#include "pdbtozypp.h" +#include <iostream> + +using namespace zypp; + +//Constructor +PdbToZypp::PdbToZypp(){ + //store = _store; +} + +PdbToZypp::~PdbToZypp(){ + +} + +void PdbToZypp::readOut(){ + + //store = new ResStore; + + database *dbDeps = new database("lorien.suse.de", "rpmread", "Salahm1", "rpm"); + database *dbPackages = new database("lorien.suse.de", "rpmread", "Salahm1", "package"); + + if(dbPackages->connect() != 1){ + //std::cout << "NO DB CONNECTION!!!\n"; + //return 1; + } + + if(dbDeps->connect() != 1){ + //std::cout << "NO DB CONNECTION!!!\n"; + //return 1; + } + + //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL"); + dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL"); + + std::vector< std::vector<string> > packIDs = dbPackages->getResult(); + + Resolvable::Kind kind = ResTraits<Package>::kind; + CapFactory factory; + + for(unsigned int i = 0; i < packIDs.size(); i++){ + + string sqlcom("SELECT PackID FROM Packages WHERE BasedOnID="); + sqlcom.append(packIDs[i].at(0)); + dbPackages->sqlexecute(sqlcom); + std::vector< std::vector<string> > basedIDs = dbPackages->getResult(); + + std::vector< std::vector<string> > binPack; + + for(unsigned int j = 0; j < basedIDs.size(); j++){ + + sqlcom = "SELECT BinPackID, Version FROM BinaryPackages WHERE PackID="; + sqlcom.append(basedIDs[j].at(0)); + dbDeps->sqlexecute(sqlcom); + std::vector< std::vector<string> > tempVec = dbDeps->getResult(); + for(unsigned int x = 0; x < tempVec.size(); x++) + binPack.push_back(tempVec.at(x)); + } + + intrusive_ptr<resolvZypp> pkg; + CapSet prov; + CapSet preq; + CapSet req; + CapSet conf; + CapSet obs; + CapSet rec; + CapSet sug; + CapSet fre; + CapSet enh; + CapSet sup; + + string edition = ""; + + // If Deps + if(binPack.size() != 0){ + + std::vector< std::vector<string> > packDeps; + + for(unsigned int k = 0; k < binPack.size(); k++){ + sqlcom = "SELECT Symbol, Kind, Compare, Version FROM PackReqProv WHERE BinPackID="; + sqlcom.append(binPack[k].at(0)); + dbDeps->sqlexecute(sqlcom); + std::vector< std::vector<string> > tempVec = dbDeps->getResult(); + for(unsigned int l = 0; l < tempVec.size(); l++) + packDeps.push_back(tempVec.at(l)); + + sqlcom = "SELECT name, DirID FROM PackFilelist WHERE DirID IN(1, 22, 24, 96, 178, 756, 1981) AND BinPackID="; + sqlcom.append(binPack[k].at(0)); + dbDeps->sqlexecute(sqlcom); + tempVec = dbDeps->getResult(); + + for(unsigned int m = 0; m < tempVec.size(); m++){ + sqlcom = "SELECT dir FROM PackFileDirs WHERE DirID="; + sqlcom.append(tempVec[m].at(1)); + dbDeps->sqlexecute(sqlcom); + std::vector< std::vector<string> > tempVec2 = dbDeps->getResult(); + for(unsigned int n = 0; n < tempVec2.size(); n++){ + string fileprov = tempVec2[n].at(0) + "/" + tempVec[m].at(0); + prov.insert(factory.parse(kind, fileprov, Rel::ANY, Edition(""))); + } + + } + } + + for(unsigned int y = 0; y < packDeps.size(); y++){ + + string ed = ""; + string symbol = packDeps[y].at(0); + Rel rel = Rel::ANY; + + if(packDeps[y].at(0) == "(none)") + continue; + + if(packDeps[y].at(2) != "NULL"){ + rel = Rel(packDeps[y].at(2)); + ed = packDeps[y].at(3); + } + + + if(packDeps[y].at(1) == "provides"){ + if(symbol.find(" = ")){ + prov.insert(factory.parse(kind, packDeps[y].at(0))); + }else{ + prov.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + } + + }else if(packDeps[y].at(1) == "prerequires"){ + preq.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "requires"){ + req.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "conflicts"){ + conf.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "obsoletes"){ + obs.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "recommends"){ + rec.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "suggests"){ + sug.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "freshens"){ + fre.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "enhances"){ + enh.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + }else if(packDeps[y].at(1) == "supplements"){ + sup.insert(factory.parse(kind, packDeps[y].at(0) + , rel, Edition(ed))); + } + } + + edition = binPack[0].at(1); + + } + + Dependencies deps; + if(prov.size() > 0) + deps[Dep::PROVIDES] = prov; + if(preq.size() > 0) + deps[Dep::PREREQUIRES] = preq; + if(req.size() > 0) + deps[Dep::REQUIRES] = req; + if(conf.size() > 0) + deps[Dep::CONFLICTS] = conf; + if(obs.size() > 0) + deps[Dep::OBSOLETES] = obs; + if(rec.size() > 0) + deps[Dep::RECOMMENDS] = rec; + if(sug.size() > 0) + deps[Dep::SUGGESTS] = sug; + if(fre.size() > 0) + deps[Dep::FRESHENS] = fre; + if(enh.size() > 0) + deps[Dep::ENHANCES] = enh; + if(sup.size() > 0) + deps[Dep::SUPPLEMENTS] = sup; + + NVRAD nvPkg(packIDs[i].at(1), Edition(edition), Arch("i386"), deps); + + Package::Ptr p( detail::makeResolvableAndImpl(nvPkg, pkg)); + + //set Status to install + /*for(unsigned int ii = 0; ii < pToInst.size(); ii++){ + if(pToInst.at(ii) == packIDs[i].at(1)){ + PoolItem_Ref poolItem(p); + poolItem.status().setToBeInstalled(ResStatus::USER); + } + }*/ + + store.insert(p); + } + + dbDeps->close(); + dbPackages->close(); + +} + +ResStore PdbToZypp::getStore(){ + return store; +} Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h Fri Sep 7 12:14:47 2007 @@ -0,0 +1,22 @@ +#include <vector> +#include "db.h" +#include "resolvable.h" + +#include <zypp/ZYpp.h> +#include <zypp/ZYppFactory.h> +#include <zypp/ResStore.h> +#include <zypp/Package.h> +//#include <zypp/Source.h> +#include <zypp/CapFactory.h> + +class PdbToZypp{ + public: + //typedef zypp::ResStore ResStore; + //PdbToZypp(zypp::ResStore & _store); + PdbToZypp(); + ~PdbToZypp(); + void readOut(); + zypp::ResStore getStore(); + private: + zypp::ResStore store; +}; Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc Fri Sep 7 12:14:47 2007 @@ -0,0 +1,25 @@ +#include "resolvable.h" + +resolvable::resolvable(string _name, string _kind, string _arch, string _version, string _release){ + name = _name; + kind = _kind; + arch = _arch; + version = _version; + release = _release; +} + +resolvable::~resolvable(){ +} + +/* +void resolvable::addDep(depType _type, string _dep){ + + if(deps.find(_type) == deps.end()){ + std::vector<string> temp; + deps[_type] = temp; + } + + deps[_type].push_back(_dep); + +} +*/ Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h Fri Sep 7 12:14:47 2007 @@ -0,0 +1,34 @@ +#include <string> +#include <vector> +#include <map> +#include <zypp/detail/PackageImplIf.h> + +#ifndef RESOLVABLE_H +#define RESOLVABLE_H + +using std::string; + +enum depType{ + REQUIRES, + PROVIDES, + OBSOLETES, + CONFLICTS +}; + +class resolvable{ + private: + string name; + string kind; + string arch; + string version; + string release; + std::map < depType, std::vector<string> > deps; + + public: + resolvable(string name, string version, string kind = "package", string arch = "i386", string release ="0"); + ~resolvable(); + //void addDep(depType type, string dep, string compare, string version); +}; + +class resolvZypp : public zypp::detail::PackageImplIf {}; +#endif Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt Fri Sep 7 12:14:47 2007 @@ -0,0 +1,43 @@ +FIND_PACKAGE(Perl REQUIRED) + +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}") + +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlibexp}" OUTPUT_VARIABLE PERL_LIB_PATH) +SET( PERL_INS_PATH "${PERL_LIB_PATH}" ) +SET( PERL_LIB_PATH "${PERL_LIB_PATH}/CORE" ) + +MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") +MESSAGE(STATUS "Perl cpp-flags: ${PERL_CXX_FLAGS}") +MESSAGE(STATUS "Perl lib path: ${PERL_LIB_PATH}") + +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx" ) +SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/PdbToZypp.i" ) + +ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..." + COMMAND ${SWIG_EXECUTABLE} -c++ -perl5 -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/PdbToZypp.i + COMMAND ${CMAKE_COMMAND} -E echo "Done." + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i +) + +ADD_CUSTOM_TARGET( glue + DEPENDS ${SWIG_OUTPUT} +) + +ADD_LIBRARY( rpdbtozypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx" ) +SET_TARGET_PROPERTIES( rpdbtozypp PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( rpdbtozypp glue ) + +INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( /usr/include/pdbtozypp ) +TARGET_LINK_LIBRARIES( rpdbtozypp ${ZYPP_LIBRARY} ) +TARGET_LINK_LIBRARIES( rpdbtozypp -lpdbtozypp ) + +INSTALL(TARGETS rpdbtozypp LIBRARY DESTINATION ${PERL_INS_PATH}) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/rpdbtozypp.pm DESTINATION ${PERL_INS_PATH}) + Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ… ============================================================================== --- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i (added) +++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i Fri Sep 7 12:14:47 2007 @@ -0,0 +1,18 @@ +%module rpdbtozypp +%{ +#undef NORMAL +#include "pdbtozypp.h" +using namespace zypp; +%} + +class PdbToZypp{ + public: + //typedef zypp::ResStore ResStore; + //PdbToZypp(zypp::ResStore & _store); + PdbToZypp(); + ~PdbToZypp(); + void readOut(); + ResStore getStore(); + private: + ResStore store; +}; Modified: trunk/libzypp/devel/devel.shaas/old/Makefile URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/old/Ma… ============================================================================== --- trunk/libzypp/devel/devel.shaas/old/Makefile (original) +++ trunk/libzypp/devel/devel.shaas/old/Makefile Fri Sep 7 12:14:47 2007 @@ -8,7 +8,7 @@ INCPATH = -I/usr/include -I. -I. -I. LINK = g++ LFLAGS = -lpdbtozypp -LIBS = $(SUBLIBS) -L/usr/local/lib +LIBS = $(SUBLIBS) -L/usr/lib ####### Output directory Modified: trunk/libzypp/devel/devel.shaas/old/main.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/old/ma… ============================================================================== --- trunk/libzypp/devel/devel.shaas/old/main.cc (original) +++ trunk/libzypp/devel/devel.shaas/old/main.cc Fri Sep 7 12:14:47 2007 @@ -1,13 +1,45 @@ #include <pdbtozypp/pdbtozypp.h> +#include <zypp/ResPool.h> +#include <zypp/RepoManager.h> +#include <zypp/TmpPath.h> +#include <zypp/base/Iterator.h> using namespace zypp; using namespace std; int main(){ static ZYpp::Ptr God; - ResStore store = pdbToZypp(); - try { + PdbToZypp pdb; + pdb.readOut(); + + ResStore store = pdb.getStore(); + + /*RepoInfo repo_info; + repo_info.setAlias("test"); + repo_info.setName("Test Repo"); + repo_info.setEnabled(true); + repo_info.setAutorefresh(false); + repo_info.addBaseUrl(Url("ftp://dist.suse.de/install/stable-x86/")); + + RepoManagerOptions opts; + filesystem::TmpDir cachePath; + filesystem::TmpDir rawPath; + filesystem::TmpDir reposPath; + + opts.repoCachePath = cachePath.path(); + opts.repoRawCachePath = rawPath.path(); + opts.knownReposPath = reposPath.path(); + + RepoManager repo_man(opts); + + repo_man.addRepository(repo_info); + repo_man.refreshMetadata(repo_info); + repo_man.buildCache(repo_info); + Repository repo = repo_man.createFromCache(repo_info); + ResStore store = repo.resolvables();*/ + + try { God = zypp::getZYpp(); } catch (const Exception & excpt_r ) { @@ -18,5 +50,30 @@ God->addResolvables(store); cout << "Elements in pool: " << God->pool().size() << endl; + + for(pool::PoolTraits::const_iterator iter = God->pool().begin(); iter != God->pool().end(); iter++){ + + ResObject::constPtr r = iter->resolvable(); + if(r->name() == "glibc"){ + cout << "Package found!" << endl; + iter->status().setToBeInstalled(ResStatus::USER); + } + + } + + Resolver res(God->pool()); + + if(res.resolvePool() == false){ + cout << "It was not possible to solve the pool" << endl; + list<string> problems = res.problemDescription(); + + for(list<string>::iterator iter = problems.begin(); iter != problems.end(); iter++){ + cout << *iter << endl; + } + + }else{ + cout << "The pool was solved corectly" << endl; + } + return 0; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7135 - /trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
by schubi2＠svn.opensuse.org 07 Sep '07

07 Sep '07

Author: schubi2 Date: Fri Sep 7 12:02:12 2007 New Revision: 7135 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7135&view=rev Log: logging additional vendor Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue… ============================================================================== --- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Fri Sep 7 12:02:12 2007 @@ -224,7 +224,7 @@ && !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) { // checking if there is already an ignore MIL << "provider " << provider << " has ANOTHER vendor '" << provider->vendor() << "' than the updated item " - << upgrades << endl; + << upgrades << "(vendor: " << upgrades->vendor() << ")" << endl; PoolItemList ignore = _context->getIgnoreVendorItem(); PoolItemList::iterator it; for (it = ignore.begin(); it != ignore.end(); ++it) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7134 - in /trunk/libzypp-testsuite/solver/data.deptestomatic: basic-exercises/ yast-tests/
by schubi2＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: schubi2 Date: Thu Sep 6 18:23:41 2007 New Revision: 7134 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7134&view=rev Log: other valid solutions Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution Thu Sep 6 18:23:41 2007 @@ -11,19 +11,3 @@ >!> Solution: >!> Ignore this requirement just here >!> ->!> Taking solution: 0 ->!> For problem: 1 ->!> No problems so far ->!> No problems so far ->!> Solution #1: ->!> install A-2.0-1.noarch[test] ->!> install B-1.0-1.noarch[test] ->!> install D-1.0-1.noarch[test] ->!> |unflag E-1.0-1.noarch[test] ->!> installs=3, upgrades=0, uninstalls=0 ->!> Solution #2: ->!> install A-2.0-1.noarch[test] ->!> install B-1.0-1.noarch[test] ->!> install C-1.0-1.noarch[test] ->!> |unflag E-1.0-1.noarch[test] ->!> installs=3, upgrades=0, uninstalls=0 Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml Thu Sep 6 18:23:41 2007 @@ -8,7 +8,5 @@ <addRequire kind="package" name="notavailable"/> <addRequire kind="package" name="A"/> <reportproblems/> - <takesolution problem="1" solution="0"/> - <reportproblems/> </trial> </test> Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 Thu Sep 6 18:23:41 2007 @@ -4041,7 +4041,7 @@ >!> Generally ignore this requirement >!> >!> Problem: ->!> subversion cannot be installed due to missing dependencies +>!> subversion has missing dependencies >!> There are no installable providers of libaprutil-0.so.0 for subversion-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 Thu Sep 6 18:23:41 2007 @@ -4041,7 +4041,7 @@ >!> Generally ignore this requirement >!> >!> Problem: ->!> subversion cannot be installed due to missing dependencies +>!> subversion has missing dependencies >!> There are no installable providers of libapr-0.so.0 for subversion-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Thu Sep 6 18:23:41 2007 @@ -4041,7 +4041,7 @@ >!> Generally ignore this requirement >!> >!> Problem: ->!> subversion cannot be installed due to missing dependencies +>!> subversion has missing dependencies >!> There are no installable providers of libaprutil-0.so.0 for subversion-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7133 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: schubi2 Date: Thu Sep 6 18:22:56 2007 New Revision: 7133 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7133&view=rev Log: 7132 Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Sep 6 18:22:56 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Sep 6 18:22:36 CEST 2007 - schubi(a)suse.de + +- Error: Select two candidate with the same name while update. + Solution: If there is a candidate which is already selected for installation --> + take thatone #308082 +- r 7132 + +------------------------------------------------------------------- Thu Sep 6 14:11:58 CEST 2007 - ma(a)suse.de - Work arround installed patterns providing an empty vendor string. (#307743) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7132 - /trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
by schubi2＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: schubi2 Date: Thu Sep 6 18:19:52 2007 New Revision: 7132 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7132&view=rev Log: if there is a candidate which is already selected for installation --> take thatone #308082 Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Thu Sep 6 18:19:52 2007 @@ -226,13 +226,27 @@ FindMap::iterator it = providers.find( provider->name() ); if (it != providers.end()) { // provider with same name found - int cmp = it->second->arch().compare( provider->arch() ); - if (cmp < 0) { // new provider has better arch - it->second = provider; - } - else if (cmp == 0) { // new provider has equal arch - if (it->second->edition().compare( provider->edition() ) < 0) { - it->second = provider; // new provider has better edition + if (provider.status().isToBeInstalled() + || it->second.status().isToBeInstalled()) { + + if (provider.status().isToBeInstalled() + && it->second.status().isToBeInstalled()) { + ERR << "only one should be set for installation: " << it->second << "; " << provider << endl; + } else { + if (provider.status().isToBeInstalled()) { + it->second = provider; // take thatone which is already set for installation + } + } + } else { + // not the same --> find better provider + int cmp = it->second->arch().compare( provider->arch() ); + if (cmp < 0) { // new provider has better arch + it->second = provider; + } + else if (cmp == 0) { // new provider has equal arch + if (it->second->edition().compare( provider->edition() ) < 0) { + it->second = provider; // new provider has better edition + } } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7131 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: tgoettlicher Date: Thu Sep 6 17:06:30 2007 New Revision: 7131 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7131&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Thu Sep 6 17:06:30 2007 @@ -1,9 +1,16 @@ ------------------------------------------------------------------- +Thu Sep 6 17:03:20 CEST 2007 - tgoettlicher(a)suse.de + +- r7130 +- fixed duplicated text in error message (#308125) + + +------------------------------------------------------------------- Thu Sep 6 13:10:37 CEST 2007 - tgoettlicher(a)suse.de - fixed notification area of opensuse-updater-kde goes out of the display boundaries (#307661) - fixed bug in internal states -- 7120 +- r7120 ------------------------------------------------------------------- Wed Sep 5 11:38:34 CEST 2007 - tgoettlicher(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7130 - /trunk/updater-kde/updater/main.cpp
by tgoettlicher＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: tgoettlicher Date: Thu Sep 6 17:05:43 2007 New Revision: 7130 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7130&view=rev Log: fixed duplicated text in error message (#308125) Modified: trunk/updater-kde/updater/main.cpp Modified: trunk/updater-kde/updater/main.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/main.cpp?rev… ============================================================================== --- trunk/updater-kde/updater/main.cpp (original) +++ trunk/updater-kde/updater/main.cpp Thu Sep 6 17:05:43 2007 @@ -40,7 +40,7 @@ KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { - kdError() << "ERROR: We are already running" << endl; + kdError() << argv[0] << " is already running" << endl; exit(0); } UpdaterApplication app; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7129 - in /trunk/libzypp-bindings/examples/perl: ./ test.pl
by haass＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: haass Date: Thu Sep 6 17:01:07 2007 New Revision: 7129 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7129&view=rev Log: perl-example how to readout the pdb-db and start a solver-run Added: trunk/libzypp-bindings/examples/perl/ trunk/libzypp-bindings/examples/perl/test.pl Added: trunk/libzypp-bindings/examples/perl/test.pl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/t… ============================================================================== --- trunk/libzypp-bindings/examples/perl/test.pl (added) +++ trunk/libzypp-bindings/examples/perl/test.pl Thu Sep 6 17:01:07 2007 @@ -0,0 +1,62 @@ +use zypp; +use rpdbtozypp; + +$z = zyppc::ZYppFactory_instance(); +$zypp = $z->getZYpp; +$pdb = rpdbtozypp::PdbToZypp->new; +print "Package to install: "; +$ipkg = <STDIN>; +chomp($ipkg); +print "Importing packages from pdb!\n\n"; +print "This may take a while, please be patient!\n"; +$pdb->readOut; +$store = $pdb->getStore; +$zypp->addResolvables($store); + +$pool = $zypp->pool; +$it_b = $pool->begin; +$it_e = $pool->end; + +$checker = 0; + +print "Looking for package...!\n"; +while ($pool->iterator_equal($it_b, $pool->end) ne 1){ + $pkg = $pool->iterator_value($it_b); + $test = $pkg->resolvable; + $it_b = $pool->iterator_incr($it_b); + if($test->name eq $ipkg){ + print "Package found!\n"; + $tmp = $pkg->status; + $tmp->setToBeInstalledUser; + $checker = 1; + $it_b = $it_e; + } +} +if($checker eq 0){ + print "Package not in pdb!\n"; + print "Check spelling!\n"; + exit; +} + +$resolver = zypp::Resolver->new($pool); + +$it_b = $pool->begin; +if($resolver->resolvePool ne 1){ + print "Unable to solve the pool!!!\n"; + print "Problem Description: "; + $problems = $resolver->problemDescription; + foreach $problem (@$problems){ + print $problem, "\n"; + } +}else{ + print "These packages has to be installed: \n"; +# while ($it_b ne $pool->end){ + while ($pool->iterator_equal($it_b, $pool->end) ne 1){ + $pkg = $pool->iterator_value($it_b); + $it_b = $pool->iterator_incr($it_b); + $test = $pkg->resolvable; + if($pkg->status->isToBeInstalled eq 1){ + print $test->name, "\n"; + } + } +} -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7128 - in /trunk/libzypp/devel/devel.shaas/src: Makefile Makefile.PL Makefile.no PdbToZypp.i install.pl pdbtozypp.cc pdbtozypp.h
by haass＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: haass Date: Thu Sep 6 17:00:17 2007 New Revision: 7128 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7128&view=rev Log: added swig-file + several changes Added: trunk/libzypp/devel/devel.shaas/src/Makefile.PL trunk/libzypp/devel/devel.shaas/src/Makefile.no trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i trunk/libzypp/devel/devel.shaas/src/install.pl Removed: trunk/libzypp/devel/devel.shaas/src/Makefile Modified: trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h Added: trunk/libzypp/devel/devel.shaas/src/Makefile.PL URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Ma… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/Makefile.PL (added) +++ trunk/libzypp/devel/devel.shaas/src/Makefile.PL Thu Sep 6 17:00:17 2007 @@ -0,0 +1,7 @@ +# File : Makefile.PL +use ExtUtils::MakeMaker; +WriteMakefile( + 'NAME' => 'rpdbtozypp', # Name of package + 'LIBS' => '-lm -lzypp -lpdbtozypp', # Name of custom libraries + 'OBJECT' => 'PdbToZypp_wrap.o /usr/lib/perl5/5.8.8/i586-linux-thread-multi/zypp.so' # Object files +); Added: trunk/libzypp/devel/devel.shaas/src/Makefile.no URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Ma… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/Makefile.no (added) +++ trunk/libzypp/devel/devel.shaas/src/Makefile.no Thu Sep 6 17:00:17 2007 @@ -0,0 +1,59 @@ +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = +CFLAGS = -pipe -O2 -Wall -W -fpic -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -fpic -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/include -I. -I. -I. +LINK = g++ +LFLAGS = -shared -lmysqlclient +LIBS = $(SUBLIBS) -L/usr/lib + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = db.cc resolvable.h pdbtozypp.cc +OBJECTS = db.o pdbtozypp.o +OBJCOMP = /usr/lib/libzypp.so +DESTDIR = +TARGET = libpdbtozypp.so + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile.no $(TARGET) + +$(TARGET): $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +swig: + swig -c++ -perl5 PdbToZypp.i + +install: + install --mode=644 db.h /usr/include/pdbtozypp/ + install --mode=644 resolvable.h /usr/include/pdbtozypp/ + install --mode=644 pdbtozypp.h /usr/include/pdbtozypp/ + install --mode=555 libpdbtozypp.so /usr/lib/ Added: trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Pd… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i (added) +++ trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i Thu Sep 6 17:00:17 2007 @@ -0,0 +1,18 @@ +%module rpdbtozypp +%{ +#undef NORMAL +#include "pdbtozypp.h" +using namespace zypp; +%} + +class PdbToZypp{ + public: + //typedef zypp::ResStore ResStore; + //PdbToZypp(zypp::ResStore & _store); + PdbToZypp(); + ~PdbToZypp(); + void readOut(); + ResStore getStore(); + private: + ResStore store; +}; Added: trunk/libzypp/devel/devel.shaas/src/install.pl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/in… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/install.pl (added) +++ trunk/libzypp/devel/devel.shaas/src/install.pl Thu Sep 6 17:00:17 2007 @@ -0,0 +1,12 @@ +print "Build libpdbtozypp.so\n"; +`make -f Makefile.no`; +print "Install libpdbtozypp.so\n"; +`make -f Makefile.no install`; +print "Build swig-binding\n"; +`make -f Makefile.no swig`; +print "Build Makefile for perl-module with MakeMaker\n"; +`perl Makefile.PL`; +print "Build perl-module\n"; +`make`; +print "Install perl-module\n"; +`make install`; Modified: trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/pd… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc (original) +++ trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc Thu Sep 6 17:00:17 2007 @@ -5,11 +5,19 @@ //Constructor PdbToZypp::PdbToZypp(){ + //store = _store; +} + +PdbToZypp::~PdbToZypp(){ + +} + +void PdbToZypp::readOut(){ - store = new ResStore; + //store = new ResStore; - database *dbDeps = new database("lorien.suse.de", "rpmread", "***", "rpm"); - database *dbPackages = new database("lorien.suse.de", "rpmread", "***", "package"); + database *dbDeps = new database("lorien.suse.de", "rpmread", "rrrrrrr", "rpm"); + database *dbPackages = new database("lorien.suse.de", "rpmread", "rrrrrrr", "package"); if(dbPackages->connect() != 1){ //std::cout << "NO DB CONNECTION!!!\n"; @@ -21,7 +29,8 @@ //return 1; } - dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL"); + //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL"); + dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL"); std::vector< std::vector<string> > packIDs = dbPackages->getResult(); @@ -74,7 +83,22 @@ for(unsigned int l = 0; l < tempVec.size(); l++) packDeps.push_back(tempVec.at(l)); + sqlcom = "SELECT name, DirID FROM PackFilelist WHERE DirID IN(1, 22, 24, 96, 178, 756, 1981) AND BinPackID="; + sqlcom.append(binPack[k].at(0)); + dbDeps->sqlexecute(sqlcom); + tempVec = dbDeps->getResult(); + + for(unsigned int m = 0; m < tempVec.size(); m++){ + sqlcom = "SELECT dir FROM PackFileDirs WHERE DirID="; + sqlcom.append(tempVec[m].at(1)); + dbDeps->sqlexecute(sqlcom); + std::vector< std::vector<string> > tempVec2 = dbDeps->getResult(); + for(unsigned int n = 0; n < tempVec2.size(); n++){ + string fileprov = tempVec2[n].at(0) + "/" + tempVec[m].at(0); + prov.insert(factory.parse(kind, fileprov, Rel::ANY, Edition(""))); + } + } } for(unsigned int y = 0; y < packDeps.size(); y++){ @@ -168,7 +192,7 @@ } }*/ - store->insert(p); + store.insert(p); } dbDeps->close(); @@ -176,6 +200,6 @@ } -ResStore& PdbToZypp::getStore(){ - return *store; +ResStore PdbToZypp::getStore(){ + return store; } Modified: trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/pd… ============================================================================== --- trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h (original) +++ trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h Thu Sep 6 17:00:17 2007 @@ -11,9 +11,12 @@ class PdbToZypp{ public: - typedef zypp::ResStore ResStore; + //typedef zypp::ResStore ResStore; + //PdbToZypp(zypp::ResStore & _store); PdbToZypp(); - ResStore& getStore(); + ~PdbToZypp(); + void readOut(); + zypp::ResStore getStore(); private: - ResStore *store; + zypp::ResStore store; }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7127 - in /trunk/libzypp-bindings/swig: CMakeLists.txt ItemCapKind.i RepoInfo.i ResPool.i ResStatus.i Resolver.i perl5/ perl5/CMakeLists.txt perl5/perl.i zypp.i
by haass＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: haass Date: Thu Sep 6 16:15:14 2007 New Revision: 7127 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7127&view=rev Log: first running version of perl-bindings Added: trunk/libzypp-bindings/swig/ItemCapKind.i trunk/libzypp-bindings/swig/Resolver.i trunk/libzypp-bindings/swig/perl5/ trunk/libzypp-bindings/swig/perl5/CMakeLists.txt trunk/libzypp-bindings/swig/perl5/perl.i Modified: trunk/libzypp-bindings/swig/CMakeLists.txt trunk/libzypp-bindings/swig/RepoInfo.i trunk/libzypp-bindings/swig/ResPool.i trunk/libzypp-bindings/swig/ResStatus.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/CMakeLists… ============================================================================== --- trunk/libzypp-bindings/swig/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/CMakeLists.txt Thu Sep 6 16:15:14 2007 @@ -3,3 +3,5 @@ ADD_SUBDIRECTORY(python) +ADD_SUBDIRECTORY(perl5) + Added: trunk/libzypp-bindings/swig/ItemCapKind.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ItemCapKin… ============================================================================== --- trunk/libzypp-bindings/swig/ItemCapKind.i (added) +++ trunk/libzypp-bindings/swig/ItemCapKind.i Thu Sep 6 16:15:14 2007 @@ -0,0 +1,59 @@ +/*%{ + +struct solver::detail::ItemCapKind +{ + public: + Capability cap; //Capability which has triggerd this selection + Dep capKind; //Kind of that capability + PoolItem_Ref item; //Item which has triggered this selection + bool initialInstallation; //This item has triggered the installation + //Not already fullfilled requierement only. + + ItemCapKind( PoolItem i, Capability c, Dep k, bool initial) + : cap( c ) + , capKind( k ) + , item( i ) + , initialInstallation( initial ) + { } +}; +//typedef std::list<solver::detail::ItemCapKind> solver::detail::ItemCapKindList; +%} +*/ + +namespace zypp +{ + namespace solver + { + namespace detail + { + + struct ItemCapKind + { + public: + Capability cap; + Dep capKind; + PoolItem_Ref item; + bool initialInstallation; + + /*%extend { + ItemCapKind(){}; + }*/ + + //ItemCapKind(); + ItemCapKind( PoolItem i, Capability c, Dep k, bool initial) + : cap( c ) + , capKind( k ) + , item( i ) + , initialInstallation( initial ) + { } + }; + } + } +} +typedef std::list<solver::detail::ItemCapKind> solver::detail::ItemCapKindList; +%template(ItemCapKindList) std::list<solver::detail::ItemCapKind>; + +#ifdef SWIGRUBY + auto_iterator(std::list<solver::detail::ItemCapKind>, solver::detail::ItemCapKind); +#endif + Modified: trunk/libzypp-bindings/swig/RepoInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i… ============================================================================== --- trunk/libzypp-bindings/swig/RepoInfo.i (original) +++ trunk/libzypp-bindings/swig/RepoInfo.i Thu Sep 6 16:15:14 2007 @@ -1,5 +1,7 @@ - -%template(UrlSet) std::set<Url>; +#ifdef SWIGPERL5 +#else + %template(UrlSet) std::set<Url>; +#endif class RepoInfo { Modified: trunk/libzypp-bindings/swig/ResPool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResPool.i?… ============================================================================== --- trunk/libzypp-bindings/swig/ResPool.i (original) +++ trunk/libzypp-bindings/swig/ResPool.i Thu Sep 6 16:15:14 2007 @@ -27,10 +27,10 @@ /** \name Iterate through all ResObjects (all kinds). */ //@{ - /** + #ifdef SWIGPERL5 const_iterator begin() const; const_iterator end() const; - */ + #endif //@} public: @@ -150,6 +150,27 @@ }; +#ifdef SWIGPERL5 + +%extend ResPool { + + pool::PoolTraits::const_iterator iterator_incr(pool::PoolTraits::const_iterator *it ) { + (*it)++; + return *it; + } + pool::PoolTraits::const_iterator iterator_decr(pool::PoolTraits::const_iterator it) { + (it)--; + return it; + } + bool iterator_equal(pool::PoolTraits::const_iterator it1, pool::PoolTraits::const_iterator it2) { + return (it1 == it2); + } + PoolItem_Ref iterator_value(pool::PoolTraits::const_iterator it) { + return (*it); + } +}; + +#endif #ifdef SWIGRUBY Modified: trunk/libzypp-bindings/swig/ResStatus.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStatus.… ============================================================================== --- trunk/libzypp-bindings/swig/ResStatus.i (original) +++ trunk/libzypp-bindings/swig/ResStatus.i Thu Sep 6 16:15:14 2007 @@ -1,6 +1,16 @@ class ResStatus { + public: + + /** Default ctor. */ + ResStatus(); + + /** Ctor setting the initial . */ + ResStatus( bool isInstalled_r ); + + /** Dtor. */ + ~ResStatus(); public: /** \name BitField range definitions. @@ -78,9 +88,9 @@ }; enum SolverStateValue { - NORMAL = bit::RangeValue<SolverStateField,0>::value, // default, notthing special - SEEN = bit::RangeValue<SolverStateField,1>::value, // already seen during ResolverUpgrade - IMPOSSIBLE = bit::RangeValue<SolverStateField,2>::value // impossible to install + NORMAL = bit::RangeValue<SolverStateField,0>::value, // default, notthing special + SEEN = bit::RangeValue<SolverStateField,1>::value, // already seen during ResolverUpgrade + IMPOSSIBLE = bit::RangeValue<SolverStateField,2>::value // impossible to install }; enum LicenceConfirmedValue @@ -92,15 +102,6 @@ public: - /** Default ctor. */ - ResStatus(); - - /** Ctor setting the initial . */ - ResStatus( bool isInstalled_r ); - - /** Dtor. */ - ~ResStatus(); - /** Debug helper returning the bitfield. * It's save to expose the bitfield, as it can't be used to * recreate a ResStatus. So it is not possible to bypass @@ -369,3 +370,14 @@ private: BitFieldType _bitfield; }; + +#ifdef SWIGPERL5 + + %extend ResStatus { + + bool setToBeInstalledUser() + { + return self->setToBeInstalled(ResStatus::USER); + } + }; +#endif Added: trunk/libzypp-bindings/swig/Resolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Resolver.i… ============================================================================== --- trunk/libzypp-bindings/swig/Resolver.i (added) +++ trunk/libzypp-bindings/swig/Resolver.i Thu Sep 6 16:15:14 2007 @@ -0,0 +1,50 @@ +#ifdef SWIGPERL5 + %template(StringList) std::list<std::string>; +#endif + +class Resolver +{ + public: + Resolver( const ResPool & pool); + virtual ~Resolver(); + bool verifySystem (); + bool verifySystem (bool considerNewHardware); + bool establishPool (void); + bool freshenPool (void); + bool resolvePool (void); + bool resolvePool (bool tryAllPossibilities); + bool resolveDependencies( void ); + void undo( void ); + solver::detail::ResolverContext_Ptr context (void) const; + void doUpgrade( UpgradeStatistics & opt_stats_r ); + std::list<PoolItem_Ref> problematicUpdateItems( void ) const; + ResolverProblemList problems(); + std::list<std::string> problemDescription( void ) const; + void applySolutions( const ProblemSolutionList & solutions ); + + Arch architecture() const; + void setArchitecture( const Arch & arch); + void setForceResolve (const bool force); + const bool forceResolve(); + void setPreferHighestVersion (const bool highestVersion); + const bool preferHighestVersion(); + bool transactResObject( ResObject::constPtr robj, bool install = true); + //bool transactResKind( Resolvable::Kind kind ); + void transactReset( ResStatus::TransactByValue causer ); + void addRequire (const Capability & capability); + void addConflict (const Capability & capability); + void setTimeout( int seconds ); + int timeout(); + void setMaxSolverPasses (int count); + int maxSolverPasses (); + bool createSolverTestcase (const std::string & dumpPath = "/var/log/YaST2/solverTestcase"); + const solver::detail::ItemCapKindList isInstalledBy (const PoolItem_Ref item); + const std::list<solver::detail::ItemCapKind> installs (const PoolItem_Ref item); + //const solver::detail::ItemCapKindList installs (const PoolItem_Ref item); + + protected: + + private: + solver::detail::Resolver_Ptr _pimpl; +}; + Added: trunk/libzypp-bindings/swig/perl5/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/CMak… ============================================================================== --- trunk/libzypp-bindings/swig/perl5/CMakeLists.txt (added) +++ trunk/libzypp-bindings/swig/perl5/CMakeLists.txt Thu Sep 6 16:15:14 2007 @@ -0,0 +1,41 @@ +FIND_PACKAGE(Perl REQUIRED) + +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}") + +EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlibexp}" OUTPUT_VARIABLE PERL_LIB_PATH) +SET( PERL_INS_PATH "${PERL_LIB_PATH}" ) +SET( PERL_LIB_PATH "${PERL_LIB_PATH}/CORE" ) + +MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") +MESSAGE(STATUS "Perl cpp-flags: ${PERL_CXX_FLAGS}") +MESSAGE(STATUS "Perl lib path: ${PERL_LIB_PATH}") + +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) +SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) + +ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..." + COMMAND ${SWIG_EXECUTABLE} -c++ -perl5 -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i + COMMAND ${CMAKE_COMMAND} -E echo "Done." + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i +) + +ADD_CUSTOM_TARGET( glue + DEPENDS ${SWIG_OUTPUT} +) + +ADD_LIBRARY( zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" ) +SET_TARGET_PROPERTIES( zypp PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( zypp glue ) + +INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) +TARGET_LINK_LIBRARIES( zypp ${ZYPP_LIBRARY} ) + +INSTALL(TARGETS zypp LIBRARY DESTINATION ${PERL_INS_PATH}) +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.pm DESTINATION ${PERL_INS_PATH}) + Added: trunk/libzypp-bindings/swig/perl5/perl.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl… ============================================================================== (empty) Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Thu Sep 6 16:15:14 2007 @@ -1,11 +1,17 @@ %module zypp +#ifdef SWIGPERL5 +%{ + #define SWIGPERLHACK + #undef NORMAL +%} +#endif + %{ /* Includes the header in the wrapper code */ #include "zypp/base/PtrTypes.h" #include <zypp/Edition.h> #include <zypp/ResTraits.h> -#include <zypp/ResPoolProxy.h> #include <zypp/ResStore.h> #include <zypp/ZYppFactory.h> #include <zypp/ZYpp.h> @@ -14,7 +20,10 @@ #include "zypp/ResObject.h" #include "zypp/ResPoolManager.h" #include "zypp/Target.h" -#include "zypp/target/TargetImpl.h" +#ifndef SWIGPERLHACK + #include "zypp/target/TargetImpl.h" + #include "zypp/MediaSetAccess.h" +#endif #include "zypp/TranslatedText.h" #include "zypp/CapFactory.h" #include "zypp/Package.h" @@ -23,8 +32,8 @@ #include "zypp/Repository.h" #include "zypp/RepoManager.h" #include "zypp/repo/RepoType.h" -#include "zypp/MediaSetAccess.h" #include "zypp/TmpPath.h" +#include "zypp/Resolver.h" using namespace boost; using namespace zypp; @@ -33,6 +42,7 @@ using namespace zypp::filesystem; typedef std::set<Url> UrlSet; +typedef std::list<std::string> StringList; %} %rename("+") "operator+"; @@ -65,9 +75,13 @@ %include "python/python.i" #endif +#ifdef SWIGPERL5 +%include "std_list.i" +#endif %include "Pathname.i" %include "Url.i" +%include "ResStatus.i" %include "NeedAType.i" %include "Arch.i" %include "ResStore.i" @@ -96,15 +110,18 @@ %include "Package.i" %include "PublicKey.i" %include "KeyRing.i" -%include "Target.i" -%include "ResStatus.i" +#ifndef SWIGPERL5 + %include "Target.i" + %include "MediaSetAccess.i" +#endif %include "PoolItem.i" %include "ResPool.i" %include "ResPoolManager.i" %include "ZYppCommitPolicy.i" %include "ZYppCommitResult.i" -%include "MediaSetAccess.i" %include "TmpPath.i" +%include "Resolver.i" +%include "ItemCapKind.i" class ZYpp -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0