You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/04/20 02:02:02 UTC
svn commit: r1740034 - in /qpid/trunk/qpid/cpp: ./ design_docs/ docs/
docs/design/ docs/src/ packaging/winsdk/
Author: jross
Date: Wed Apr 20 00:02:02 2016
New Revision: 1740034
URL: http://svn.apache.org/viewvc?rev=1740034&view=rev
Log:
QPID-7207: Rename and relocate files inside the cpp subtree
Added:
qpid/trunk/qpid/cpp/INSTALL-WINDOWS.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/INSTALL-WINDOWS
qpid/trunk/qpid/cpp/INSTALL.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/INSTALL
qpid/trunk/qpid/cpp/LICENSE.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/LICENSE
qpid/trunk/qpid/cpp/NOTICE.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/NOTICE
qpid/trunk/qpid/cpp/README.md
qpid/trunk/qpid/cpp/VERSION.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/QPID_VERSION.txt
qpid/trunk/qpid/cpp/docs/amqp-1.0.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/AMQP_1.0
qpid/trunk/qpid/cpp/docs/design/
- copied from r1740033, qpid/trunk/qpid/cpp/design_docs/
qpid/trunk/qpid/cpp/docs/design/CONTENTS
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/docs/src/CONTENTS
qpid/trunk/qpid/cpp/docs/design/DispatchHandle.odg
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/docs/src/DispatchHandle.odg
qpid/trunk/qpid/cpp/docs/design/overview.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/DESIGN
qpid/trunk/qpid/cpp/docs/ha.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/README-HA.txt
qpid/trunk/qpid/cpp/docs/ssl.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/SSL
qpid/trunk/qpid/cpp/packaging/winsdk/
qpid/trunk/qpid/cpp/packaging/winsdk/README.txt
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/README-winsdk.txt
qpid/trunk/qpid/cpp/packaging/winsdk/bld-winsdk.ps1
- copied unchanged from r1740033, qpid/trunk/qpid/cpp/bld-winsdk.ps1
Removed:
qpid/trunk/qpid/cpp/AMQP_1.0
qpid/trunk/qpid/cpp/DESIGN
qpid/trunk/qpid/cpp/INSTALL
qpid/trunk/qpid/cpp/INSTALL-WINDOWS
qpid/trunk/qpid/cpp/LICENSE
qpid/trunk/qpid/cpp/NOTICE
qpid/trunk/qpid/cpp/QPID_VERSION.txt
qpid/trunk/qpid/cpp/README-HA.txt
qpid/trunk/qpid/cpp/README-winsdk.txt
qpid/trunk/qpid/cpp/README.txt
qpid/trunk/qpid/cpp/RELEASE_NOTES
qpid/trunk/qpid/cpp/SSL
qpid/trunk/qpid/cpp/bld-winsdk.ps1
qpid/trunk/qpid/cpp/design_docs/
qpid/trunk/qpid/cpp/docs/src/CONTENTS
qpid/trunk/qpid/cpp/docs/src/DispatchHandle.odg
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1740034&r1=1740033&r2=1740034&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Apr 20 00:02:02 2016
@@ -40,15 +40,7 @@ endif (CMAKE_CONFIGURATION_TYPES)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
-# Parse the version from QPID_VERSION.txt.
-# Use the top level qpid/ file if we're in an SVN checkout, source dir otherwise.
-find_file(QPID_VERSION_FILE NAMES QPID_VERSION.txt PATHS ${PROJECT_SOURCE_DIR}/.. ${PROJECT_SOURCE_DIR} NO_DEFAULT_PATH)
-mark_as_advanced(QPID_VERSION_FILE)
-if(NOT QPID_VERSION_FILE)
- message(FATAL_ERROR "Cannot find QPID_VERSION.txt")
-endif(NOT QPID_VERSION_FILE)
-
-file(READ ${QPID_VERSION_FILE} QPID_VERSION)
+file(READ VERSION.txt QPID_VERSION)
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}")
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}")
set (QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}")
@@ -71,7 +63,7 @@ endif (MSVC)
# Overall packaging/install options.
# This section also has all the setup for various packaging-specific options.
-set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
if (WIN32)
# Include installing the MSVCRT library
set (CMAKE_INSTALL_DEBUG_LIBRARIES ON)
@@ -88,7 +80,7 @@ endif (WIN32)
set_absolute_install_path (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf)
set_absolute_install_path (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf)
-install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
+install(FILES LICENSE.txt NOTICE.txt DESTINATION ${QPID_INSTALL_DOCDIR})
install(FILES include/qmf/qmf2.i
DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf)
Added: qpid/trunk/qpid/cpp/README.md
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/README.md?rev=1740034&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/README.md (added)
+++ qpid/trunk/qpid/cpp/README.md Wed Apr 20 00:02:02 2016
@@ -0,0 +1,59 @@
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+-->
+
+# Qpid C++
+
+## Introduction
+
+Qpid C++ is a C++ implementation of the AMQP protocol described at
+<http://amqp.org/>.
+
+For additional software or information on the Qpid project go to:
+
+> <http://qpid.apache.org>
+
+For documentation, go to:
+
+> <http://qpid.apache.org/documentation>
+
+## Available documentation
+
+ - INSTALL.txt - How to install Qpid C++
+ - LICENSE.txt - The Apache license
+ - NOTICE.txt - Corresponds to the section 4 d of the Apache License,
+ Version 2.0
+ - docs/ - Feature and design notes, other documentation
+
+## Quick start
+
+In C++ distributions:
+
+ mkdir BLD # The recommended way to use cmake is in a separate
+ # build directory
+ cd BLD
+ cmake .. # Generates code and makefiles
+ make test # Runs tests
+ make install # Installs the client and daemon
+
+The INSTALL.txt notes contain more detailed information on compiling
+and installing this software.
+
+qpid/cpp/examples/README.txt describes the C++ client API examples.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org