Mailinglist Archive: zypp-commit (545 mails)

[kkaempf@xxxxxxxxxxxxxxxx]

Author: kkaempf
Date: Wed Feb 13 12:36:22 2008
New Revision: 8650

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8650&view=rev
Log:
update to version 0.0.14

now that stuff is building

Modified:
    trunk/sat-solver/VERSION.cmake
    trunk/sat-solver/applayer/action.c
    trunk/sat-solver/applayer/action.h
    trunk/sat-solver/applayer/applayer.c
    trunk/sat-solver/applayer/applayer.h
    trunk/sat-solver/applayer/covenant.c
    trunk/sat-solver/applayer/covenant.h
    trunk/sat-solver/applayer/decision.c
    trunk/sat-solver/applayer/decision.h
    trunk/sat-solver/applayer/dependency.c
    trunk/sat-solver/applayer/dependency.h
    trunk/sat-solver/applayer/problem.h
    trunk/sat-solver/applayer/relation.c
    trunk/sat-solver/applayer/relation.h
    trunk/sat-solver/applayer/solution.c
    trunk/sat-solver/applayer/solution.h
    trunk/sat-solver/applayer/tests/CMakeLists.txt
    trunk/sat-solver/applayer/transaction.c
    trunk/sat-solver/applayer/xsolvable.h
    trunk/sat-solver/bindings/perl/CMakeLists.txt
    trunk/sat-solver/bindings/python/CMakeLists.txt
    trunk/sat-solver/bindings/ruby/CMakeLists.txt
    trunk/sat-solver/bindings/satsolver.i
    trunk/sat-solver/package/libsatsolver.spec.in

Modified: trunk/sat-solver/VERSION.cmake
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/VERSION.cmake (original)
+++ trunk/sat-solver/VERSION.cmake Wed Feb 13 12:36:22 2008
@@ -46,5 +46,5 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "0")
-SET(LIBSATSOLVER_PATCH "13")
+SET(LIBSATSOLVER_PATCH "14")
 

Modified: trunk/sat-solver/applayer/action.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/action.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/action.c (original)
+++ trunk/sat-solver/applayer/action.c Wed Feb 13 12:36:22 2008
@@ -13,6 +13,7 @@
  */
 
 #include <stdlib.h>
+
 #include "action.h"
 #include "applayer.h"
 

Modified: trunk/sat-solver/applayer/action.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/action.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/action.h (original)
+++ trunk/sat-solver/applayer/action.h Wed Feb 13 12:36:22 2008
@@ -16,8 +16,8 @@
 #ifndef SATSOLVER_ACTION_H
 #define SATSOLVER_ACTION_H
 
-#include "pool.h"
-#include "solver.h"
+#include <pool.h>
+#include <solver.h>
 
 #include "xsolvable.h"
 #include "relation.h"

Modified: trunk/sat-solver/applayer/applayer.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/applayer.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/applayer.c (original)
+++ trunk/sat-solver/applayer/applayer.c Wed Feb 13 12:36:22 2008
@@ -23,3 +23,29 @@
     return "";
   return id2str( pool, id );
 }
+
+unsigned int
+pool_size( Pool *pool )
+{
+  /* decrease by one since Id 0 is reserved
+   * decrease by one since Id 1 is the system solvable and not
+   *   accessible to the outside
+   */
+  return pool->nsolvables - 1 - 1;
+}
+
+void
+pool_xsolvables_iterate( Pool *pool, int (*callback)(const XSolvable *xs))
+{
+  Solvable *s;
+  Id p;
+  /* skip Id 0 and Id 1, see pool_size() above */
+  for (p = 2, s = pool->solvables + p; p < pool->nsolvables; p++, s++)
+    {
+      if (!s->name)
+        continue;
+      if (callback( xsolvable_new( pool, p ) ) )
+       break;
+    }
+}
+

