diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bld-winsdk.ps1 | 22 | ||||
| -rw-r--r-- | cpp/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cpp/src/tests/CMakeLists.txt | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/cpp/bld-winsdk.ps1 b/cpp/bld-winsdk.ps1 index 5b551f948b..8e421749b9 100644 --- a/cpp/bld-winsdk.ps1 +++ b/cpp/bld-winsdk.ps1 @@ -54,8 +54,10 @@ cmake -G "Visual Studio 9 2008" "-DCMAKE_INSTALL_PREFIX=$install_dir" $qpid_cpp_ devenv qpid-cpp.sln /build "Release|Win32" /project docs-user-api
# Build both debug and release so we can ship both sets of libs
-devenv qpid-cpp.sln /build "Release|Win32" /project INSTALL
+# (Do release after debug so that the release executables overwrite the
+# debug executables)
devenv qpid-cpp.sln /build "Debug|Win32" /project INSTALL
+devenv qpid-cpp.sln /build "Release|Win32" /project INSTALL
# This is kludgy until we have more than one entry as the array declaration syntax
# can't cope with just one nested array
@@ -71,12 +73,26 @@ $preserve=( 'include/qpid/sys/windows/IntegerTypes.h', 'include/qpid/sys/posix/IntegerTypes.h',
'include/qpid/types',
'include/qpid/CommonImportExport.h')
-$removable=(
+$remove=(
'bin/qpidd.exe', 'bin/qpidbroker*.*',
'bin/qmfengine*.*', 'bin/qpidxarm*.*',
'bin/boost_regex*.*', 'bin/boost*.lib',
'bin/boost',
'conf',
+ 'examples/direct',
+ 'examples/failover',
+ 'examples/fanout',
+ 'examples/messaging/drain.cpp',
+ 'examples/messaging/spout.cpp',
+ 'examples/messaging/messaging_drain.vcproj',
+ 'examples/messaging/messaging_spout.vcproj',
+ 'examples/pub-sub',
+ 'examples/qmf-console',
+ 'examples/request-response',
+ 'examples/tradedemo',
+ 'examples/old-examples.sln',
+ 'examples/README.*',
+ 'examples/verify*',
'include',
'plugins')
@@ -96,7 +112,7 @@ foreach ($pattern in $preserve) { Move-Item -force -path "$install_dir/$pattern" -destination "$preserve_dir/$pattern"
}
# Remove everything to remove
-foreach ($pattern in $removable) {
+foreach ($pattern in $remove) {
Remove-Item -recurse "$install_dir/$pattern"
}
# Copy back the preserved things
diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt index 7ecffed4bb..da8e39e944 100644 --- a/cpp/examples/CMakeLists.txt +++ b/cpp/examples/CMakeLists.txt @@ -84,6 +84,7 @@ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt COMPONENT ${QPID_COMPONENT_EXAMPLES}) if (MSVC) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln + ${CMAKE_CURRENT_SOURCE_DIR}/old-examples.sln DESTINATION ${QPID_INSTALL_EXAMPLESDIR} COMPONENT ${QPID_COMPONENT_EXAMPLES}) endif (MSVC) diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt index 605c96c3e4..2da50f35ac 100644 --- a/cpp/src/tests/CMakeLists.txt +++ b/cpp/src/tests/CMakeLists.txt @@ -272,6 +272,10 @@ add_executable (qpid_send qpid_send.cpp Statistics.cpp ${platform_test_additions target_link_libraries (qpid_send qpidclient) remember_location(qpid_send) +# perftest and latencytest are generally useful so install them +install (TARGETS perftest latencytest RUNTIME + DESTINATION ${QPID_INSTALL_BINDIR}) + if (CMAKE_SYSTEM_NAME STREQUAL Windows) set (ENV{OUTDIR} ${EXECUTABLE_OUTPUT_PATH}) set (test_script_suffix ".ps1") |