Author: jkupec
Date: Mon Jun 11 15:16:25 2007
New Revision: 5711
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5711&view=rev
Log:
autotools -> cmake
Added:
trunk/zypper/CMakeLists.txt
trunk/zypper/VERSION.cmake
- copied, changed from r5689, trunk/zypper/VERSION
trunk/zypper/cmake/
trunk/zypper/cmake/modules/
trunk/zypper/cmake/modules/FindGettext.cmake
trunk/zypper/cmake/modules/FindReadline.cmake
trunk/zypper/doc/CMakeLists.txt
trunk/zypper/po/CMakeLists.txt
trunk/zypper/po/createPot (with props)
trunk/zypper/src/CMakeLists.txt
trunk/zypper/src/zypper-keyring-callbacks.h
- copied, changed from r5689, trunk/zypper/src/zmart-keyring-callbacks.h
trunk/zypper/src/zypper-media-callbacks.h
- copied unchanged from r5689, trunk/zypper/src/zmart-media-callbacks.h
trunk/zypper/src/zypper-misc.cc
- copied, changed from r5698, trunk/zypper/src/zmart-misc.cc
trunk/zypper/src/zypper-misc.h
- copied unchanged from r5698, trunk/zypper/src/zmart-misc.h
trunk/zypper/src/zypper-rpm-callbacks.h
- copied unchanged from r5689, trunk/zypper/src/zmart-rpm-callbacks.h
trunk/zypper/src/zypper-source-callbacks.h
- copied unchanged from r5689, trunk/zypper/src/zmart-source-callbacks.h
trunk/zypper/src/zypper-sources.cc
- copied, changed from r5698, trunk/zypper/src/zmart-sources.cc
trunk/zypper/src/zypper-sources.h
- copied unchanged from r5698, trunk/zypper/src/zmart-sources.h
trunk/zypper/src/zypper-updates.cc
- copied, changed from r5689, trunk/zypper/src/zmart-updates.cc
trunk/zypper/src/zypper-updates.h
- copied unchanged from r5689, trunk/zypper/src/zmart-updates.h
trunk/zypper/src/zypper-utils.cc
- copied, changed from r5689, trunk/zypper/src/zmart-utils.cc
trunk/zypper/src/zypper-utils.h
- copied unchanged from r5689, trunk/zypper/src/zmart-utils.h
trunk/zypper/src/zypper.h
- copied unchanged from r5698, trunk/zypper/src/zmart.h
trunk/zypper/zypper.spec.cmake
- copied, changed from r5689, trunk/zypper/zypper.spec.in
Removed:
trunk/zypper/Makefile.am
trunk/zypper/Makefile.cvs
trunk/zypper/VERSION
trunk/zypper/configure.ac
trunk/zypper/doc/Makefile.am
trunk/zypper/po/LINGUAS
trunk/zypper/po/Makevars
trunk/zypper/po/POTFILES.in
trunk/zypper/src/Makefile.am
trunk/zypper/src/zmart-keyring-callbacks.h
trunk/zypper/src/zmart-media-callbacks.h
trunk/zypper/src/zmart-misc.cc
trunk/zypper/src/zmart-misc.h
trunk/zypper/src/zmart-rpm-callbacks.h
trunk/zypper/src/zmart-source-callbacks.h
trunk/zypper/src/zmart-sources.cc
trunk/zypper/src/zmart-sources.h
trunk/zypper/src/zmart-updates.cc
trunk/zypper/src/zmart-updates.h
trunk/zypper/src/zmart-utils.cc
trunk/zypper/src/zmart-utils.h
trunk/zypper/src/zmart.cc
trunk/zypper/src/zmart.h
trunk/zypper/zypper.spec.in
Modified:
trunk/zypper/src/zypp-checkpatches.cc
trunk/zypper/src/zypper-callbacks.cc
trunk/zypper/src/zypper-getopt.cc
trunk/zypper/src/zypper-info.cc
trunk/zypper/src/zypper-search.cc
trunk/zypper/src/zypper-search.h
trunk/zypper/src/zypper.cc
Added: trunk/zypper/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/CMakeLists.txt?rev=5711&view=auto
==============================================================================
--- trunk/zypper/CMakeLists.txt (added)
+++ trunk/zypper/CMakeLists.txt Mon Jun 11 15:16:25 2007
@@ -0,0 +1,131 @@
+PROJECT( zypper C CXX )
+
+# VERSION
+
+INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
+SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
+ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" )
+
+# usr INSTALL_PREFIX
+
+IF( DEFINED CMAKE_INSTALL_PREFIX )
+ SET( INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} )
+ELSE( DEFINED CMAKE_INSTALL_PREFIX )
+ SET( INSTALL_PREFIX /usr )
+ENDIF( DEFINED CMAKE_INSTALL_PREFIX )
+
+# system configuration dir (etc)
+
+IF( NOT DEFINED SYSCONFDIR )
+ SET( SYSCONFDIR /etc )
+ENDIF( NOT DEFINED SYSCONFDIR )
+
+# system configuration dir (etc)
+
+IF( NOT DEFINED MANDIR )
+ SET( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man )
+ENDIF( NOT DEFINED MANDIR )
+
+
+# PACKAGE
+
+SET( PACKAGE "zypper" )
+
+# CPack
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line package management tool.")
+SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+SET(CPACK_GENERATOR "TBZ2")
+SET(CPACK_SOURCE_GENERATOR "TBZ2")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}")
+
+# The following components are regex's to match anywhere (unless anchored)
+# in absolute path + filename to find files or directories to be excluded
+# from source tarball.
+SET (CPACK_SOURCE_IGNORE_FILES
+#\\\\.swp$;\\\\.o$;~$
+/\\\\.svn/;\\\\.swp$;/_build/;~$;\\\\.bak$
+# eclipse files
+\\\\.settings/;\\\\.cdtproject;\\\\.project
+)
+
+INCLUDE(CPack)
+
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+SET( CMAKE_MODULE_PATH
+ # locally installed (development) version of libzypp
+ ${ZYPP_PREFIX}/share/cmake/Modules
+ # cmake modules not found in upstream
+ ${CMAKE_SOURCE_DIR}/cmake/modules
+)
+
+
+FIND_PACKAGE( Zypp REQUIRED )
+IF( ZYPP_FOUND )
+ INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})
+ELSE( ZYPP_FOUND )
+ MESSAGE( FATAL_ERROR "libzypp not found" )
+ENDIF( ZYPP_FOUND )
+
+FIND_PACKAGE( Gettext REQUIRED )
+IF( GETTEXT_FOUND )
+ INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
+ELSE( GETTEXT_FOUND )
+ MESSAGE( FATAL_ERROR "gettext not found" )
+ENDIF( GETTEXT_FOUND )
+
+FIND_PACKAGE( Readline REQUIRED )
+IF( READLINE_FOUND )
+ INCLUDE_DIRECTORIES(${READLINE_INCLUDE_DIR})
+ELSE( READLINE_FOUND )
+ MESSAGE( FATAL_ERROR "readline not found" )
+ENDIF( READLINE_FOUND )
+
+
+# RPM spec file
+
+MESSAGE(STATUS "Writing RPM spec file...")
+CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/zypper.spec.cmake
+ ${CMAKE_BINARY_DIR}/package/zypper.spec
+ @ONLY)
+
+MESSAGE(STATUS "version: ${VERSION}")
+
+ADD_SUBDIRECTORY( src )
+ADD_SUBDIRECTORY( po )
+ADD_SUBDIRECTORY( doc )
+
+
+# svn check
+
+ADD_CUSTOM_TARGET( svncheck
+ COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
+)
+
+# generate source tarball, rpm spec file and copy them together with .changes
+# file over to ${CMAKE_BINARY_DIR}/package dir
+
+SET( PACKAGE_COMMAND
+ COMMAND ${CMAKE_MAKE_PROGRAM} package_source
+ COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package
+ COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes"
+)
+
+# make source tarball without svn check
+
+ADD_CUSTOM_TARGET( srcpackage_local
+ ${PACKAGE_COMMAND}
+)
+
+# make source tarball with svn check
+
+ADD_CUSTOM_TARGET( srcpackage
+ COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
+ ${PACKAGE_COMMAND}
+)
+
Copied: trunk/zypper/VERSION.cmake (from r5689, trunk/zypper/VERSION)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?p2=trunk/zypper/VERSION.cmake&p1=trunk/zypper/VERSION&r1=5689&r2=5711&rev=5711&view=diff
==============================================================================
--- trunk/zypper/VERSION (original)
+++ trunk/zypper/VERSION.cmake Mon Jun 11 15:16:25 2007
@@ -1,14 +1,23 @@
-dnl ==================================================
-dnl Versioning
-dnl ==========
-dnl
-dnl For now:
-dnl - bump PATCH at least for each submission
-dnl - bump MINOR and reset PATCH when a significant bug is fixed or
-dnl a feature added (but we should not add them now in the beta
-dnl phase)
-dnl ==================================================
-m4_define([ZYPPER_MAJOR], [0])
-m4_define([ZYPPER_MINOR], [7])
-m4_define([ZYPPER_PATCH], [2])
-dnl ==================================================
+# ==========
+# Versioning
+# ==========
+#
+# VERSION_MAJOR Denotes major milestones.
+#
+# VERSION_MINOR Denotes feature implementations.
+#
+# VERSION_PATCH Minor changes and fixes.
+#
+#
+# - The package VERSION will be VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH.
+#
+# - Update the version information only immediately before a public release
+# of your software. More frequent updates are unnecessary.
+#
+# - If the source code has changed at all since the last update,
+# then increment VERSION_PATCH.
+#
+
+SET(VERSION_MAJOR "0")
+SET(VERSION_MINOR "8")
+SET(VERSION_PATCH "0")
Added: trunk/zypper/cmake/modules/FindGettext.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/cmake/modules/FindGettext.cmake?rev=5711&view=auto
==============================================================================
--- trunk/zypper/cmake/modules/FindGettext.cmake (added)
+++ trunk/zypper/cmake/modules/FindGettext.cmake Mon Jun 11 15:16:25 2007
@@ -0,0 +1,63 @@
+# - Find GNU gettext tools
+# This module looks for the GNU gettext tools. This module defines the
+# following values:
+# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
+# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
+# GETTEXT_FOUND: True if gettext has been found.
+#
+# Additionally it provides the following macros:
+# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
+# This will create a target "translations" which will convert the
+# given input po files into the binary output mo file. If the
+# ALL option is used, the translations will also be created when
+# building the default target.
+
+FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
+
+FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+
+MACRO( GETTEXT_CREATE_TRANSLATIONS _potFile )
+
+ SET(_gmoFiles)
+ GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+ GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+#MESSAGE( STATUS "pot: ${_potFile} basename: ${_potBasename}" )
+
+ SET(_addToAll)
+
+ FOREACH (_currentPoFile ${ARGN})
+ IF(${_currentPoFile} STREQUAL "ALL")
+ SET(_addToAll "ALL")
+ ELSE(${_currentPoFile} STREQUAL "ALL")
+ GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
+ GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE)
+ SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${_gmoFile}
+ #COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+ #DEPENDS ${_absPotFile} ${_absFile}
+ DEPENDS ${_absFile}
+ )
+
+ INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
+ SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
+ ENDIF(${_currentPoFile} STREQUAL "ALL")
+
+ ENDFOREACH (_currentPoFile )
+
+ ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
+
+ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
+
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ SET(GETTEXT_FOUND TRUE)
+ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ SET(GETTEXT_FOUND FALSE)
+ IF (GetText_REQUIRED)
+ MESSAGE(FATAL_ERROR "GetText not found")
+ ENDIF (GetText_REQUIRED)
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
Added: trunk/zypper/cmake/modules/FindReadline.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/cmake/modules/FindReadline.cmake?rev=5711&view=auto
==============================================================================
--- trunk/zypper/cmake/modules/FindReadline.cmake (added)
+++ trunk/zypper/cmake/modules/FindReadline.cmake Mon Jun 11 15:16:25 2007
@@ -0,0 +1,37 @@
+# - Find readline library
+# This module looks for the GNU gettext tools. This module defines the
+# following values:
+#
+
+if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+ # Already in cache, be silent
+ set(READLINE_FIND_QUIETLY TRUE)
+endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+
+set(READLINE_LIBRARY)
+set(READLINE_INCLUDE_DIR)
+
+FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
+ /usr/include
+ /usr/include/readline
+ /usr/local/include
+ /usr/include/readline
+)
+
+FIND_LIBRARY(READLINE_LIBRARY NAMES readline
+ PATHS
+ /usr/lib
+ /usr/lib64
+ /usr/local/lib
+ /usr/local/lib64
+)
+
+if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+ MESSAGE( STATUS "readline found: includes in ${READLINE_INCLUDE_DIR}, library in ${READLINE_LIBRARY}")
+ set(READLINE_FOUND TRUE)
+else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+ MESSAGE( STATUS "readline not found")
+endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+
+MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
+
Added: trunk/zypper/doc/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/CMakeLists.txt?rev=5711&view=auto
==============================================================================
--- trunk/zypper/doc/CMakeLists.txt (added)
+++ trunk/zypper/doc/CMakeLists.txt Mon Jun 11 15:16:25 2007
@@ -0,0 +1,15 @@
+INSTALL(
+ FILES zypper.8
+ DESTINATION ${MANDIR}/man8
+)
+
+INSTALL(
+ FILES TODO zypper-rug
+ DESTINATION ${INSTALL_PREFIX}/share/doc/packages/${PACKAGE}
+)
+
+# old Makefile.am
+#pkgdoc_DATA = TODO zypper-rug
+#man_MANS = zypper.8
+#
+#EXTRA_DIST = $(man_MANS) $(pkgdoc_DATA)
Added: trunk/zypper/po/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/CMakeLists.txt?rev=5711&view=auto
==============================================================================
--- trunk/zypper/po/CMakeLists.txt (added)
+++ trunk/zypper/po/CMakeLists.txt Mon Jun 11 15:16:25 2007
@@ -0,0 +1,2 @@
+FILE( GLOB ZYPPER_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po )
+GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/zypper.pot" ALL ${ZYPPER_PO_FILES} )
Added: trunk/zypper/po/createPot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/createPot?rev=5711&view=auto
==============================================================================
--- trunk/zypper/po/createPot (added)
+++ trunk/zypper/po/createPot Mon Jun 11 15:16:25 2007
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# search for sourcecode-files
+SRCFILES=$(find .. -type f -name "*.h" \
+-o -name "*.c" \
+-o -name "*.cc")
+echo $SRCFILES
+#calling xgettext with the sourcefiles
+xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES
Added: trunk/zypper/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=5711&view=auto
==============================================================================
--- trunk/zypper/src/CMakeLists.txt (added)
+++ trunk/zypper/src/CMakeLists.txt Mon Jun 11 15:16:25 2007
@@ -0,0 +1,70 @@
+ADD_DEFINITIONS (
+ -DPACKAGE=\\\"${PACKAGE}\\\"
+ -DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\"
+)
+
+SET( zypper_SRCS
+ zypper.cc
+ zypper-getopt.cc
+ zypper-sources.cc
+ zypper-misc.cc
+ zypper-utils.cc
+ zypper-search.cc
+ zypper-info.cc
+ zypper-tabulator.cc
+ zypper-callbacks.cc
+)
+
+SET (zypper_HEADERS
+ zypper.h
+ zypper-getopt.h
+ zypper-sources.h
+ zypper-misc.h
+ zypper-utils.h
+ zypper-search.h
+ zypper-info.h
+ zypper-tabulator.h
+ zypper-callbacks.h
+ zypper-keyring-callbacks.h
+ zypper-media-callbacks.h
+ zypper-rpm-callbacks.h
+ zypper-source-callbacks.h
+)
+
+ADD_EXECUTABLE( zypper ${zypper_SRCS} )
+TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} )
+
+INSTALL(
+ TARGETS zypper
+ RUNTIME DESTINATION ${INSTALL_PREFIX}/bin
+)
+
+ADD_EXECUTABLE( zypp-checkpatches zypp-checkpatches.cc zypper-updates.cc zypper-utils.cc )
+TARGET_LINK_LIBRARIES( zypp-checkpatches ${ZYPP_LIBRARY} )
+
+INSTALL(
+ TARGETS zypp-checkpatches
+ RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
+)
+
+ADD_EXECUTABLE( zypp-checkpatches-wrapper zypp-checkpatches-wrapper.c )
+TARGET_LINK_LIBRARIES( zypp-checkpatches-wrapper ${ZYPP_LIBRARY} )
+
+INSTALL(
+ TARGETS zypp-checkpatches-wrapper
+ RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
+)
+
+
+# logrotate config file
+INSTALL(
+ PROGRAMS installation_sources
+ DESTINATION ${INSTALL_PREFIX}/bin
+)
+
+# logrotate config file
+INSTALL(
+ FILES zypper.lr
+ DESTINATION ${SYSCONFDIR}/logrotate.d
+)
+
Modified: trunk/zypper/src/zypp-checkpatches.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-checkpatches.cc?rev=5711&r1=5710&r2=5711&view=diff
==============================================================================
--- trunk/zypper/src/zypp-checkpatches.cc (original)
+++ trunk/zypper/src/zypp-checkpatches.cc Mon Jun 11 15:16:25 2007
@@ -18,8 +18,8 @@
#include