August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10720 - /trunk/sat-solver/src/poolid.h
by kkaempf＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: kkaempf Date: Fri Aug 1 15:06:46 2008 New Revision: 10720 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10720&view=rev Log: fix comment Modified: trunk/sat-solver/src/poolid.h Modified: trunk/sat-solver/src/poolid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid.h?rev=1072… ============================================================================== --- trunk/sat-solver/src/poolid.h (original) +++ trunk/sat-solver/src/poolid.h Fri Aug 1 15:06:46 2008 @@ -22,7 +22,7 @@ typedef struct _Reldep { Id name; // "package" Id evr; // "0:42-3" - int flags; // operation/relation, see REL_x below + int flags; // operation/relation, see REL_x in pool.h } Reldep; extern Id str2id(Pool *pool, const char *, int); -- 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] r10719 - in /trunk/sat-solver: src/CMakeLists.txt src/repo_helix.c src/repo_helix.h testsuite/CMakeLists.txt tools/CMakeLists.txt tools/repo_helix.c tools/repo_helix.h
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: dmacvicar Date: Fri Aug 1 14:30:13 2008 New Revision: 10719 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10719&view=rev Log: bah revert... you dreamer Added: trunk/sat-solver/src/repo_helix.c - copied, changed from r10718, trunk/sat-solver/tools/repo_helix.c trunk/sat-solver/src/repo_helix.h - copied, changed from r10718, trunk/sat-solver/tools/repo_helix.h Removed: trunk/sat-solver/tools/repo_helix.c trunk/sat-solver/tools/repo_helix.h Modified: trunk/sat-solver/src/CMakeLists.txt trunk/sat-solver/testsuite/CMakeLists.txt trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/CMakeLists.txt?re… ============================================================================== --- trunk/sat-solver/src/CMakeLists.txt (original) +++ trunk/sat-solver/src/CMakeLists.txt Fri Aug 1 14:30:13 2008 @@ -1,7 +1,7 @@ SET(libsatsolver_SRCS bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c - solver.c solverdebug.c repo_solv.c evr.c pool.c + solver.c solverdebug.c repo_solv.c repo_helix.c evr.c pool.c queue.c repo.c repodata.c util.c policy.c fastlz.c solvable.c) ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) @@ -9,7 +9,7 @@ SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h solverdebug.h - repo.h repodata.h repo_solv.h util.h + repo.h repodata.h repo_solv.h repo_helix.h util.h strpool.h dirpool.h knownid.h) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") Copied: trunk/sat-solver/src/repo_helix.c (from r10718, trunk/sat-solver/tools/repo_helix.c) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_helix.c?p2=t… ============================================================================== (empty) Copied: trunk/sat-solver/src/repo_helix.h (from r10718, trunk/sat-solver/tools/repo_helix.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_helix.h?p2=t… ============================================================================== (empty) Modified: trunk/sat-solver/testsuite/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/CMakeLists.… ============================================================================== --- trunk/sat-solver/testsuite/CMakeLists.txt (original) +++ trunk/sat-solver/testsuite/CMakeLists.txt Fri Aug 1 14:30:13 2008 @@ -7,9 +7,8 @@ ADD_EXECUTABLE(gimmick ${gimmick_SOURCES}) TARGET_LINK_LIBRARIES(gimmick satsolver) -# for repo_helix -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools ) -SET(deptestomatic_SOURCES deptestomatic.c ${CMAKE_SOURCE_DIR}/tools/repo_helix.c ) + +SET(deptestomatic_SOURCES deptestomatic.c) ADD_EXECUTABLE(deptestomatic ${deptestomatic_SOURCES}) TARGET_LINK_LIBRARIES(deptestomatic satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?… ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Fri Aug 1 14:30:13 2008 @@ -25,7 +25,7 @@ ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} ) TARGET_LINK_LIBRARIES( rpmmd2solv satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -SET(helix2solv_REPOS helix2solv.c repo_helix.c repo_helix.h repo_write.c common_write.c ) +SET(helix2solv_REPOS helix2solv.c repo_write.c common_write.c ) ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} ) TARGET_LINK_LIBRARIES( helix2solv satsolver ${EXPAT_LIBRARY}) -- 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] r10718 - in /trunk/sat-solver: src/CMakeLists.txt src/repo_helix.c src/repo_helix.h testsuite/CMakeLists.txt tools/CMakeLists.txt tools/repo_helix.c tools/repo_helix.h
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: dmacvicar Date: Fri Aug 1 14:13:09 2008 New Revision: 10718 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10718&view=rev Log: - repo_helix does not belong to sat solver core - adapt deptestomatic compilation to find it in tools/ Added: trunk/sat-solver/tools/repo_helix.c - copied, changed from r10717, trunk/sat-solver/src/repo_helix.c trunk/sat-solver/tools/repo_helix.h - copied, changed from r10717, trunk/sat-solver/src/repo_helix.h Removed: trunk/sat-solver/src/repo_helix.c trunk/sat-solver/src/repo_helix.h Modified: trunk/sat-solver/src/CMakeLists.txt trunk/sat-solver/testsuite/CMakeLists.txt trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/CMakeLists.txt?re… ============================================================================== --- trunk/sat-solver/src/CMakeLists.txt (original) +++ trunk/sat-solver/src/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -1,7 +1,7 @@ SET(libsatsolver_SRCS bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c - solver.c solverdebug.c repo_solv.c repo_helix.c evr.c pool.c + solver.c solverdebug.c repo_solv.c evr.c pool.c queue.c repo.c repodata.c util.c policy.c fastlz.c solvable.c) ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) @@ -9,7 +9,7 @@ SET(libsatsolver_HEADERS bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h solverdebug.h - repo.h repodata.h repo_solv.h repo_helix.h util.h + repo.h repodata.h repo_solv.h util.h strpool.h dirpool.h knownid.h) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") Modified: trunk/sat-solver/testsuite/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/CMakeLists.… ============================================================================== --- trunk/sat-solver/testsuite/CMakeLists.txt (original) +++ trunk/sat-solver/testsuite/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -7,8 +7,9 @@ ADD_EXECUTABLE(gimmick ${gimmick_SOURCES}) TARGET_LINK_LIBRARIES(gimmick satsolver) - -SET(deptestomatic_SOURCES deptestomatic.c) +# for repo_helix +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools ) +SET(deptestomatic_SOURCES deptestomatic.c ${CMAKE_SOURCE_DIR}/tools/repo_helix.c ) ADD_EXECUTABLE(deptestomatic ${deptestomatic_SOURCES}) TARGET_LINK_LIBRARIES(deptestomatic satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?… ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Fri Aug 1 14:13:09 2008 @@ -25,7 +25,7 @@ ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} ) TARGET_LINK_LIBRARIES( rpmmd2solv satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -SET(helix2solv_REPOS helix2solv.c repo_write.c common_write.c ) +SET(helix2solv_REPOS helix2solv.c repo_helix.c repo_helix.h repo_write.c common_write.c ) ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} ) TARGET_LINK_LIBRARIES( helix2solv satsolver ${EXPAT_LIBRARY}) Copied: trunk/sat-solver/tools/repo_helix.c (from r10717, trunk/sat-solver/src/repo_helix.c) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.c?p2… ============================================================================== (empty) Copied: trunk/sat-solver/tools/repo_helix.h (from r10717, trunk/sat-solver/src/repo_helix.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_helix.h?p2… ============================================================================== (empty) -- 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] r10717 - in /trunk/sat-solver/tools: repo_rpmmd.c tools_util.h
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: dmacvicar Date: Fri Aug 1 14:12:57 2008 New Revision: 10717 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10717&view=rev Log: - remove old code used to parse the old xml store, never used Modified: trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/tools_util.h Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Fri Aug 1 14:12:57 2008 @@ -15,6 +15,7 @@ #include "pool.h" #include "repo.h" +#define DISABLE_SPLIT #include "tools_util.h" #include "repo_rpmmd.h" @@ -85,18 +86,6 @@ STATE_SOURCERPM, STATE_HEADERRANGE, - STATE_CAPS_FORMAT, - STATE_CAPS_VENDOR, - STATE_CAPS_PROVIDES, - STATE_CAPS_REQUIRES, - STATE_CAPS_OBSOLETES, - STATE_CAPS_CONFLICTS, - STATE_CAPS_RECOMMENDS, - STATE_CAPS_SUPPLEMENTS, - STATE_CAPS_SUGGESTS, - STATE_CAPS_ENHANCES, - STATE_CAPS_FRESHENS, - STATE_PROVIDESENTRY, STATE_REQUIRESENTRY, STATE_OBSOLETESENTRY, @@ -107,16 +96,6 @@ STATE_ENHANCESENTRY, STATE_FRESHENSENTRY, - STATE_CAP_FRESHENS, - STATE_CAP_PROVIDES, - STATE_CAP_REQUIRES, - STATE_CAP_OBSOLETES, - STATE_CAP_CONFLICTS, - STATE_CAP_SUGGESTS, - STATE_CAP_RECOMMENDS, - STATE_CAP_SUPPLEMENTS, - STATE_CAP_ENHANCES, - STATE_FILE, // general @@ -168,17 +147,6 @@ { STATE_SOLVABLE, "default", STATE_DEFAULT, 1 }, { STATE_SOLVABLE, "install-time", STATE_INSTALL_TIME, 1 }, - /* those are used in libzypp xml store */ - { STATE_SOLVABLE, "obsoletes", STATE_CAPS_OBSOLETES , 0 }, - { STATE_SOLVABLE, "conflicts", STATE_CAPS_CONFLICTS , 0 }, - { STATE_SOLVABLE, "recommends", STATE_CAPS_RECOMMENDS , 0 }, - { STATE_SOLVABLE, "supplements", STATE_CAPS_SUPPLEMENTS, 0 }, - { STATE_SOLVABLE, "suggests", STATE_CAPS_SUGGESTS, 0 }, - { STATE_SOLVABLE, "enhances", STATE_CAPS_ENHANCES, 0 }, - { STATE_SOLVABLE, "freshens", STATE_CAPS_FRESHENS, 0 }, - { STATE_SOLVABLE, "provides", STATE_CAPS_PROVIDES, 0 }, - { STATE_SOLVABLE, "requires", STATE_CAPS_REQUIRES, 0 }, - { STATE_SOLVABLE, "rpm:vendor", STATE_VENDOR, 1 }, { STATE_SOLVABLE, "rpm:group", STATE_RPM_GROUP, 1 }, { STATE_SOLVABLE, "rpm:license", STATE_RPM_LICENSE, 1 }, @@ -196,16 +164,6 @@ { STATE_SOLVABLE, "rpm:sourcerpm", STATE_SOURCERPM, 1 }, { STATE_SOLVABLE, "rpm:header-range", STATE_HEADERRANGE, 0 }, { STATE_SOLVABLE, "file", STATE_FILE, 1 }, - - { STATE_CAPS_PROVIDES, "capability", STATE_CAP_PROVIDES, 1 }, - { STATE_CAPS_REQUIRES, "capability", STATE_CAP_REQUIRES, 1 }, - { STATE_CAPS_OBSOLETES, "capability", STATE_CAP_OBSOLETES, 1 }, - { STATE_CAPS_CONFLICTS, "capability", STATE_CAP_CONFLICTS, 1 }, - { STATE_CAPS_RECOMMENDS, "capability", STATE_CAP_RECOMMENDS, 1 }, - { STATE_CAPS_SUPPLEMENTS, "capability", STATE_CAP_SUPPLEMENTS, 1 }, - { STATE_CAPS_SUGGESTS, "capability", STATE_CAP_SUGGESTS, 1 }, - { STATE_CAPS_ENHANCES, "capability", STATE_CAP_ENHANCES, 1 }, - { STATE_CAPS_FRESHENS, "capability", STATE_CAP_FRESHENS, 1 }, { STATE_PROVIDES, "rpm:entry", STATE_PROVIDESENTRY, 0 }, { STATE_REQUIRES, "rpm:entry", STATE_REQUIRESENTRY, 0 }, @@ -243,59 +201,6 @@ Id handle; }; -static char *flagtabnum[] = { - ">", - "=", - ">=", - "<", - "!=", - "<=", -}; - -/** - * adds plain dependencies, that is strings like "foo > 2.0" - * which are used in libzypp xml store, not in rpm-md. - */ -static unsigned int -adddepplain(Pool *pool, struct parsedata_common *pd, unsigned int olddeps, char *line, Id marker, const char *kind) -{ - int i, flags; - Id id, evrid; - char *sp[4]; - - i = split(line, sp, 4); - if (i != 1 && i != 3) - { - fprintf(stderr, "Bad dependency line: %s\n", line); - exit(1); - } - if (kind) - id = str2id(pool, join2(kind, ":", sp[0]), 1); - else - id = str2id(pool, sp[0], 1); - if (i == 3) - { - evrid = makeevr(pool, sp[2]); - for (flags = 0; flags < 6; flags++) - if (!strcmp(sp[1], flagtabnum[flags])) - break; - if (flags == 6) - { - if ( !strcmp(sp[1], "==")) - { - flags = 1; - } - else - { - fprintf(stderr, "Unknown relation '%s'\n", sp[1]); - exit(1); - } - } - id = rel2id(pool, id, evrid, flags + 1, 1); - } - return repo_addid_dep(pd->repo, olddeps, id, marker); -} - static Id makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) { @@ -589,81 +494,60 @@ case STATE_VERSION: s->evr = makeevr_atts(pool, pd, atts); break; - case STATE_CAPS_PROVIDES: case STATE_PROVIDES: s->provides = 0; break; case STATE_PROVIDESENTRY: s->provides = adddep(pool, pd, s->provides, atts, 0); break; - case STATE_CAPS_REQUIRES: case STATE_REQUIRES: s->requires = 0; break; case STATE_REQUIRESENTRY: s->requires = adddep(pool, pd, s->requires, atts, 1); break; - case STATE_CAPS_OBSOLETES: case STATE_OBSOLETES: s->obsoletes = 0; break; case STATE_OBSOLETESENTRY: s->obsoletes = adddep(pool, pd, s->obsoletes, atts, 0); break; - case STATE_CAPS_CONFLICTS: case STATE_CONFLICTS: s->conflicts = 0; break; case STATE_CONFLICTSENTRY: s->conflicts = adddep(pool, pd, s->conflicts, atts, 0); break; - case STATE_CAPS_RECOMMENDS: case STATE_RECOMMENDS: s->recommends = 0; break; case STATE_RECOMMENDSENTRY: s->recommends = adddep(pool, pd, s->recommends, atts, 0); break; - case STATE_CAPS_SUPPLEMENTS: case STATE_SUPPLEMENTS: s->supplements= 0; break; case STATE_SUPPLEMENTSENTRY: s->supplements = adddep(pool, pd, s->supplements, atts, 0); break; - case STATE_CAPS_SUGGESTS: case STATE_SUGGESTS: s->suggests = 0; break; case STATE_SUGGESTSENTRY: s->suggests = adddep(pool, pd, s->suggests, atts, 0); break; - case STATE_CAPS_ENHANCES: case STATE_ENHANCES: s->enhances = 0; break; case STATE_ENHANCESENTRY: s->enhances = adddep(pool, pd, s->enhances, atts, 0); break; - case STATE_CAPS_FRESHENS: case STATE_FRESHENS: pd->freshens = 0; break; case STATE_FRESHENSENTRY: pd->freshens = adddep(pool, pd, pd->freshens, atts, 0); break; - case STATE_CAP_PROVIDES: - case STATE_CAP_REQUIRES: - case STATE_CAP_OBSOLETES: - case STATE_CAP_CONFLICTS: - case STATE_CAP_RECOMMENDS: - case STATE_CAP_SUPPLEMENTS: - case STATE_CAP_SUGGESTS: - case STATE_CAP_ENHANCES: - case STATE_CAP_FRESHENS: - pd->capkind = find_attr("kind", atts); - //fprintf(stderr,"capkind es: %s\n", pd->capkind); - break; case STATE_SUMMARY: case STATE_DESCRIPTION: pd->lang = find_attr("lang", atts); @@ -804,34 +688,6 @@ id = repodata_str2dir(pd->data, "/", 1); repodata_add_dirstr(pd->data, handle, SOLVABLE_FILELIST, id, p); break; - // xml store capabilities - case STATE_CAP_PROVIDES: - s->provides = adddepplain(pool, &pd->common, s->provides, pd->content, 0, pd->capkind); - break; - case STATE_CAP_REQUIRES: - s->requires = adddepplain(pool, &pd->common, s->requires, pd->content, 0, pd->capkind); - break; - case STATE_CAP_OBSOLETES: - s->obsoletes = adddepplain(pool, &pd->common, s->obsoletes, pd->content, 0, pd->capkind); - break; - case STATE_CAP_CONFLICTS: - s->conflicts = adddepplain(pool, &pd->common, s->conflicts, pd->content, 0, pd->capkind); - break; - case STATE_CAP_RECOMMENDS: - s->recommends = adddepplain(pool, &pd->common, s->recommends, pd->content, 0, pd->capkind); - break; - case STATE_CAP_SUPPLEMENTS: - s->supplements = adddepplain(pool, &pd->common, s->supplements, pd->content, 0, pd->capkind); - break; - case STATE_CAP_SUGGESTS: - s->suggests = adddepplain(pool, &pd->common, s->suggests, pd->content, 0, pd->capkind); - break; - case STATE_CAP_ENHANCES: - s->enhances = adddepplain(pool, &pd->common, s->enhances, pd->content, 0, pd->capkind); - break; - case STATE_CAP_FRESHENS: - pd->freshens = adddepplain(pool, &pd->common, pd->freshens, pd->content, 0, pd->capkind); - break; case STATE_SUMMARY: pd->lang = 0; repodata_set_str(pd->data, handle, SOLVABLE_SUMMARY, pd->content); Modified: trunk/sat-solver/tools/tools_util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tools_util.h?re… ============================================================================== --- trunk/sat-solver/tools/tools_util.h (original) +++ trunk/sat-solver/tools/tools_util.h Fri Aug 1 14:12:57 2008 @@ -35,6 +35,7 @@ /** * split a string */ +#ifndef DISABLE_SPLIT static int split(char *l, char **sp, int m) { @@ -54,6 +55,7 @@ } return i; } +#endif /* this join does not depend on parsedata */ static char * @@ -104,46 +106,6 @@ _join_tmpl = 0; } -// static char * -// join(struct parsedata_common *pd, const char *s1, const char *s2, const char *s3) -// { -// int l = 1; -// char *p; -// -// if (s1) -// l += strlen(s1); -// if (s2) -// l += strlen(s2); -// if (s3) -// l += strlen(s3); -// if (l > pd->tmpl) -// { -// pd->tmpl = l + 256; -// if (!pd->tmp) -// pd->tmp = malloc(pd->tmpl); -// else -// pd->tmp = realloc(pd->tmp, pd->tmpl); -// } -// p = pd->tmp; -// if (s1) -// { -// strcpy(p, s1); -// p += strlen(s1); -// } -// if (s2) -// { -// strcpy(p, s2); -// p += strlen(s2); -// } -// if (s3) -// { -// strcpy(p, s3); -// p += strlen(s3); -// } -// return pd->tmp; -// } - - /* util function to set a translated string */ static inline void repodata_set_tstr(Repodata *data, Id handle, const char *attrname, const char *lang, const char *str) { -- 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] r10716 - in /trunk/libzypp-bindings: examples/testImports.sh package/libzypp-bindings.changes swig/ProductInfo.i swig/TranslatedText.i swig/zypp.i
by mlandres＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: mlandres Date: Fri Aug 1 10:25:30 2008 New Revision: 10716 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10716&view=rev Log: - Remove obsolete TranslatedText - Add ProductInfo which is going to replace Product Added: trunk/libzypp-bindings/examples/testImports.sh (with props) trunk/libzypp-bindings/swig/ProductInfo.i Removed: trunk/libzypp-bindings/swig/TranslatedText.i Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes trunk/libzypp-bindings/swig/zypp.i Added: trunk/libzypp-bindings/examples/testImports.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/testIm… ============================================================================== --- trunk/libzypp-bindings/examples/testImports.sh (added) +++ trunk/libzypp-bindings/examples/testImports.sh Fri Aug 1 10:25:30 2008 @@ -0,0 +1,21 @@ +#! /bin/bash + +echo "====Ruby=========" +ruby <<EOF + require 'zypp' + include Zypp + zypp = ZYppFactory::instance.get_zypp +EOF + +echo "====Python=======" +python <<EOF +import zypp +zypp = zypp.ZYppFactory.instance().getZYpp() +EOF + +echo "====Perl=========" +perl - <<"EOF" + use zypp; + $zfactory = zyppc::ZYppFactory_instance(); + $zypp = $zfactory->getZYpp; +EOF \ No newline at end of file Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/package/libzypp… ============================================================================== --- trunk/libzypp-bindings/package/libzypp-bindings.changes (original) +++ trunk/libzypp-bindings/package/libzypp-bindings.changes Fri Aug 1 10:25:30 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 1 10:23:55 CEST 2008 ma(a)suse.de + +- Remove obsolete TranslatedText +- Add ProductInfo which is going to replace Product +- revision 10716 + +------------------------------------------------------------------- Thu Jul 31 14:25:21 CEST 2008 ma(a)suse.de - Work around undefined symbols in libzypp. (bnc #391831) Added: trunk/libzypp-bindings/swig/ProductInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ProductInf… ============================================================================== --- trunk/libzypp-bindings/swig/ProductInfo.i (added) +++ trunk/libzypp-bindings/swig/ProductInfo.i Fri Aug 1 10:25:30 2008 @@ -0,0 +1 @@ +%include <zypp/ProductInfo.h> \ No newline at end of file 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 Fri Aug 1 10:25:30 2008 @@ -21,22 +21,17 @@ #include <sstream> #include "zypp/base/PtrTypes.h" +#include "zypp/base/ReferenceCounted.h" #include "zypp/Edition.h" +#include "zypp/Pathname.h" #include "zypp/ResTraits.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" -#include "zypp/Pathname.h" -#include "zypp/base/ReferenceCounted.h" -#include "zypp/ResObject.h" +#include "zypp/ProductInfo.h" +#include "zypp/ResObjects.h" #include "zypp/Target.h" #include "zypp/target/TargetImpl.h" #include "zypp/MediaSetAccess.h" -#include "zypp/TranslatedText.h" -#include "zypp/Package.h" -#include "zypp/Patch.h" -#include "zypp/SrcPackage.h" -#include "zypp/Pattern.h" -#include "zypp/Product.h" #include "zypp/ResFilters.h" #include "zypp/OnMediaLocation.h" #include "zypp/Repository.h" @@ -102,33 +97,33 @@ %include "IdStringType.i" %include "Pathname.i" +%include "ByteCount.i" %include "Url.i" -%include "ResStatus.i" %include "NeedAType.i" %include "Arch.i" %include "Edition.i" %include "Kind.i" -%include "ResTraits.i" +%include "CheckSum.i" %include "Date.i" +%include "Dep.i" %include "Capability.i" %include "Capabilities.i" -%include "Dep.i" +%include "CapMatch.i" +%include "ResTraits.i" +%include "ResStatus.i" %include "Resolvable.i" -%include "ByteCount.i" -%include "RepoType.i" -%include "Repository.i" -%include "RepoInfo.i" -%include "RepoManager.i" -%include "RepoStatus.i" %include "ResObject.i" -%include "TranslatedText.i" -%include "CheckSum.i" -%include "CapMatch.i" %include "Package.i" %include "Patch.i" -%include "SrcPackage.i" %include "Pattern.i" %include "Product.i" +%include "ProductInfo.i" +%include "SrcPackage.i" +%include "RepoType.i" +%include "RepoInfo.i" +%include "Repository.i" +%include "RepoStatus.i" +%include "RepoManager.i" %include "PublicKey.i" %include "KeyRing.i" %include "Target.i" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0