Modified: trunk/sat-solver/applayer/applayer.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/applayer.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/applayer.h (original)
+++ trunk/sat-solver/applayer/applayer.h Wed Feb 13 12:36:22 2008
@@ -16,7 +16,9 @@
 #ifndef SATSOLVER_APPLAYER_H
 #define SATSOLVER_APPLAYER_H
 
-#include "pool.h"
+#include <pool.h>
+
+#include "xsolvable.h"
 
 /************************************************
  * Id
@@ -25,5 +27,12 @@
 
 const char *my_id2str( Pool *pool, Id id );
 
+/************************************************
+ * Pool
+ *
+ */
+
+unsigned int pool_size( Pool *pool );
+void pool_xsolvables_iterate( Pool *pool, int (*callback)(const XSolvable 
*xs));
 
 #endif  /* SATSOLVER_APPLAYER_H */

Modified: trunk/sat-solver/applayer/covenant.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/covenant.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/covenant.c (original)
+++ trunk/sat-solver/applayer/covenant.c Wed Feb 13 12:36:22 2008
@@ -14,6 +14,7 @@
  */
 
 #include <stdlib.h>
+
 #include "covenant.h"
 #include "applayer.h"
 

Modified: trunk/sat-solver/applayer/covenant.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/covenant.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/covenant.h (original)
+++ trunk/sat-solver/applayer/covenant.h Wed Feb 13 12:36:22 2008
@@ -16,7 +16,8 @@
  *
  */
 
-#include "solver.h"
+#include <solver.h>
+
 #include "xsolvable.h"
 #include "relation.h"
 

Modified: trunk/sat-solver/applayer/decision.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/decision.c (original)
+++ trunk/sat-solver/applayer/decision.c Wed Feb 13 12:36:22 2008
@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+
 #include "decision.h"
 
 Decision *

Modified: trunk/sat-solver/applayer/decision.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/decision.h (original)
+++ trunk/sat-solver/applayer/decision.h Wed Feb 13 12:36:22 2008
@@ -17,8 +17,8 @@
  *
  */
 
-#include "pool.h"
-#include "solver.h"
+#include <pool.h>
+#include <solver.h>
 
 enum decisions {
   DECISION_INSTALL = 1,

Modified: trunk/sat-solver/applayer/dependency.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/dependency.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/dependency.c (original)
+++ trunk/sat-solver/applayer/dependency.c Wed Feb 13 12:36:22 2008
@@ -12,6 +12,7 @@
  */
 
 #include <stdlib.h>
+
 #include "dependency.h"
 
 

Modified: trunk/sat-solver/applayer/dependency.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/dependency.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/dependency.h (original)
+++ trunk/sat-solver/applayer/dependency.h Wed Feb 13 12:36:22 2008
@@ -35,6 +35,7 @@
 } Dependency;
 
 Dependency *dependency_new( XSolvable *xsolvable, int dep );
+void dependency_free( Dependency *dep );
 
 /* get pointer to offset for dependency */
 Offset *dependency_relations( const Dependency *dep );

Modified: trunk/sat-solver/applayer/problem.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/problem.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/problem.h (original)
+++ trunk/sat-solver/applayer/problem.h Wed Feb 13 12:36:22 2008
@@ -18,7 +18,8 @@
  *
  */
 
-#include "solver.h"
+#include <solver.h>
+
 #include "transaction.h"
 #include "solution.h"
 

Modified: trunk/sat-solver/applayer/relation.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/relation.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/relation.c (original)
+++ trunk/sat-solver/applayer/relation.c Wed Feb 13 12:36:22 2008
@@ -11,6 +11,7 @@
  */
 
 #include <stdlib.h>
+
 #include "relation.h"
 
 

Modified: trunk/sat-solver/applayer/relation.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/relation.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/relation.h (original)
+++ trunk/sat-solver/applayer/relation.h Wed Feb 13 12:36:22 2008
@@ -8,7 +8,7 @@
 #ifndef SATSOLVER_RELATION_H
 #define SATSOLVER_RELATION_H
 
