[Cmake-commits] [cmake-commits] hoffman committed CPackRPM.cmake 1.7 1.8
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Sep 19 17:45:39 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv9833
Modified Files:
CPackRPM.cmake
Log Message:
BUG: 7435 fixes to add optional post-install
Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CPackRPM.cmake 25 Feb 2008 19:23:24 -0000 1.7
--- CPackRPM.cmake 19 Sep 2008 21:45:37 -0000 1.8
***************
*** 26,29 ****
--- 26,34 ----
ENDIF(CPACK_TOPLEVEL_DIRECTORY MATCHES ".* .*")
+ IF(NOT CPACK_SET_DESTDIR)
+ MESSAGE("CPackRPM:Warning: You did not set CPACK_SET_DESTDIR to ON")
+ MESSAGE("CPackRPM:Warning: this will make CPackRPM fail if you have installed files with absolute path")
+ ENDIF(NOT CPACK_SET_DESTDIR)
+
# If rpmbuild is found
# we try to discover alien since we may be on non RPM distro like Debian.
***************
*** 69,77 ****
# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
! IF(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
! # FIXME This should be obtained through 'arch' command
! # but is it --really necessary-- ?
! SET(CPACK_RPM_PACKAGE_ARCHITECTURE i386)
! ENDIF(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
# CPACK_RPM_PACKAGE_RELEASE
--- 74,85 ----
# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
! IF(CPACK_RPM_PACKAGE_ARCHITECTURE)
! SET(TMP_RPM_BUILDARCH "Buildarch: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
! IF(CPACK_RPM_PACKAGE_DEBUG)
! MESSAGE("CPackRPM:Debug: using user-specified build arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
! ENDIF(CPACK_RPM_PACKAGE_DEBUG)
! ELSE(CPACK_RPM_PACKAGE_ARCHITECTURE)
! SET(TMP_RPM_BUILDARCH "")
! ENDIF(CPACK_RPM_PACKAGE_ARCHITECTURE)
# CPACK_RPM_PACKAGE_RELEASE
***************
*** 107,112 ****
# CPACK_RPM_PACKAGE_SOURCE
! # The name of the source tarball in case we generate
! # a source RPM
# CPACK_RPM_PACKAGE_DESCRIPTION
--- 115,119 ----
# CPACK_RPM_PACKAGE_SOURCE
! # The name of the source tarball in case we generate a source RPM
# CPACK_RPM_PACKAGE_DESCRIPTION
***************
*** 125,128 ****
--- 132,151 ----
ENDIF (NOT CPACK_RPM_PACKAGE_DESCRIPTION)
+ # CPACK_RPM_SPEC_INSTALL_POST
+ # May be used to define a RPM post intallation script
+ # for example setting it to "/bin/true" may prevent
+ # rpmbuild from stripping binaries.
+ IF(CPACK_RPM_SPEC_INSTALL_POST)
+ SET(TMP_RPM_SPEC_INSTALL_POST "%define __spec_install_post ${CPACK_RPM_SPEC_INSTALL_POST}")
+ ENDIF(CPACK_RPM_SPEC_INSTALL_POST)
+
+ # CPACK_RPM_SPEC_MORE_DEFINE
+ # This is a generated spec rpm file spaceholder
+ IF(CPACK_RPM_SPEC_MORE_DEFINE)
+ IF(CPACK_RPM_PACKAGE_DEBUG)
+ MESSAGE("CPackRPM:Debug: User defined more define spec line specified:\n ${CPACK_RPM_SPEC_MORE_DEFINE}")
+ ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+ ENDIF(CPACK_RPM_SPEC_MORE_DEFINE)
+
# CPACK_RPM_USER_BINARY_SPECFILE
# FIXME when this is set then CPack should us the
***************
*** 131,135 ****
# Now we may create the RPM build tree structure
SET(CPACK_RPM_ROOTDIR "${CPACK_TOPLEVEL_DIRECTORY}")
! MESSAGE(STATUS "CPackRPM:: Using CPACK_RPM_ROOTDIR=${CPACK_RPM_ROOTDIR}")
# Prepare RPM build tree
FILE(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR})
--- 154,158 ----
# Now we may create the RPM build tree structure
SET(CPACK_RPM_ROOTDIR "${CPACK_TOPLEVEL_DIRECTORY}")
! MESSAGE(STATUS "CPackRPM:Debug: Using CPACK_RPM_ROOTDIR=${CPACK_RPM_ROOTDIR}")
# Prepare RPM build tree
FILE(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR})
***************
*** 158,170 ****
# No User specified spec file generate a valid one using var values
IF(CPACK_RPM_PACKAGE_DEBUG)
! MESSAGE("CPackRPM:: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
! MESSAGE("CPackRPM:: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
! MESSAGE("CPackRPM:: CPACK_TEMPORARY_DIRECTORY= ${PACK_TEMPORARY_DIRECTORY}")
! MESSAGE("CPackRPM:: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
! MESSAGE("CPackRPM:: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
! MESSAGE("CPackRPM:: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
! MESSAGE("CPackRPM:: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
! MESSAGE("CPackRPM:: CPACK_PACKAGE_INSTALL_DIRECTORY = ${PACK_PACKAGE_INSTALL_DIRECTORY}")
! MESSAGE("CPackRPM ::CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
ENDIF(CPACK_RPM_PACKAGE_DEBUG)
FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
--- 181,194 ----
# No User specified spec file generate a valid one using var values
IF(CPACK_RPM_PACKAGE_DEBUG)
! MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${PACK_TEMPORARY_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
! MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
! MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${PACK_PACKAGE_INSTALL_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
! MESSAGE("CPackRPM:Debug: CPACK_RPM_SPEC_INSTALL_POST = ${CPACK_RPM_SPEC_INSTALL_POST}")
ENDIF(CPACK_RPM_PACKAGE_DEBUG)
FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
***************
*** 178,181 ****
--- 202,206 ----
Group: ${CPACK_RPM_PACKAGE_GROUP}
Vendor: ${CPACK_RPM_PACKAGE_VENDOR}
+ ${TMP_RPM_BUILDARCH}
#%define prefix ${CMAKE_INSTALL_PREFIX}
***************
*** 184,187 ****
--- 209,214 ----
%define _unpackaged_files_terminate_build 0
%define _topdir ${CPACK_RPM_DIRECTORY}
+ ${TMP_RPM_SPEC_INSTALL_POST}
+ ${CPACK_RPM_SPEC_MORE_DEFINE}
%description
***************
*** 207,214 ****
%changelog
* Tue Aug 16 2007 Erk <eric.noulard at gmail.com>
Generated by CPack RPM Generator and associated macros
")
-
ENDIF(CPACK_RPM_USER_BINARY_SPECFILE)
--- 234,242 ----
%changelog
+ * Mon Aug 25 2008 Erk <eric.noulard at gmail.com>
+ Update generator to handle optional post-install
* Tue Aug 16 2007 Erk <eric.noulard at gmail.com>
Generated by CPack RPM Generator and associated macros
")
ENDIF(CPACK_RPM_USER_BINARY_SPECFILE)
***************
*** 221,224 ****
--- 249,257 ----
ERROR_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.err"
OUTPUT_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.out")
+ IF(CPACK_RPM_PACKAGE_DEBUG)
+ MESSAGE("CPackRPM:Debug: You may consult rpmbuild logs in: ")
+ MESSAGE("CPackRPM:Debug: - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.err")
+ MESSAGE("CPackRPM:Debug: - ${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.out")
+ ENDIF(CPACK_RPM_PACKAGE_DEBUG)
ELSE(RPMBUILD_EXECUTABLE)
IF(ALIEN_EXECUTABLE)
More information about the Cmake-commits
mailing list