You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/04/08 16:02:18 UTC
svn commit: r1465643 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake
etc/CMakeLists.txt etc/qpidd-primary.in managementgen/CMakeLists.txt
src/CMakeLists.txt
Author: mcpierce
Date: Mon Apr 8 14:02:18 2013
New Revision: 1465643
URL: http://svn.apache.org/r1465643
Log:
QPID-4698: Fixed the install location for files under CMake.
Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf
Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary
Installs the qmf-gen Python script to /usr/bin
Installs the managementgen sitepackage to where sitelibs belong
Modified:
qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
qpid/trunk/qpid/cpp/etc/CMakeLists.txt
qpid/trunk/qpid/cpp/etc/qpidd-primary.in
qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1465643&r1=1465642&r2=1465643&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Mon Apr 8 14:02:18 2013
@@ -171,15 +171,15 @@ if (UNIX)
set (QPID_INSTALL_BINDIR bin)
set (QPID_INSTALL_SBINDIR sbin)
set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test executables
- set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid)
- set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2)
+ set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR})
+ set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/qpid/sasl2)
set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid)
set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/examples)
set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install documentation
set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR})
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 (QPID_MAN_DIR share/man) # Directory to install manual files
set (QPID_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
Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Mon Apr 8 14:02:18 2013
@@ -17,8 +17,18 @@
# under the License.
#
+set (sysconfdir ${SYSCONF_INSTALL_DIR})
+
+configure_file(qpidd-primary.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
+ @ONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
+ DESTINATION ${QPID_INSTALL_CONFDIR}/rc.d/init.d
+ COMPONENT ${QPID_COMPONENT_BROKER})
+
install(FILES qpidc.conf
- DESTINATION ${QPID_INSTALL_CONFDIR}
+ DESTINATION ${QPID_INSTALL_CONFDIR}/qpid
COMPONENT ${QPID_COMPONENT_CLIENT})
install(FILES qpidd.conf
DESTINATION ${QPID_INSTALL_CONFDIR}
Modified: qpid/trunk/qpid/cpp/etc/qpidd-primary.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd-primary.in?rev=1465643&r1=1465642&r2=1465643&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd-primary.in (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd-primary.in Mon Apr 8 14:02:18 2013
@@ -40,8 +40,8 @@ prog=qpidd
# Source function library.
. /etc/rc.d/init.d/functions
-if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then
- . !!sysconfdir!!/sysconfig/$prog
+if [ -f @sysconfdir@/sysconfig/$prog ] ; then
+ . @sysconfdir@/sysconfig/$prog
fi
# The following variables can be overridden in !!sysconfdir!!/sysconfig/$prog
Modified: qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt Mon Apr 8 14:02:18 2013
@@ -19,8 +19,15 @@
project(qpidc-qmfgen)
cmake_minimum_required(VERSION 2.4.0 FATAL_ERROR)
-install(PROGRAMS qmf-gen DESTINATION managementgen
+find_package(PythonInterp 2.7 REQUIRED)
+
+execute_process(COMMAND ${PYTHON_EXECUTABLE}
+ -c "from distutils.sysconfig import get_python_lib; print get_python_lib(False)"
+ OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(PROGRAMS qmf-gen DESTINATION ${QPID_INSTALL_BINDIR}
COMPONENT ${QPID_COMPONENT_QMF})
-install(DIRECTORY qmfgen DESTINATION managementgen
+install(DIRECTORY qmfgen DESTINATION ${PYTHON_SITEARCH_PACKAGES}/qmfgen
COMPONENT ${QPID_COMPONENT_QMF}
PATTERN ".svn" EXCLUDE PATTERN "*.pyc" EXCLUDE)
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Apr 8 14:02:18 2013
@@ -1272,8 +1272,8 @@ if (CPACK_GENERATOR STREQUAL "NSIS")
endif (CPACK_GENERATOR STREQUAL "NSIS")
if (UNIX)
- install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/lib/qpidd)")
- install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/spool/qpidd)")
+ install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/lib/qpidd)")
+ install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/spool/qpidd)")
endif (UNIX)
set (qmf_SOURCES
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
Re: Fwd: svn commit: r1465643 - This commit forces new version of
python - breaks my builds
Posted by "Darryl L. Pierce" <dp...@redhat.com>.
On Thu, Apr 11, 2013 at 10:27:16AM -0400, Chuck Rolke wrote:
> This commit breaks my Windows builds as I'm using python 2.6.1. I don't recall discussing that an upgrade to 2.7 is necessary. Do we really need 2.7?
>
> I'm sorry I missed this commit the other day as I think it got lost in Fraser's flood of changes.
I've removed this piece from the CMake file.
--
Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc.
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
Fwd: svn commit: r1465643 - This commit forces new version of
python - breaks my builds
Posted by Chuck Rolke <cr...@redhat.com>.
This commit breaks my Windows builds as I'm using python 2.6.1. I don't recall discussing that an upgrade to 2.7 is necessary. Do we really need 2.7?
I'm sorry I missed this commit the other day as I think it got lost in Fraser's flood of changes.
-Chuck
----- Forwarded Message -----
> From: mcpierce@apache.org
> To: commits@qpid.apache.org
> Sent: Monday, April 8, 2013 10:02:18 AM
> Subject: svn commit: r1465643 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake etc/CMakeLists.txt
> etc/qpidd-primary.in managementgen/CMakeLists.txt src/CMakeLists.txt
>
> Author: mcpierce
> Date: Mon Apr 8 14:02:18 2013
> New Revision: 1465643
>
> URL: http://svn.apache.org/r1465643
> Log:
> QPID-4698: Fixed the install location for files under CMake.
>
> Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf
> Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary
> Installs the qmf-gen Python script to /usr/bin
> Installs the managementgen sitepackage to where sitelibs belong
>
> Modified:
> qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
> qpid/trunk/qpid/cpp/etc/CMakeLists.txt
> qpid/trunk/qpid/cpp/etc/qpidd-primary.in
> qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt
> qpid/trunk/qpid/cpp/src/CMakeLists.txt
>
> Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
> URL:
> http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1465643&r1=1465642&r2=1465643&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
> +++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Mon Apr 8 14:02:18 2013
> @@ -171,15 +171,15 @@ if (UNIX)
> set (QPID_INSTALL_BINDIR bin)
> set (QPID_INSTALL_SBINDIR sbin)
> set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test
> executables
> - set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid)
> - set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2)
> + set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR})
> + set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/qpid/sasl2)
> set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid)
> set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/examples)
> set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install
> documentation
> set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR})
> 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 (QPID_MAN_DIR share/man) # Directory to install manual files
> set (QPID_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
>
> Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
> URL:
> http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
> +++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Mon Apr 8 14:02:18 2013
> @@ -17,8 +17,18 @@
> # under the License.
> #
>
> +set (sysconfdir ${SYSCONF_INSTALL_DIR})
> +
> +configure_file(qpidd-primary.in
> + ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
> + @ONLY)
> +
> +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
> + DESTINATION ${QPID_INSTALL_CONFDIR}/rc.d/init.d
> + COMPONENT ${QPID_COMPONENT_BROKER})
> +
> install(FILES qpidc.conf
> - DESTINATION ${QPID_INSTALL_CONFDIR}
> + DESTINATION ${QPID_INSTALL_CONFDIR}/qpid
> COMPONENT ${QPID_COMPONENT_CLIENT})
> install(FILES qpidd.conf
> DESTINATION ${QPID_INSTALL_CONFDIR}
>
> Modified: qpid/trunk/qpid/cpp/etc/qpidd-primary.in
> URL:
> http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd-primary.in?rev=1465643&r1=1465642&r2=1465643&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/etc/qpidd-primary.in (original)
> +++ qpid/trunk/qpid/cpp/etc/qpidd-primary.in Mon Apr 8 14:02:18 2013
> @@ -40,8 +40,8 @@ prog=qpidd
> # Source function library.
> . /etc/rc.d/init.d/functions
>
> -if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then
> - . !!sysconfdir!!/sysconfig/$prog
> +if [ -f @sysconfdir@/sysconfig/$prog ] ; then
> + . @sysconfdir@/sysconfig/$prog
> fi
>
> # The following variables can be overridden in
> !!sysconfdir!!/sysconfig/$prog
>
> Modified: qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt
> URL:
> http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt (original)
> +++ qpid/trunk/qpid/cpp/managementgen/CMakeLists.txt Mon Apr 8 14:02:18 2013
> @@ -19,8 +19,15 @@
> project(qpidc-qmfgen)
> cmake_minimum_required(VERSION 2.4.0 FATAL_ERROR)
>
> -install(PROGRAMS qmf-gen DESTINATION managementgen
> +find_package(PythonInterp 2.7 REQUIRED)
> +
> +execute_process(COMMAND ${PYTHON_EXECUTABLE}
> + -c "from distutils.sysconfig import get_python_lib; print
> get_python_lib(False)"
> + OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
> + OUTPUT_STRIP_TRAILING_WHITESPACE)
> +
> +install(PROGRAMS qmf-gen DESTINATION ${QPID_INSTALL_BINDIR}
> COMPONENT ${QPID_COMPONENT_QMF})
> -install(DIRECTORY qmfgen DESTINATION managementgen
> +install(DIRECTORY qmfgen DESTINATION ${PYTHON_SITEARCH_PACKAGES}/qmfgen
> COMPONENT ${QPID_COMPONENT_QMF}
> PATTERN ".svn" EXCLUDE PATTERN "*.pyc" EXCLUDE)
>
> Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
> URL:
> http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1465643&r1=1465642&r2=1465643&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
> +++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Apr 8 14:02:18 2013
> @@ -1272,8 +1272,8 @@ if (CPACK_GENERATOR STREQUAL "NSIS")
> endif (CPACK_GENERATOR STREQUAL "NSIS")
>
> if (UNIX)
> - install (CODE "FILE(MAKE_DIRECTORY
> \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/lib/qpidd)")
> - install (CODE "FILE(MAKE_DIRECTORY
> \$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/spool/qpidd)")
> + install (CODE "FILE(MAKE_DIRECTORY
> \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/lib/qpidd)")
> + install (CODE "FILE(MAKE_DIRECTORY
> \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/spool/qpidd)")
> endif (UNIX)
>
> set (qmf_SOURCES
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
> For additional commands, e-mail: commits-help@qpid.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org