[zypp-commit] r8616 - in /trunk/sat-solver: src/CMakeLists.txt src/repo_helix.c src/repo_helix.h testsuite/deptestomatic.c tools/CMakeLists.txt tools/repo_helix.c tools/repo_helix.h

Author: schubi2 Date: Tue Feb 12 10:42:06 2008 New Revision: 8616 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8616&view=rev Log: - Moving helix parser to the API - deptestomatic: Using helix-file for fallback if the solv-file does not exist. Added: trunk/sat-solver/src/repo_helix.c - copied unchanged from r8610, trunk/sat-solver/tools/repo_helix.c trunk/sat-solver/src/repo_helix.h - copied, changed from r8610, 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/deptestomatic.c 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?rev=8616&r1=8615&r2=8616&view=diff ============================================================================== --- trunk/sat-solver/src/CMakeLists.txt (original) +++ trunk/sat-solver/src/CMakeLists.txt Tue Feb 12 10:42:06 2008 @@ -1,10 +1,10 @@ SET(libsatsolver_SRCS bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c -solver.c repo_solv.c evr.c pool.c queue.c repo.c repodata.c util.c policy.c) +solver.c repo_solv.c repo_helix.c evr.c pool.c queue.c repo.c repodata.c util.c policy.c) ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) -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 repo.h repodata.h repo_solv.h util.h strpool.h dirpool.h) +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 repo.h repodata.h repo_solv.h repo_helix.h util.h strpool.h dirpool.h) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) Copied: trunk/sat-solver/src/repo_helix.h (from r8610, trunk/sat-solver/tools/repo_helix.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_helix.h?p2=trunk/sat-solver/src/repo_helix.h&p1=trunk/sat-solver/tools/repo_helix.h&r1=8610&r2=8616&rev=8616&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_helix.h (original) +++ trunk/sat-solver/src/repo_helix.h Tue Feb 12 10:42:06 2008 @@ -10,8 +10,12 @@ * */ -#ifndef REPO_HELIX_H -#define REPO_HELIX_H +#ifndef SATSOLVER_REPO_HELIX_H +#define SATSOLVER_REPO_HELIX_H + +#ifdef __cplusplus +extern "C" { +#endif #include #include "pool.h" @@ -19,4 +23,9 @@ extern void repo_add_helix(Repo *repo, FILE *fp); -#endif /* REPO_HELIX_H */ +#ifdef __cplusplus +} +#endif + + +#endif /* SATSOLVER_REPO_HELIX_H */ Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=8616&r1=8615&r2=8616&view=diff ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Tue Feb 12 10:42:06 2008 @@ -619,15 +619,26 @@ strcpy( solvname + l, ".solv" ); if (verbose) fprintf( stdout, "%s:%s -> %s", name, file, solvname ); + + Repo *s = repo_create(pd->pool, name); FILE *fp = fopen( solvname, "r" ); if (!fp) { - perror( solvname ); - return NULL; + /* try to use the original helix xml file instead*/ + FILE *fpHelix = fopen( file, "r" ); + if (!fpHelix) + { + perror( file ); + return NULL; + } + repo_add_helix(s, fpHelix); + fclose( fpHelix ); } - Repo *s = repo_create(pd->pool, name); - repo_add_solv(s, fp); - fclose( fp ); + else + { + repo_add_solv(s, fp); + fclose( fp ); + } return s; } Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?rev=8616&r1=8615&r2=8616&view=diff ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Tue Feb 12 10:42:06 2008 @@ -14,7 +14,7 @@ ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} ) TARGET_LINK_LIBRARIES( rpmmd2solv satsolver ${EXPAT_LIBRARY}) -SET(helix2solv_REPOS helix2solv.c repo_helix.h repo_helix.c 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org