Revision: 49441
http://brlcad.svn.sourceforge.net/brlcad/?rev=49441&view=rev
Author: starseeker
Date: 2012-02-16 03:01:22 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Be quieter about a few things during distcheck...
Modified Paths:
--------------
brlcad/trunk/misc/CMake/Distcheck.cmake
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Modified: brlcad/trunk/misc/CMake/Distcheck.cmake
===================================================================
--- brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 02:30:02 UTC (rev
49440)
+++ brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 03:01:22 UTC (rev
49441)
@@ -8,7 +8,7 @@
# Determine how to trigger the build in the distcheck target
if("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}" MATCHES
"Make" OR NOT cmake_generator))
- set(DISTCHECK_BUILD_CMD "${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE)")
+ set(DISTCHECK_BUILD_CMD "${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE) > distcheck_compilation_log")
else("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}" MATCHES
"Make" OR NOT cmake_generator))
set(DISTCHECK_BUILD_CMD "COMMAND ${CMAKE_COMMAND} -E build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build")
endif("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}"
MATCHES "Make" OR NOT cmake_generator))
Modified: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 02:30:02 UTC
(rev 49440)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 03:01:22 UTC
(rev 49441)
@@ -1,48 +1,48 @@
add_custom_target(distcheck
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 1: Check files in Source
Repository against files specified in Build Logic"
- COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 2: Create source tgz, tbz2 and
zip archives from toplevel archive."
- COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 3: Expand tgz archive and
prepare to build using the Debug configuration from archive sources."
- COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS="Bundled"
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 4: Compile using source from
tgz archive."
- COMMAND @DISTCHECK_BUILD_CMD@
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 5: Run build-directory
regression and benchmark testing from tgz archive compilation."
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress
- COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 6: Install from tgz build
directory."
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 7: Clear tgz archive sources
and build directory."
- COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 8: Run benchmark testing from
tgz archive installed build."
- COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
- COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark
clean
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 9: Do it all again using the
Release build configuration."
- COMMAND ${CMAKE_COMMAND} -E remove summary
- COMMAND ${CMAKE_COMMAND} -E remove run-*.log
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS="Bundled"
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND @DISTCHECK_BUILD_CMD@
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress
- COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install
- COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
- COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark
clean
- COMMAND ${CMAKE_COMMAND} -E remove summary
- COMMAND ${CMAKE_COMMAND} -E remove run-*.log
- COMMAND ${CMAKE_COMMAND} -E echo "Stage 10: Final Cleanup."
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- # The source repository verification script is responsible for
generating this file
- COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_message
-)
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 1: Check files in Source Repository
against files specified in Build Logic"
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 2: Create source tgz, tbz2 and zip
archives from toplevel archive."
+ COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 3: Expand tgz archive and prepare
to build using the Debug configuration from archive sources."
+ COMMAND ${CMAKE_COMMAND} -E tar xzf ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E chdir _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
${CMAKE_COMMAND} ../${CPACK_SOURCE_PACKAGE_FILE_NAME}
-DBRLCAD_BUNDLED_LIBS="Bundled"
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 4: Compile using source from tgz
archive."
+ COMMAND @DISTCHECK_BUILD_CMD@
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 5: Run build-directory regression
and benchmark testing from tgz archive compilation."
+ COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
--target regress
+ COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 6: Install from tgz build
directory."
+ COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
--target install
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 7: Clear tgz archive sources and
build directory."
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 8: Run benchmark testing from tgz
archive installed build."
+ COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
+ COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark clean
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 9: Do it all again using the
Release build configuration."
+ COMMAND ${CMAKE_COMMAND} -E remove summary
+ COMMAND ${CMAKE_COMMAND} -E remove run-*.log
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E tar xzf ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E chdir _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
${CMAKE_COMMAND} ../${CPACK_SOURCE_PACKAGE_FILE_NAME}
-DBRLCAD_BUNDLED_LIBS="Bundled" -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND @DISTCHECK_BUILD_CMD@
+ COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
--target regress
+ COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
+ COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
--target install
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
+ COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark clean
+ COMMAND ${CMAKE_COMMAND} -E remove summary
+ COMMAND ${CMAKE_COMMAND} -E remove run-*.log
+ COMMAND ${CMAKE_COMMAND} -E echo "Stage 10: Final Cleanup."
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ # The source repository verification script is responsible for generating
this file
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_message
+ )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
