Move to libyui buildtools structure

CMakeLists.txt

@@ -1,26 +1,31 @@
-PROJECT(yast2-qt-pkg)
-SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wno-deprecated" )
-SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -Wall" )
-set( CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -DNDEBUG")
+INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/macros.cmake" )
+INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/PROJECTINFO.cmake" )
+INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/RPMINFO.cmake" )
+INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" )
 
-SET( RPMNAME "yast2-qt-pkg" )
+INITIALIZE()
 
-FIND_PACKAGE(Qt4 REQUIRED)
-FIND_PACKAGE(Yast)
-FIND_PACKAGE(Libyui REQUIRED)
-FIND_PACKAGE(Zypp REQUIRED)
-INCLUDE(YastCommon)
+PROJECT( "${PROJECTNAME}" )
 
-SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current)
-SET(Y2QT_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
-SET(Y2QT_THEMEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme)
+INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" )
 
-GENERATE_PACKAGING(${RPMNAME} ${VERSION})
+SET_OPTIONS()
+SET_ENVIRONMENT()
+SET_BUILD_FLAGS()
+SET_AUTODOCS()
 
-IF( YPKG_QT_CONFIRM_UNSUPPORTED_PACKAGES )
-  ADD_DEFINITIONS( -DYPKG_QT_CONFIRM_UNSUPPORTED_PACKAGES )
-ENDIF( YPKG_QT_CONFIRM_UNSUPPORTED_PACKAGES )
+IF( NOT DOCS_ONLY )
+  FIND_LIB_DEPENDENCIES()
+  FIND_LINKER_LIBS()
+  CHECK_PREFIX()
+  SET_SUBDIRS()
+  GEN_EXPORTS()
+  GEN_FILES()
+  PREP_SPEC_FILES()
+  SET_INSTALL_TARGET()
+  PREP_OBS_TARBALL()
+ENDIF( NOT DOCS_ONLY )
 
-ADD_SUBDIRECTORY(src)
+SUMMARY()

Makefile.cvs

@@ -2,19 +2,20 @@
 # Makefile.cvs
 #
 
-LIB = $(shell y2tool get-lib)
+all: configure
 
-PREFIX = /usr
-
-configure: 
-	mkdir -p build ;\
-	cd build ;\
-	cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DLIB=$(LIB) ..
+configure: clean
+	mkdir build ; \
+	cd build ; \
+	cmake -DCMAKE_BUILD_TYPE=RELEASE ..
 
 install: configure
-	cd build; \
+	cd build ; \
 	make && make install
 
-reconf: 
-	cd build ;\
+reconf:
+	cd build ; \
 	cmake rebuild_cache
+
+clean:
+	rm -rf build

PROJECTINFO.cmake

@@ -0,0 +1,22 @@
+##### PROJECTINFO for CMake
+
+SET( BASELIB		"yui" )		# don't change this
+
+##### MAKE ALL NEEDED CHANGES HERE #####
+
+SET( SUBDIRS		src examples )	# set the subdirs where your code is located.
+SET( PLUGINNAME		qt-pkg )	# define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph}
+SET( LIB_DEPS		Qt Zypp )	# define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line
+SET( INTERNAL_DEPS	Libyui Libyui-qt )	# include libyui or it's plugins (if needed), too!
+SET( LIB_LINKER		zypp )		# define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too!
+SET( EXTRA_INCLUDES	)		# set include-dir which are not picked by CMake automagically here.
+SET( PROGSUBDIR		)		# define your programm's name if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg.
+
+
+## Things to cleanup; probably too yast2 related
+
+# used in src/icons and YQPackageSelectorHelp.cc (via -DHELPIMAGEDIR) probably specific to this file
+SET( INSTALL_HELP_ICONS_DIR 	"${CMAKE_INSTALL_PREFIX}/share/YaST2/images" )
+
+# maybe '#include <yui/Libyui_config.h>' rather than using '-DTHEMEDIR'
+SET( YUIQT_THEMEDIR		"${CMAKE_INSTALL_PREFIX}/share/YaST2/theme" )

README.md

@@ -0,0 +1 @@
+![libYUI-boilerplate](http://img191.imageshack.us/img191/9364/libyui.png)

RPMINFO.cmake

@@ -0,0 +1,30 @@
+##### RPMINFO for CMake
+#####
+##### THIS IS THE INFO REQUIRED FOR SPEC-FILE GENERATION
+
+SET( SPEC_Url			"http://github.com/libyui-qt-pkg/" )							# the URL of the project
+
+SET( SPEC_Summary		"" )				# some brief summary
+
+SET( SPEC_Description		"\n" )				# the description to be used, end each line with "\n" for line-breaks
+
+SET( SPEC_BuildRequires		"cmake >= 2.8"
+  "libyui-devel-qt >= 2.21.6"
+  "libzypp-devel >= 11.4.0"
+)								# the BuildRequires every single pkg wrapped with "" and speparated with spaces
+
+SET( SPEC_Conflicts		"" )				# the Conflicts every single pkg wrapped with "" and speparated with spaces
+
+SET( SPEC_Provides		"yast2-qt-pkg = 2.21.25" )	# the Provides every single pkg wrapped with "" and speparated with spaces
+
+SET( SPEC_Obsoletes		"yast2-qt-pkg < 2.21.25" )	# the Obsoletes every single pkg wrapped with "" and speparated with spaces
+
+SET( SPEC_Docs			"" )				# for docs that should be in the main-pkg
+
+SET( SPEC_DEVEL_Requires	"@PROJECTNAME@@@varpfx@_SONAME_MAJOR@ = %{version}" )	# the Requires for the -devel pkg every single pkg wrapped with "" and speparated with spaces
+
+SET( SPEC_DEVEL_Provides	"pkgconfig(@PROJECTNAME@) = %{version}"
+  "yast2_ui_pkg"
+)		# the Provides for the -devel pkg
+
+SET( SPEC_DEVEL_Docs		"" )							# for docs that should be in the devel-pkg

SOURCECONF.cmake

@@ -0,0 +1,99 @@
+SET( ${TARGETLIB}_SOURCES
+  ##### Here go the source files
+  QY2LayoutUtils.cc
+  YQIconPool.cc
+  YQPackageSelectorBase.cc
+  YQPackageSelector.cc
+  YQPackageSelectorHelp.cc
+  YQPatternSelector.cc
+  YQSimplePatchSelector.cc
+  YQPkgChangeLogView.cc
+  YQPkgChangesDialog.cc
+  YQPkgConflictDialog.cc
+  YQPkgConflictList.cc
+  YQPkgDependenciesView.cc
+  YQPkgDescriptionDialog.cc
+  YQPkgDescriptionView.cc
+  YQPkgDiskUsageList.cc
+  YQPkgDiskUsageWarningDialog.cc
+  YQPkgFileListView.cc
+  YQPkgFilterTab.cc
+  YQPkgGenericDetailsView.cc
+  YQPkgHistoryDialog.cc
+  YQPkgLangList.cc
+  YQPkgList.cc
+  YQPkgObjList.cc
+  YQPkgPackageKitGroupsFilterView.cc
+  YQPkgPatchFilterView.cc
+  YQPkgPatchList.cc
+  YQPkgPatternList.cc
+  YQPkgProductDialog.cc
+  YQPkgProductList.cc
+  YQPkgRepoFilterView.cc
+  YQPkgRepoList.cc
+  YQPkgRpmGroupTagsFilterView.cc
+  YQPkgSearchFilterView.cc
+  YQPkgSelDescriptionView.cc
+  YQPkgSelMapper.cc
+  YQPkgStatusFilterView.cc
+  YQPkgTechnicalDetailsView.cc
+  YQPkgTextDialog.cc
+  YQPkgUpdateProblemFilterView.cc
+  YQPkgVersionsView.cc
+  YQPackageSelectorPluginImpl.cc
+  YQZyppSolverDialogPluginStub.cc
+)
+
+SET( ${TARGETLIB}_HEADERS
+  ##### Here go the headers
+  QY2LayoutUtils.h
+  YQIconPool.h
+  YQPackageSelector.h
+  YQPackageSelectorBase.h
+  YQPackageSelectorPlugin.h
+  YQPackageSelectorPluginImpl.h
+  YQPatternSelector.h
+  YQPkgChangeLogView.h
+  YQPkgChangesDialog.h
+  YQPkgConflictDialog.h
+  YQPkgConflictList.h
+  YQPkgDependenciesView.h
+  YQPkgDescriptionDialog.h
+  YQPkgDescriptionView.h
+  YQPkgDiskUsageList.h
+  YQPkgDiskUsageWarningDialog.h
+  YQPkgFileListView.h
+  YQPkgFilterTab.h
+  YQPkgGenericDetailsView.h
+  YQPkgHistoryDialog.h
+  YQPkgLangList.h
+  YQPkgList.h
+  YQPkgObjList.h
+  YQPkgPackageKitGroupsFilterView.h
+  YQPkgPatchFilterView.h
+  YQPkgPatchList.h
+  YQPkgPatternList.h
+  YQPkgProductDialog.h
+  YQPkgProductList.h
+  YQPkgRepoFilterView.h
+  YQPkgRepoList.h
+  YQPkgRpmGroupTagsFilterView.h
+  YQPkgSearchFilterView.h
+  YQPkgSelDescriptionView.h
+  YQPkgSelList.h
+  YQPkgSelMapper.h
+  YQPkgStatusFilterView.h
+  YQPkgTechnicalDetailsView.h
+  YQPkgTextDialog.h
+  YQPkgUpdateProblemFilterView.h
+  YQPkgVersionsView.h
+  YQSimplePatchSelector.h
+  YQZypp.h
+  YQZyppSolverDialogPluginIf.h
+  YQZyppSolverDialogPluginStub.h
+)
+
+SET( EXAMPLES_LIST
+  ##### Here go the examples
+)
+

VERSION.cmake

@@ -1,3 +1,11 @@
-SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "24")
+SET( VERSION_MAJOR "2" )
+SET( VERSION_MINOR "21" )
+SET( VERSION_PATCH "25" )
+SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
+
+##### This is need for the libyui core, ONLY.
+##### These will be overridden from exports in LibyuiConfig.cmake
+SET( SONAME_MAJOR "4" )
+SET( SONAME_MINOR "0" )
+SET( SONAME_PATCH "0" )
+SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )

examples/CMakeLists.txt

@@ -0,0 +1,14 @@
+INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/src" "${CMAKE_INCLUDE_PATH}" )
+
+FOREACH( EXAMPLE ${EXAMPLES_LIST} )
+  IF( ENABLE_EXAMPLES )
+    GET_FILENAME_COMPONENT( EXAMPLE_EXEC "${EXAMPLE}" NAME_WE )
+    ADD_EXECUTABLE ( ${EXAMPLE_EXEC} "${EXAMPLE}" )
+    TARGET_LINK_LIBRARIES( ${EXAMPLE_EXEC} ${BASELIB} )
+  ENDIF( ENABLE_EXAMPLES )
+ENDFOREACH( EXAMPLE ${EXAMPLES_LIST} )
+
+INSTALL(
+  FILES ${EXAMPLES_LIST}
+  DESTINATION "${INSTALL_DOC_DIR_PREFIX}/examples"
+)

libyui-qt-pkg-doc.changes

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Thu Jun 14 16:12:19 CEST 2012 - ma@suse.de
+
+- initial package