svn commit: r1414392 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake etc/CMakeLists.txt etc/Makefile.am etc/qpidd.service etc/qpidd.service.in

[mc...@apache.org]

Author: mcpierce
Date: Tue Nov 27 20:38:41 2012
New Revision: 1414392

URL: http://svn.apache.org/viewvc?rev=1414392&view=rev
Log:
QPID-4388: Systemd support not being installed with Cmake

Previously systemd support was only in the automake system, and the
qpidd.service file was processed via sed. But, since there are no
substitutions needed in the file, it's now renamed to qpidd.service. And
both Makefile.am and CMakeLists.txt will simply install it to
/usr/lib/systemd/system.

Added:
    qpid/trunk/qpid/cpp/etc/qpidd.service
      - copied, changed from r1414355, qpid/trunk/qpid/cpp/etc/qpidd.service.in
Removed:
    qpid/trunk/qpid/cpp/etc/qpidd.service.in
Modified:
    qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
    qpid/trunk/qpid/cpp/etc/CMakeLists.txt
    qpid/trunk/qpid/cpp/etc/Makefile.am

Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1414392&r1=1414391&r2=1414392&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Tue Nov 27 20:38:41 2012
@@ -180,6 +180,7 @@ endif()
   set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR})
   set (QPID_LOCALSTATE_DIR var) # Directory to store local state data
   set (QPID_MAN_DIR man) # Directory to install manual files
+  set (QPIDD_INSTALL_SYSTEMDDIR usr/lib/systemd/system) # Systemd service files
 
   set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from
   set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from

Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1414392&r1=1414391&r2=1414392&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Tue Nov 27 20:38:41 2012
@@ -23,6 +23,9 @@ install(FILES qpidc.conf
 install(FILES qpidd.conf
         DESTINATION ${QPID_INSTALL_CONFDIR}
         COMPONENT ${QPID_COMPONENT_BROKER})
+install(FILES qpidd.service
+        DESTINATION ${QPIDD_INSTALL_SYSTEMDDIR}
+        COMPONENT ${QPID_COMPONENT_BROKER})
 if (BUILD_SASL)
   install(FILES sasl2/qpidd.conf
           DESTINATION ${QPID_INSTALL_SASLDIR}

Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=1414392&r1=1414391&r2=1414392&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Tue Nov 27 20:38:41 2012
@@ -20,7 +20,7 @@ SASL_CONF = sasl2/qpidd.conf
 
 EXTRA_DIST = \
 	$(SASL_CONF) \
-	qpidd.service.in qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
+	qpidd.service qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
 	cluster.conf-example.xml.in
 
 confdir = $(sysconfdir)/qpid
@@ -47,11 +47,11 @@ qpidd-primary: qpidd-primary.in
 	sed $(SUBST) $< > $@
 cluster.conf-example.xml: cluster.conf-example.xml.in
 	sed $(SUBST) $< > $@
-qpidd.service: qpidd.service.in
-	sed $(SUBST) $< > $@
 
 CLEANFILES = qpidd qpidd-primary cluster.conf-example.xml qpidd.service
 
 initddir = $(sysconfdir)/init.d
-nobase_initd_SCRIPTS = qpidd qpidd-primary qpidd.service
+nobase_initd_SCRIPTS = qpidd qpidd-primary
 
+systemddir = /usr/lib/systemd/system
+nobase_systemd_SCRIPTS = qpidd.service

Copied: qpid/trunk/qpid/cpp/etc/qpidd.service (from r1414355, qpid/trunk/qpid/cpp/etc/qpidd.service.in)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd.service?p2=qpid/trunk/qpid/cpp/etc/qpidd.service&p1=qpid/trunk/qpid/cpp/etc/qpidd.service.in&r1=1414355&r2=1414392&rev=1414392&view=diff
==============================================================================
    (empty)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org