Author: shuston
Date: Thu Oct 8 23:18:18 2009
New Revision: 823356
URL: http://svn.apache.org/viewvc?rev=823356&view=rev
Log:
Fix package name and NSIS banner bitmap size.
Added:
qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.png (with props)
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=823356&r1=823355&r2=823356&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Thu Oct 8 23:18:18 2009
@@ -38,8 +38,6 @@
#
# This section also has all the setup for various packaging-specific options.
if (WIN32)
-
- set (CPACK_PACKAGE_INSTALL_DIRECTORY "Qpid ${qpidc_version}")
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set (CPACK_NSIS_MUI_ICON
"${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico")
set (CPACK_NSIS_MUI_UNIICON
"${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico")
@@ -162,13 +160,13 @@
# add_subdirectory(docs/man)
add_subdirectory(examples)
-set(CPACK_PACKAGE_NAME "Qpid")
+set(CPACK_PACKAGE_NAME "qpid-cpp")
set(CPACK_PACKAGE_VENDOR "Apache Software Foundation")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Qpid C++")
-set(CPACK_PACKAGE_VERSION "0.6.0")
-set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "6")
+set(CPACK_PACKAGE_VERSION "${qpidc_version}")
+set(CPACK_PACKAGE_VERSION_MAJOR "${QPID_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${QPID_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-0.6")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-${qpidc_version}")
include (CPack)
Modified: qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp?rev=823356&r1=823355&r2=823356&view=diff
==============================================================================
Binary files - no diff available.
Added: qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.png
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.png?rev=823356&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/cpp/packaging/NSIS/qpid-install-banner.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
