Shadow api

.gitignore

@@ -1,4 +1,5 @@
 build
+Makefile
 *.orig
 *.rej
 *.swp

CMakeLists.txt

@@ -33,7 +33,7 @@ OPTION (DISABLE_MEDIABACKEND_TESTS "Disable Tests depending on Nginx and libfcgi
 
 OPTION (DISABLE_LIBPROXY "Build without libproxy support even if package is installed?" OFF)
 OPTION (DISABLE_AUTODOCS "Do not require doxygen being installed (required to build autodocs)?" OFF)
-OPTION (EXPORT_NG_API "Export experimental libzypp API" OFF)
+OPTION (BUILD_GLIB_API   "Build experimental glib libzypp API" OFF)
 # This option will reroute all tool binaries to the libzypp build dir instead of taking those installed in the default directories.
 OPTION (ENABLE_DEVEL_BUILD "Developer build, use zypp tools directly from build dir rather than the default locations" OFF)
 OPTION (INSTALL_NG_BINARIES "Installs the NG binaries, disabled for now since we are not actively using them." OFF)
@@ -135,7 +135,10 @@ if ( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
   if( ENABLE_UBSAN_CHECKS )
     target_compile_options( zypp_general_compiler_flags INTERFACE "$<$<CONFIG:DEBUG>:-fsanitize=undefined>" )
+    target_compile_options( zypp_general_compiler_flags INTERFACE "$<$<CONFIG:DEBUG>:-fsanitize=address>" )
     target_link_options( zypp_general_compiler_flags    INTERFACE "$<$<CONFIG:DEBUG>:-fsanitize=undefined>" )
+    target_link_options( zypp_general_compiler_flags    INTERFACE "$<$<CONFIG:DEBUG>:-fsanitize=address>" )
+    target_link_options( zypp_general_compiler_flags    INTERFACE "$<$<CONFIG:DEBUG>:-lubsan>" )
   endif()
 endif()
 
@@ -401,7 +404,7 @@ MACRO(ADD_TESTS)
 
     TARGET_LINK_LIBRARIES( ${loop_var}_test PUBLIC zypp_exe_compiler_flags  )
     TARGET_LINK_LIBRARIES( ${loop_var}_test PUBLIC ${TEST_REQ_LIBS}  )
-    TARGET_LINK_LIBRARIES( ${loop_var}_test PUBLIC zypp-allsym  )
+    TARGET_LINK_LIBRARIES( ${loop_var}_test PUBLIC zypp-allsym )
     ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test --catch_system_errors=no)
   ENDFOREACH( loop_var )
 ENDMACRO(ADD_TESTS)
@@ -427,16 +430,20 @@ ADD_SUBDIRECTORY( tools )
 ADD_SUBDIRECTORY( shared )
 ADD_SUBDIRECTORY( doc )
 
+IF( BUILD_GLIB_API )
+  ADD_SUBDIRECTORY( zypp-glib )
+ENDIF ( BUILD_GLIB_API )
+
 IF ( ENABLE_BUILD_TRANS )
   ADD_SUBDIRECTORY( po )
 ELSE ( ENABLE_BUILD_TRANS )
   ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
 ENDIF ( ENABLE_BUILD_TRANS )
 
-IF ( ENABLE_BUILD_TESTS )
-  ADD_SUBDIRECTORY( tests )
-ELSE ( ENABLE_BUILD_TESTS )
+#IF ( ENABLE_BUILD_TESTS )
+#  ADD_SUBDIRECTORY( tests )
+#ELSE ( ENABLE_BUILD_TESTS )
   ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL )
-ENDIF ( ENABLE_BUILD_TESTS )
+#ENDIF ( ENABLE_BUILD_TESTS )
 INCLUDE(CTest)
 ENABLE_TESTING()

VERSION.cmake

@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "35")
 SET(LIBZYPP_MINOR "35")
-SET(LIBZYPP_PATCH "13")
+SET(LIBZYPP_PATCH "14")
 #
-# LAST RELEASED: 17.35.13 (35)
+# LAST RELEASED: 17.35.14 (35)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

cmake/modules/GLibTools.cmake

