Trying to improve dexela plugin packaging.

7 files changed, 62 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 299cec2..443f33c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,19 +10,20 @@ set(UCA_DESCRIPTION "Unified Camera Access")
 set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}")
 set(UCA_ABI_VERSION "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}")
 
-set(PACKAGE_VERSION "${UCA_VERSION_STRING}")
-set(PACKAGE_NAME "${TARNAME}")
+set(CPACK_PACKAGE_VERSION "${UCA_VERSION_STRING}")
+set(CPACK_PACKAGE_NAME "${TARNAME}")
 set(PACKAGE_TARNAME "${TARNAME}")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket")
 
-set(CPACK_GENERATOR "RPM")
+set(CPACK_GENERATOR "DEB;RPM")
 set(CPACK_PACKAGE_RELEASE 3)
-set(CPACK_DEBIAN_PACKAGE_NAME "libuca")
+set(CPACK_RPM_PACKAGE_RELEASE 3)
+set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION})
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION})
-set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 
diff --git a/plugins/dexela/.swp.CMakeLists.txt b/plugins/dexela/.swp.CMakeLists.txt
new file mode 100644
index 0000000..610f745
--- /dev/null
+++ b/plugins/dexela/.swp.CMakeLists.txt
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index 8522192..03ff968 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -1,11 +1,23 @@
 cmake_minimum_required(VERSION 2.8)
 project(ucadexela C)
+set(VERSION "1.0.0")
 
 find_package(DEXELA)
 
 if (DEXELA_FOUND)
     set(UCA_CAMERA_NAME "dexela")
+    set(PLUGIN_SPECIFIC_FLAGS "-D CMAKE_CURRENT_BINARY_DIR=`pwd` -D CPACK_RPM_USER_BINARY_SPECFILE=${CMAKE_CURRENT_BINARY_DIR}/ucadexela.spec")
 
+    set(CPACK_PACKAGE_VERSION ${VERSION})
+    set(CPACK_GENERATOR "RPM")
+    set(CPACK_PACKAGE_NAME "uca-plugin-dexela")
+    set(CPACK_PACKAGE_RELEASE 1)
+    set(CPACK_PACKAGE_CONTACT "Mihael Koep")
+    set(CPACK_PACKAGE_VENDOR "ANKA Computing Group")
+    set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ucadexela.spec.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/ucadexela.spec)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
 
diff --git a/plugins/dexela/libucadexela.so b/plugins/dexela/libucadexela.so
new file mode 100755
index 0000000..11070f5
--- /dev/null
+++ b/plugins/dexela/libucadexela.so
diff --git a/plugins/dexela/ucadexela.spec.in b/plugins/dexela/ucadexela.spec.in
new file mode 100644
index 0000000..6ca4d3d
--- /dev/null
+++ b/plugins/dexela/ucadexela.spec.in
@@ -0,0 +1,43 @@
+# -*- rpm-spec -*-
+Buildroot: $CMAKE_CURRENT_BINARY_DIR/_CPack_Packages/Linux/RPM/@CPACK_PACKAGE_FILE_NAME@
+Summary:        Dexela Plugin for libuca
+Name:           @CPACK_PACKAGE_NAME@
+Version:        @CPACK_PACKAGE_VERSION@
+Release:        @CPACK_PACKAGE_RELEASE@
+License:        GPL
+Group:          Development/Libraries
+Vendor:         @CPACK_PACKAGE_VENDOR@
+Prefix:         @CPACK_PACKAGING_INSTALL_PREFIX@
+Requires:       libuca = @UCA_VERSION_STRING@
+
+%define _rpmdir $RPM_BUILD_ROOT
+%define _rpmfilename @CPACK_PACKAGE_FILE_NAME@.rpm
+%define _unpackaged_files_terminate_build 0
+%define _topdir $CMAKE_CURRENT_BINARY_DIR/_CPack_Packages/Linux/RPM
+
+%description
+Dexela Plugin for libuca
+
+# This is a shortcutted spec file generated by CMake RPM generator
+# we skip _install step because CPack does that for us.
+# We do only save CPack installed tree in _prepr
+# and then restore it in build.
+%prep
+echo $RPM_BUILD_ROOT
+echo @CMAKE_CURRENT_BINARY_DIR@
+mv $RPM_BUILD_ROOT @CMAKE_CURRENT_BINARY_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot
+
+%install
+if [ -e $RPM_BUILD_ROOT ];
+then
+  rm -Rf $RPM_BUILD_ROOT
+fi 
+mv "@CMAKE_CURRENT_BINARY_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT 
+
+%files
+%defattr(-,root,root,-)
+@CPACK_PACKAGING_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/*
+
+%changelog
+* Thu Feb 21 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.2-1
+- let MCS flush input buffer on startup too
diff --git a/plugins/mock/libucamock.so b/plugins/mock/libucamock.so
new file mode 100755
index 0000000..5fd342e
--- /dev/null
+++ b/plugins/mock/libucamock.so
diff --git a/plugins/package-plugin.sh.in b/plugins/package-plugin.sh.in
index c624d52..ea96404 100644
--- a/plugins/package-plugin.sh.in
+++ b/plugins/package-plugin.sh.in
@@ -1 +1 @@
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" -D CPACK_PACKAGE_FILE_NAME="uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}"
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" -D CPACK_PACKAGE_FILE_NAME="uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}" ${PLUGIN_SPECIFIC_FLAGS}