Revision: 49440
          http://brlcad.svn.sourceforge.net/brlcad/?rev=49440&view=rev
Author:   starseeker
Date:     2012-02-16 02:30:02 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Make a stab at cleaning up the distcheck logic a bit, or at least reducing the 
line count of the logic needed to define it...

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt
    brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in

Added Paths:
-----------
    brlcad/trunk/misc/CMake/Distcheck.cmake
    brlcad/trunk/misc/CMake/distcheck_target.cmake.in

Removed Paths:
-------------
    brlcad/trunk/misc/CMake/distcheck_message.in

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2012-02-16 02:20:48 UTC (rev 49439)
+++ brlcad/trunk/CMakeLists.txt 2012-02-16 02:30:02 UTC (rev 49440)
@@ -2053,133 +2053,11 @@
 DISTCLEAN(${CMAKE_BINARY_DIR}/Makefile)
 DISTCLEAN(${CMAKE_BINARY_DIR}/include/brlcad_config.h.in)
 
-#  Define a target distcheck.  This performs the following steps to test
-#  whether BRL-CAD is in a distribution ready state:
-# 
-#  1.  Check the files currently in the source directories against
-#      known file lists generated by CMake and Subversion. There are
-#      two hard fail cases - files in Subversion not accounted for by
-#      the build logic, and build logic files not in Subversion.  Files
-#      not accounted for by either are assumed to be temporary and will
-#      be excluded from the archive files.
-#  2.  Run CPack to generate source tarballs.
-#  3.  Expand the tarball into a subdirectory, make a build directory,
-#      cd into the build directory, and configure BRL-CAD for a local
-#      build and install.
-#  4.  Perform the build using the Debug configuration.
-#  5.  Run the regression and benchmark targets in the build directory.
-#  6.  Install to the local install directory.
-#  7.  Clear the tgz expanded sources and build files.
-#  8.  Run benchmark from the installed directory.
-#  9.  Repeat 3 through 8 using the Release build type.
-# 10.  Clean up.
+#  Define a distcheck target.  This performs a variety of tests to determine
+#  whether BRL-CAD is in a distribution ready state.
+include(${BRLCAD_CMAKE_DIR}/Distcheck.cmake)
+DEFINE_DISTCHECK_TARGET()
 
-# If we're doing a Make based build, we want the Make command.  Otherwise
-# fall back on cmake --build, with the limitations imposed by that option.
-# This really needs to migrate to it's own .cmake file, too complex for a
-# series of COMMAND statements.
-if(NOT IS_SUBBUILD)
-  find_program(CPACK_EXEC cpack)
-  mark_as_advanced(CPACK_EXEC)
-  configure_file(${BRLCAD_CMAKE_DIR}/distcheck_buildsys.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake @ONLY)
-
-  if("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}" MATCHES 
"Make" OR NOT cmake_generator))
-    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 ${CMAKE_COMMAND} -E chdir 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE)
-      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 tar xvzf 
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
-      COMMAND ${CMAKE_COMMAND} -E make_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build
-      COMMAND ${CMAKE_COMMAND} -E make_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install
-      COMMAND ${CMAKE_COMMAND} -E chdir 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-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}-release-install
-      COMMAND ${CMAKE_COMMAND} -E chdir 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build $(MAKE)
-      COMMAND ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build --target regress
-      COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build --target benchmark
-      COMMAND ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-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}-release-build
-      COMMAND TIMEFRAME=1 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install/${BIN_DIR}/benchmark run
-      COMMAND 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-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: Cleanup."
-      COMMAND ${CMAKE_COMMAND} -E remove_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
-      COMMAND ${CMAKE_COMMAND} -E remove_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install
-      COMMAND ${CMAKE_COMMAND} -P 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_message
-      )
-  else("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}" MATCHES 
"Make" OR NOT cmake_generator))
-    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 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 ${CMAKE_COMMAND} -E build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
-      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 tar xvzf 
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
-      COMMAND ${CMAKE_COMMAND} -E make_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build
-      COMMAND ${CMAKE_COMMAND} -E make_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install
-      COMMAND ${CMAKE_COMMAND} -E chdir 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build ${CMAKE_COMMAND} 
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS="Bundled" 
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}--release-install
-      COMMAND ${CMAKE_COMMAND} -E build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
-      COMMAND ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build --target regress
-      COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build --target benchmark
-      COMMAND ${CMAKE_COMMAND} --build 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-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}-release-build
-      COMMAND TIMEFRAME=1 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install/${BIN_DIR}/benchmark run
-      COMMAND 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-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: Cleanup."
-      COMMAND ${CMAKE_COMMAND} -E remove_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
-      COMMAND ${CMAKE_COMMAND} -E remove_directory 
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install
-      COMMAND ${CMAKE_COMMAND} -P 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_message
-      )
-  endif("${CMAKE_GENERATOR}" MATCHES "Make" AND ("${cmake_generator}" MATCHES 
"Make" OR NOT cmake_generator))
-endif(NOT IS_SUBBUILD)
-
-
 # Mark various miscellaneous things as advanced that we don't want in our
 # default view
 mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY)

Added: brlcad/trunk/misc/CMake/Distcheck.cmake
===================================================================
--- brlcad/trunk/misc/CMake/Distcheck.cmake                             (rev 0)
+++ brlcad/trunk/misc/CMake/Distcheck.cmake     2012-02-16 02:30:02 UTC (rev 
49440)
@@ -0,0 +1,21 @@
+macro(DEFINE_DISTCHECK_TARGET)
+  if(NOT IS_SUBBUILD)
+    find_program(CPACK_EXEC cpack)
+    mark_as_advanced(CPACK_EXEC)
+
+    # Set up the script that will be used to verify the source archives
+    configure_file(${BRLCAD_CMAKE_DIR}/distcheck_buildsys.cmake.in 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake @ONLY)
+
+    # 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)")
+    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))
+
+    # Based on the build command, generate a distcheck target definition from 
the template
+    configure_file(${BRLCAD_CMAKE_DIR}/distcheck_target.cmake.in 
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_target.cmake @ONLY)
+    include(${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_target.cmake)
+
+  endif(NOT IS_SUBBUILD)
+endmacro(DEFINE_DISTCHECK_TARGET)


Property changes on: brlcad/trunk/misc/CMake/Distcheck.cmake
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-16 02:20:48 UTC 
(rev 49439)
+++ brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-16 02:30:02 UTC 
(rev 49440)
@@ -308,7 +308,7 @@
   UPDATE_CPACK_CONFIGS()
 endif(${IGNORE_COUNT} LESS 51)
 
-# All done - print result messages and configure the appropriate final message 
for the distcheck build.
+# All done - print result messages and prepare the appropriate final message 
for the distcheck build.
 set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---")
 if(NOT_DISTCHECK_READY)
   set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** WARNING - archive 
files contain modified sources, NOT suitable for distribution! ***")
@@ -316,7 +316,7 @@
 if(NOT SVN_EXEC OR NOT EXISTS @CMAKE_SOURCE_DIR@/.svn)
   set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** WARNING - distcheck 
run without subversion based checks!  Archive files may not be suitable for 
distribution. ***")
 endif(NOT SVN_EXEC OR NOT EXISTS @CMAKE_SOURCE_DIR@/.svn)
-configure_file(@CMAKE_SOURCE_DIR@/misc/CMake/distcheck_message.in 
@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_message @ONLY) 
+file(WRITE @CMAKE_BINARY_DIR@/CMakeTmp/distcheck_message 
"${FINAL_DIST_MESSAGE}")
 
 # If we got this far, it worked
 message("Stage 1: Passed")

Deleted: brlcad/trunk/misc/CMake/distcheck_message.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_message.in        2012-02-16 02:20:48 UTC 
(rev 49439)
+++ brlcad/trunk/misc/CMake/distcheck_message.in        2012-02-16 02:30:02 UTC 
(rev 49440)
@@ -1 +0,0 @@
-MESSAGE("@FINAL_DIST_MESSAGE@")

Added: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in                           
(rev 0)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in   2012-02-16 02:30:02 UTC 
(rev 49440)
@@ -0,0 +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
+)


Property changes on: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

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

Reply via email to