@@ -0,0 +1,97 @@
+# Taken from https://github.com/GNOME/evolution
+#
+# GLibTools.cmake
+#
+# Provides functions to run glib tools.
+#
+# Functions:
+#
+# glib_mkenums(_output_filename_noext _header_templ _src_tmpl _enums_header ...)
+#    runs glib-mkenums to generate enumtypes .h and .c files from multiple
+#    _enums_header using _header_templ and _src_tmpl template files. It searches for files in the current source directory and
+#    exports to the current binary directory.
+#
+#    An example call is:
+#        glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
+#        which uses camel-enums.h as the source of known enums and generates
+#        camel-enumtypes.h which will use the CAMEL_ENUMTYPES_H define
+#        and also generates camel-enumtypes.c with the needed code.
+#
+# glib_genmarshal(_output_filename_noext _prefix _marshallist_filename)
+#    runs glib-genmarshal to process ${_marshallist_filename} to ${_output_filename_noext}.c
+#    and ${_output_filename_noext}.h files in the current binary directory, using
+#    the ${_prefix} as the function prefix.
+#
+# glib_compile_resources _sourcedir _outputprefix _cname _inxml ...deps)
+#    Calls glib-compile-resources as defined in _inxml and using _outputprefix and_cname as other arguments
+#    beside _sourcedir. The optional arguments are other dependencies.
+
+find_program(GLIB_MKENUMS glib-mkenums)
+if(NOT GLIB_MKENUMS)
+        message(FATAL_ERROR "Cannot find glib-mkenums, which is required to build ${PROJECT_NAME}")
+endif(NOT GLIB_MKENUMS)
+
+function( glib_mkenums _output_filename_noext _header_templ _src_tmpl _enums_header0 )
+
+        foreach(_enums_header ${_enums_header0} ${ARGN})
+                list(APPEND _enums_headers "${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}")
+        endforeach(_enums_header)
+
+        message("Generating file ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h")
+
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
+                COMMAND ${GLIB_MKENUMS} --template "${CMAKE_CURRENT_SOURCE_DIR}/${_header_templ}" ${_enums_headers} >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
+                DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_header_templ}" ${_enums_headers}
+        )
+
+        message("Generating file ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c")
+
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
+                COMMAND ${GLIB_MKENUMS} --template "${CMAKE_CURRENT_SOURCE_DIR}/${_src_tmpl}" ${_enums_headers} >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
+                DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_src_tmpl}" ${_enums_headers}
+        )
+endfunction( glib_mkenums )
+
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+if(NOT GLIB_GENMARSHAL)
+        message(FATAL_ERROR "Cannot find glib-genmarshal, which is required to build ${PROJECT_NAME}")
+endif(NOT GLIB_GENMARSHAL)
+
+function(glib_genmarshal _output_filename_noext _prefix _marshallist_filename)
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
+                COMMAND ${GLIB_GENMARSHAL} --header --skip-source --prefix=${_prefix} "${CMAKE_CURRENT_SOURCE_DIR}/${_marshallist_filename}" >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h.tmp
+                COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h.tmp ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
+                DEPENDS ${_marshallist_filename}
+        )
+
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
+                COMMAND ${CMAKE_COMMAND} -E echo " #include \\\"${_output_filename_noext}.h\\\"" >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c.tmp
+                COMMAND ${GLIB_GENMARSHAL} --body --skip-source --prefix=${_prefix} "${CMAKE_CURRENT_SOURCE_DIR}/${_marshallist_filename}" >>${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c.tmp
+                COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c.tmp ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
+                DEPENDS ${_marshallist_filename}
+        )
+endfunction(glib_genmarshal)
+
+find_program(GLIB_COMPILE_RESOURCES glib-compile-resources)
+if(NOT GLIB_COMPILE_RESOURCES)
+        message(FATAL_ERROR "Cannot find glib-compile-resources, which is required to build ${PROJECT_NAME}")
+endif(NOT GLIB_COMPILE_RESOURCES)
+
+macro(glib_compile_resources _sourcedir _outputprefix _cname _inxml)
+        add_custom_command(
+                OUTPUT ${_outputprefix}.h
+                COMMAND ${GLIB_COMPILE_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/${_inxml} --target=${_outputprefix}.h --sourcedir=${_sourcedir} --c-name ${_cname} --generate-header
+                DEPENDS ${_inxml} ${ARGN}
+                VERBATIM
+        )
+        add_custom_command(
+                OUTPUT ${_outputprefix}.c
+                COMMAND ${GLIB_COMPILE_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/${_inxml} --target=${_outputprefix}.c --sourcedir=${_sourcedir} --c-name ${_cname} --generate-source
+                DEPENDS ${_inxml} ${ARGN}
+                VERBATIM
+        )
+endmacro(glib_compile_resources)