-#include "pool.h"
+#include <pool.h>
 
 /************************************************
  * Relation
@@ -24,6 +24,7 @@
 
 Relation *relation_new( Pool *pool, Id id );
 Relation *relation_create( Pool *pool, const char *name, int op, const char 
*evr );
+void relation_free( Relation *r );
 Id relation_evrid( const Relation *r );
 
 #endif  /* SATSOLVER_RELATION_H */

Modified: trunk/sat-solver/applayer/solution.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/solution.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/solution.c (original)
+++ trunk/sat-solver/applayer/solution.c Wed Feb 13 12:36:22 2008
@@ -16,6 +16,7 @@
  */
 
 #include <stdlib.h>
+
 #include "solution.h"
 
 

Modified: trunk/sat-solver/applayer/solution.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/solution.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/solution.h (original)
+++ trunk/sat-solver/applayer/solution.h Wed Feb 13 12:36:22 2008
@@ -18,7 +18,7 @@
  *
  */
 
-#include "pool.h"
+#include <pool.h>
 
 enum solutions {
   SOLUTION_UNKNOWN = 0,

Modified: trunk/sat-solver/applayer/tests/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/tests/CMakeLists.txt?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/tests/CMakeLists.txt (original)
+++ trunk/sat-solver/applayer/tests/CMakeLists.txt Wed Feb 13 12:36:22 2008
@@ -7,4 +7,4 @@
 SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror" )
 
 ADD_EXECUTABLE( applayer applayer.c )
-TARGET_LINK_LIBRARIES( applayer satsolver appsatsolver )
+TARGET_LINK_LIBRARIES( applayer appsatsolver satsolver )

Modified: trunk/sat-solver/applayer/transaction.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/transaction.c?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/transaction.c (original)
+++ trunk/sat-solver/applayer/transaction.c Wed Feb 13 12:36:22 2008
@@ -13,6 +13,7 @@
  */
 
 #include <stdlib.h>
+
 #include "transaction.h"
 
 

Modified: trunk/sat-solver/applayer/xsolvable.h
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/xsolvable.h?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/applayer/xsolvable.h (original)
+++ trunk/sat-solver/applayer/xsolvable.h Wed Feb 13 12:36:22 2008
@@ -8,10 +8,10 @@
 #ifndef SATSOLVER_XSOLVABLE_H
 #define SATSOLVER_XSOLVABLE_H
 
-#include "pool.h"
-#include "repo.h"
-#include "solvable.h"
-#include "solver.h"
+#include <pool.h>
+#include <repo.h>
+#include <solvable.h>
+#include <solver.h>
 
 /************************************************
  * XSolvable - eXternally visible Solvable

Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/perl/CMakeLists.txt?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/bindings/perl/CMakeLists.txt (original)
+++ trunk/sat-solver/bindings/perl/CMakeLists.txt Wed Feb 13 12:36:22 2008
@@ -39,6 +39,8 @@
    DEPENDS ${SWIG_OUTPUT}
 )
 
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
+
 SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" 
"${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" )
 ADD_LIBRARY( satsolverx SHARED ${satsolverx_SRCS} )
 SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" )

Modified: trunk/sat-solver/bindings/python/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMakeLists.txt?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/bindings/python/CMakeLists.txt (original)
+++ trunk/sat-solver/bindings/python/CMakeLists.txt Wed Feb 13 12:36:22 2008
@@ -31,6 +31,9 @@
    DEPENDS ${SWIG_OUTPUT}
 )
 
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
+
+
 SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" 
"${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" )
 ADD_LIBRARY( _satsolverx SHARED ${satsolverx_SRCS} )
 SET_TARGET_PROPERTIES( _satsolverx PROPERTIES PREFIX "" )

Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLists.txt?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original)
+++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Wed Feb 13 12:36:22 2008
@@ -22,6 +22,8 @@
    DEPENDS ${SWIG_OUTPUT}
 )
 
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
+
 SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" 
"${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" )
 ADD_LIBRARY( satsolverx SHARED ${satsolverx_SRCS} )
 SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" )

Modified: trunk/sat-solver/bindings/satsolver.i
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/bindings/satsolver.i (original)
+++ trunk/sat-solver/bindings/satsolver.i Wed Feb 13 12:36:22 2008
@@ -89,7 +89,7 @@
 }
 
 static int
-solver_xsolvables_iterate_callback( const XSolvable *xs )
+generic_xsolvables_iterate_callback( const XSolvable *xs )
 {
 #if defined(SWIGRUBY)
   /* FIXME: how to pass 'break' back to the caller ? */
@@ -321,10 +321,12 @@
 
   Relation *create_relation( const char *name, int op = REL_NONE, const char 
*evr = NULL )
   {
-    if (!evr)
-      SWIG_exception( SWIG_NullReferenceError, "REL_NONE operator with NULL 
evr" );
+    if ((op =! REL_NONE) && !evr)
+      SWIG_exception( SWIG_NullReferenceError, "Relation operator with NULL 
evr" );
     return relation_create( $self, name, op, evr );
+#if defined(SWIGPYTHON) || defined(SWIGPERL)
     fail:
+#endif
     return NULL;
   }
 
@@ -335,12 +337,7 @@
   /* number of solvables in pool
    */
   int size()
-  { /* decrease by one since Id 0 is reserved
-     * decrease by one since Id 1 is the system solvable and not
-     * accessible to the outside
-     */
-    return $self->nsolvables - 1 - 1;
-  }
+  { return pool_size( $self ); }
 
 #if defined(SWIGRUBY)
   %rename( "installable?" ) installable( XSolvable *s );
@@ -363,17 +360,7 @@
 
 #if defined(SWIGRUBY)
   void each()
-  {
-    Solvable *s;
-    Id p;
-    /* skip Id 0 and Id 1, see size() above */
-    for (p = 2, s = $self->solvables + p; p < $self->nsolvables; p++, s++)
-    {
-      if (!s->name)
-        continue;
-      rb_yield(SWIG_NewPointerObj((void*) xsolvable_new( $self, p ), 
SWIGTYPE_p__Solvable, 0));
-    }
-  }
+  { pool_xsolvables_iterate( $self, generic_xsolvables_iterate_callback ); }
 #endif
 
   XSolvable *
@@ -1202,13 +1189,13 @@
   { return solver_problems_iterate( $self, t, solver_problems_iterate_callback 
); }
 
   void each_to_install()
-  { return solver_installs_iterate( $self, solver_xsolvables_iterate_callback 
); }
+  { return solver_installs_iterate( $self, generic_xsolvables_iterate_callback 
); }
 
   void each_to_remove()
-  { return solver_removals_iterate( $self, solver_xsolvables_iterate_callback 
); }
+  { return solver_removals_iterate( $self, generic_xsolvables_iterate_callback 
); }
 
   void each_suggested()
-  { return solver_suggestions_iterate( $self, 
solver_xsolvables_iterate_callback); }
+  { return solver_suggestions_iterate( $self, 
generic_xsolvables_iterate_callback); }
 
 #if defined(SWIGPERL)
     SV* getInstallList()

Modified: trunk/sat-solver/package/libsatsolver.spec.in
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=8650&r1=8649&r2=8650&view=diff
==============================================================================
--- trunk/sat-solver/package/libsatsolver.spec.in (original)
+++ trunk/sat-solver/package/libsatsolver.spec.in Wed Feb 13 12:36:22 2008
@@ -78,6 +78,7 @@
 %files devel
 %defattr(-,root,root)
 %_libdir/libsatsolver.a
+%_libdir/libappsatsolver.a
 %doc doc/README*
 %doc doc/THEORY
 %doc doc/PLANNING

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx