Author: mlandres Date: Tue Sep 9 17:53:43 2008 New Revision: 10981 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10981&view=rev Log: - Reenable -Werror and fix bindings. Modified: trunk/sat-solver/CMakeLists.txt trunk/sat-solver/VERSION.cmake trunk/sat-solver/applayer/CMakeLists.txt trunk/sat-solver/bindings/CMakeLists.txt trunk/sat-solver/bindings/solvable.i trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/testsuite/CMakeLists.txt trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Tue Sep 9 17:53:43 2008 @@ -8,8 +8,8 @@ if(COMMAND cmake_policy) # escape preprocessor, see -DVERSION below cmake_policy(SET CMP0005 OLD) -endif(COMMAND cmake_policy) - +endif(COMMAND cmake_policy) + # Library IF ( DEFINED LIB ) @@ -113,6 +113,7 @@ PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin ) +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" ) set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g3 -O0" ) Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Tue Sep 9 17:53:43 2008 @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "10") -SET(LIBSATSOLVER_PATCH "7") +SET(LIBSATSOLVER_PATCH "8") -# last released 0.10.7 +# last released 0.10.8 Modified: trunk/sat-solver/applayer/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/CMakeLists.txt?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/applayer/CMakeLists.txt (original) +++ trunk/sat-solver/applayer/CMakeLists.txt Tue Sep 9 17:53:43 2008 @@ -2,8 +2,6 @@ # CMakeLists.txt for sat-solver/applayer # -set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) - ADD_SUBDIRECTORY(tests) SET(libappsatsolver_SRCS job.c applayer.c covenant.c decision.c dependency.c Modified: trunk/sat-solver/bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.txt?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Tue Sep 9 17:53:43 2008 @@ -8,8 +8,6 @@ MESSAGE(STATUS "Found SWIG version ${SWIG_VERSION}") -REMOVE_DEFINITIONS(-Werror) - # # Generic setting for all generated bindings # Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Tue Sep 9 17:53:43 2008 @@ -16,7 +16,7 @@ /* * !! keep the order of case statements according to knownid.h !! */ - + switch( key->type ) { case REPOKEY_TYPE_VOID: @@ -101,7 +101,7 @@ /* * !! keep the order of case statements according to knownid.h !! */ - + switch( key->type ) { case REPOKEY_TYPE_VOID: @@ -201,12 +201,12 @@ %constant int KIND_SOURCE = KIND_SOURCE; %constant int KIND_PATTERN = KIND_PATTERN; %constant int KIND_NOSOURCE = KIND_PATTERN; - + XSolvable( Repo *repo, const char *name, const char *evr, const char *arch = NULL ) { return xsolvable_create( repo, name, evr, arch ); } ~XSolvable() { return xsolvable_free( $self ); } - + Repo *repo() { return xsolvable_solvable($self)->repo; } @@ -278,7 +278,7 @@ } return i; } - + /* * Dependencies */ @@ -298,7 +298,7 @@ { return dependency_new( $self, DEP_SUP ); } Dependency *enhances() { return dependency_new( $self, DEP_ENH ); } - + #if defined(SWIGRUBY) %rename( "provides?" ) does_provide( const char *name ); %rename( "provides_any?" ) does_provide_any( Array ); @@ -328,7 +328,7 @@ /* * access attribute via [] */ - + /* %rename is rejected by swig for [] */ %alias attr "[]"; VALUE attr( VALUE attrname ) @@ -346,7 +346,7 @@ if (SYMBOL_P(attrname)) { char *colon; - name = rb_id2name( SYM2ID( attrname ) ); + name = (char *)rb_id2name( SYM2ID( attrname ) ); colon = name; while ((colon = strchr( colon, '_'))) { *colon++ = ':'; @@ -372,10 +372,10 @@ #endif #if defined(SWIGPYTHON) Py_INCREF(result); -#endif +#endif return result; } - + /* * iterate over all attributes */ @@ -393,7 +393,7 @@ /* * check existance of attribute */ - + #if defined(SWIGRUBY) %rename( "attr?" ) attr_exists( VALUE attrname ); VALUE attr_exists( VALUE attrname ) @@ -411,7 +411,7 @@ if (SYMBOL_P(attrname)) { char *colon; - name = rb_id2name( SYM2ID( attrname ) ); + name = (char *)rb_id2name( SYM2ID( attrname ) ); colon = name; while ((colon = strchr( colon, '_'))) { *colon++ = ':'; @@ -432,7 +432,7 @@ } #if defined(SWIGPYTHON) Py_INCREF(result); -#endif +#endif return result; } } Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Tue Sep 9 17:53:43 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 9 17:52:30 CEST 2008 - ma@suse.de + +- Reenable -Werror and fix bindings. +- 0.10.8 + +------------------------------------------------------------------- Tue Sep 9 11:50:39 CEST 2008 - dmacvicar@suse.de - disable -Werror for swig generated stuff Modified: trunk/sat-solver/testsuite/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/CMakeLists.txt?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/testsuite/CMakeLists.txt (original) +++ trunk/sat-solver/testsuite/CMakeLists.txt Tue Sep 9 17:53:43 2008 @@ -1,6 +1,4 @@ -set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) - SET(yps_SOURCES yps.c) ADD_EXECUTABLE(yps ${yps_SOURCES}) TARGET_LINK_LIBRARIES(yps satsolver) Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?rev=10981&r1=10980&r2=10981&view=diff ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Tue Sep 9 17:53:43 2008 @@ -6,8 +6,6 @@ ADD_SUBDIRECTORY(tests) -set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) - SET(rpmdb2solv_REPOS rpmdb2solv.c repo_rpmdb.h @@ -63,12 +61,12 @@ TARGET_LINK_LIBRARIES( mergesolv satsolver) install(TARGETS - mergesolv - dumpsolv - patchxml2solv + mergesolv + dumpsolv + patchxml2solv susetags2solv - helix2solv - rpmmd2solv + helix2solv + rpmmd2solv rpmdb2solv rpms2solv updateinfoxml2solv -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org