From 930827d48c39b34e8950cae1a417e53bdbdade0e Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 4 Dec 2008 13:27:48 -0500 Subject: [PATCH] ENH: First draft of add_external_project functionality. Tweaks, dashboard fixing, more tests and documentation certain to follow as it gets used by others... --- Modules/AddExternalProject.cmake | 461 +++++++++++++++++++++++++++ Modules/DownloadFile.cmake | 31 ++ Modules/RepositoryInfo.txt.in | 3 + Modules/UntarFile.cmake | 94 ++++++ Tests/CMakeLists.txt | 13 + Tests/ExternalProject/CMakeLists.txt | 201 ++++++++++++ Tests/ExternalProject/Step1.tar | Bin 0 -> 5632 bytes Tests/ExternalProject/Step1.tgz | Bin 0 -> 791 bytes Tests/ExternalProject/Step1NoDir.tar | Bin 0 -> 5120 bytes Tests/ExternalProject/Step1NoDir.tgz | Bin 0 -> 770 bytes 10 files changed, 803 insertions(+) create mode 100644 Modules/AddExternalProject.cmake create mode 100644 Modules/DownloadFile.cmake create mode 100644 Modules/RepositoryInfo.txt.in create mode 100644 Modules/UntarFile.cmake create mode 100644 Tests/ExternalProject/CMakeLists.txt create mode 100644 Tests/ExternalProject/Step1.tar create mode 100644 Tests/ExternalProject/Step1.tgz create mode 100644 Tests/ExternalProject/Step1NoDir.tar create mode 100644 Tests/ExternalProject/Step1NoDir.tgz diff --git a/Modules/AddExternalProject.cmake b/Modules/AddExternalProject.cmake new file mode 100644 index 000000000..9e14bd24f --- /dev/null +++ b/Modules/AddExternalProject.cmake @@ -0,0 +1,461 @@ +# Requires CVS CMake for 'function' and '-E touch' and '--build' + + +find_package(CVS) +find_package(Subversion) + + +function(get_external_project_directories base_dir_var build_dir_var downloads_dir_var install_dir_var sentinels_dir_var source_dir_var tmp_dir_var) + set(base "${CMAKE_BINARY_DIR}/CMakeExternals") + set(${base_dir_var} "${base}" PARENT_SCOPE) + set(${build_dir_var} "${base}/Build" PARENT_SCOPE) + set(${downloads_dir_var} "${base}/Downloads" PARENT_SCOPE) + set(${install_dir_var} "${base}/Install" PARENT_SCOPE) + set(${sentinels_dir_var} "${base}/Sentinels" PARENT_SCOPE) + set(${source_dir_var} "${base}/Source" PARENT_SCOPE) + set(${tmp_dir_var} "${base}/tmp" PARENT_SCOPE) +endfunction(get_external_project_directories) + + +function(get_configure_build_working_dir name working_dir_var) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + + get_target_property(dir ${name} AEP_CONFIGURE_DIR) + if(dir) + if (IS_ABSOLUTE "${dir}") + set(working_dir "${dir}") + else() + set(working_dir "${source_dir}/${name}/${dir}") + endif() + else() + set(working_dir "${build_dir}/${name}") + endif() + + set(${working_dir_var} "${working_dir}" PARENT_SCOPE) +endfunction(get_configure_build_working_dir) + + +function(add_external_project_download_command name) + set(added 0) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + + + if(NOT added) + get_target_property(cvs_repository ${name} AEP_CVS_REPOSITORY) + if(cvs_repository) + if(NOT CVS_EXECUTABLE) + message(FATAL_ERROR "error: could not find cvs for checkout of ${name}") + endif() + + get_target_property(cvs_module ${name} AEP_CVS_MODULE) + if(NOT cvs_module) + message(FATAL_ERROR "error: no CVS_MODULE") + endif() + + get_target_property(tag ${name} AEP_CVS_TAG) + set(cvs_tag) + if(tag) + set(cvs_tag ${tag}) + endif() + + set(args -d ${cvs_repository} co ${cvs_tag} -d ${name} ${cvs_module}) + set(wd "${source_dir}") + + set(repository ${cvs_repository}) + set(module ${cvs_module}) + set(tag ${cvs_tag}) + + configure_file( + "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in" + "${sentinels_dir}/${name}-cvsinfo.txt" + @ONLY + ) + + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CVS_EXECUTABLE} ${args} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${wd} + COMMENT "Performing download step (CVS checkout) for '${name}'" + DEPENDS "${sentinels_dir}/${name}-cvsinfo.txt" + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + get_target_property(svn_repository ${name} AEP_SVN_REPOSITORY) + if(svn_repository) + if(NOT Subversion_SVN_EXECUTABLE) + message(FATAL_ERROR "error: could not find svn for checkout of ${name}") + endif() + + get_target_property(tag ${name} AEP_SVN_TAG) + set(svn_tag) + if(tag) + set(svn_tag ${tag}) + endif() + + set(args co ${svn_repository} ${svn_tag} ${name}) + set(wd "${source_dir}") + + set(repository ${svn_repository}) + set(module) + set(tag ${svn_tag}) + + configure_file( + "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in" + "${sentinels_dir}/${name}-svninfo.txt" + @ONLY + ) + + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${Subversion_SVN_EXECUTABLE} ${args} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${wd} + COMMENT "Performing download step (SVN checkout) for '${name}'" + DEPENDS "${sentinels_dir}/${name}-svninfo.txt" + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + get_target_property(dir ${name} AEP_DIR) + if(dir) + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CMAKE_COMMAND} -E copy_directory ${dir} ${source_dir}/${name} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${source_dir} + COMMENT "Performing download step (DIR copy) for '${name}'" + DEPENDS ${dir} + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + get_target_property(tar ${name} AEP_TAR) + if(tar) + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CMAKE_COMMAND} -Dfilename=${tar} -Dtmp=${tmp_dir}/${name} -Ddirectory=${source_dir}/${name} -P ${CMAKE_ROOT}/Modules/UntarFile.cmake + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${source_dir} + COMMENT "Performing download step (TAR untar) for '${name}'" + DEPENDS ${tar} + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + get_target_property(tgz ${name} AEP_TGZ) + if(tgz) + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CMAKE_COMMAND} -Dfilename=${tgz} -Dtmp=${tmp_dir}/${name} -Ddirectory=${source_dir}/${name} -P ${CMAKE_ROOT}/Modules/UntarFile.cmake + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${source_dir} + COMMENT "Performing download step (TGZ untar) for '${name}'" + DEPENDS ${tgz} + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + get_target_property(tgz_url ${name} AEP_TGZ_URL) + if(tgz_url) + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CMAKE_COMMAND} -Dremote=${tgz_url} -Dlocal=${downloads_dir}/${name}.tgz -P ${CMAKE_ROOT}/Modules/DownloadFile.cmake + COMMAND ${CMAKE_COMMAND} -Dfilename=${downloads_dir}/${name} -Dtmp=${tmp_dir}/${name} -Ddirectory=${source_dir}/${name} -P ${CMAKE_ROOT}/Modules/UntarFile.cmake + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${source_dir} + COMMENT "Performing download step (TGZ_URL download and untar) for '${name}'" + DEPENDS ${downloads_dir}/${name}.tgz + ) + set(added 1) + endif() + endif(NOT added) + + if(NOT added) + get_target_property(tar_url ${name} AEP_TAR_URL) + if(tar_url) + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-download + COMMAND ${CMAKE_COMMAND} -Dremote=${tar_url} -Dlocal=${downloads_dir}/${name}.tar -P ${CMAKE_ROOT}/Modules/DownloadFile.cmake + COMMAND ${CMAKE_COMMAND} -Dfilename=${downloads_dir}/${name} -Dtmp=${tmp_dir}/${name} -Ddirectory=${source_dir}/${name} -P ${CMAKE_ROOT}/Modules/UntarFile.cmake + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-download + WORKING_DIRECTORY ${source_dir} + COMMENT "Performing download step (TAR_URL download and untar) for '${name}'" + DEPENDS ${downloads_dir}/${name}.tar + ) + set(added 1) + endif() + endif(NOT added) + + + if(NOT added) + message(SEND_ERROR "error: no download info for '${name}'") + endif(NOT added) +endfunction(add_external_project_download_command) + + +function(add_external_project_configure_command name) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + get_configure_build_working_dir(${name} working_dir) + + # Create the working_dir for configure, build and install steps: + # + add_custom_command( + OUTPUT ${working_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${working_dir} + DEPENDS ${sentinels_dir}/${name}-download + ) + + get_target_property(cmd ${name} AEP_CONFIGURE_COMMAND) + if(cmd STREQUAL "") + # Explicit empty string means no configure step for this project + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-configure + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-configure + WORKING_DIRECTORY ${working_dir} + COMMENT "No configure step for '${name}'" + DEPENDS ${working_dir} ${sentinels_dir}/${name}-download + ) + else() + if(NOT cmd) + set(cmd ${CMAKE_COMMAND}) + endif() + + set(args "") + get_target_property(configure_args ${name} AEP_CONFIGURE_ARGS) + if(configure_args) + set(args "${configure_args}") + separate_arguments(args) + endif() + + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-configure + COMMAND ${cmd} ${args} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-configure + WORKING_DIRECTORY ${working_dir} + COMMENT "Performing configure step for '${name}'" + DEPENDS ${working_dir} ${sentinels_dir}/${name}-download + ) + endif() +endfunction(add_external_project_configure_command) + + +function(add_external_project_build_command name) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + get_configure_build_working_dir(${name} working_dir) + + get_target_property(cmd ${name} AEP_BUILD_COMMAND) + if(cmd STREQUAL "") + # Explicit empty string means no build step for this project + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-build + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-build + WORKING_DIRECTORY ${working_dir} + COMMENT "No build step for '${name}'" + DEPENDS ${sentinels_dir}/${name}-configure + ) + else() + if(NOT cmd) + set(cmd ${CMAKE_COMMAND}) + endif() + + get_target_property(args ${name} AEP_BUILD_ARGS) + if(NOT args) + set(args --build ${working_dir} --config ${CMAKE_CFG_INTDIR}) + endif() + + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-build + COMMAND ${cmd} ${args} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-build + WORKING_DIRECTORY ${working_dir} + COMMENT "Performing build step for '${name}'" + DEPENDS ${sentinels_dir}/${name}-configure + ) + endif() +endfunction(add_external_project_build_command) + + +function(add_external_project_install_command name) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + get_configure_build_working_dir(${name} working_dir) + + get_target_property(cmd ${name} AEP_INSTALL_COMMAND) + if(cmd STREQUAL "") + # Explicit empty string means no install step for this project + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-install + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-install + WORKING_DIRECTORY ${working_dir} + COMMENT "No install step for '${name}'" + DEPENDS ${sentinels_dir}/${name}-build + ) + else() + if(NOT cmd) + set(cmd ${CMAKE_COMMAND}) + endif() + + get_target_property(args ${name} AEP_INSTALL_ARGS) + if(NOT args) + set(args --build ${working_dir} --config ${CMAKE_CFG_INTDIR} --target install) + endif() + + add_custom_command( + OUTPUT ${sentinels_dir}/${name}-install + COMMAND ${cmd} ${args} + COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-install + WORKING_DIRECTORY ${working_dir} + COMMENT "Performing install step for '${name}'" + DEPENDS ${sentinels_dir}/${name}-build + ) + endif() +endfunction(add_external_project_install_command) + + +function(add_CMakeExternals_target) + if(NOT TARGET CMakeExternals) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + + add_custom_command( + OUTPUT ${tmp_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${build_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${downloads_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${sentinels_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${tmp_dir} + ) + + add_custom_target(CMakeExternals ALL + DEPENDS ${tmp_dir} + ) + endif() +endfunction(add_CMakeExternals_target) + + +function(add_external_project name) + get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + + add_CMakeExternals_target() + + add_custom_target(${name} ALL + DEPENDS ${sentinels_dir}/${name}-install + ) + set_target_properties(${name} PROPERTIES AEP_IS_EXTERNAL_PROJECT 1) + + # Loop over ARGN by 2's extracting key/value pairs from + # the non-explicit arguments to the function: + # + list(LENGTH ARGN n) + set(i 0) + while(i LESS n) + math(EXPR j ${i}+1) + list(GET ARGN ${i} key) + list(GET ARGN ${j} value) + #message(STATUS " ${key}='${value}'") + + if(key STREQUAL "BUILD_ARGS") + set_target_properties(${name} PROPERTIES AEP_BUILD_ARGS "${value}") + endif() + + if(key STREQUAL "BUILD_COMMAND") + set_target_properties(${name} PROPERTIES AEP_BUILD_COMMAND "${value}") + endif() + + if(key STREQUAL "CONFIGURE_ARGS") + set_target_properties(${name} PROPERTIES AEP_CONFIGURE_ARGS "${value}") + endif() + + if(key STREQUAL "CONFIGURE_COMMAND") + set_target_properties(${name} PROPERTIES AEP_CONFIGURE_COMMAND "${value}") + endif() + + if(key STREQUAL "CONFIGURE_DIR") + set_target_properties(${name} PROPERTIES AEP_CONFIGURE_DIR "${value}") + endif() + + if(key STREQUAL "CVS_REPOSITORY") + set_target_properties(${name} PROPERTIES AEP_CVS_REPOSITORY "${value}") + endif() + + if(key STREQUAL "CVS_MODULE") + set_target_properties(${name} PROPERTIES AEP_CVS_MODULE "${value}") + endif() + + if(key STREQUAL "CVS_TAG") + set_target_properties(${name} PROPERTIES AEP_CVS_TAG "${value}") + endif() + + if(key STREQUAL "DEPENDS") + add_dependencies(${name} ${value}) + endif() + + if(key STREQUAL "DIR") + set_target_properties(${name} PROPERTIES AEP_DIR "${value}") + endif() + + if(key STREQUAL "INSTALL_ARGS") + set_target_properties(${name} PROPERTIES AEP_INSTALL_ARGS "${value}") + endif() + + if(key STREQUAL "INSTALL_COMMAND") + set_target_properties(${name} PROPERTIES AEP_INSTALL_COMMAND "${value}") + endif() + + if(key STREQUAL "SVN_REPOSITORY") + set_target_properties(${name} PROPERTIES AEP_SVN_REPOSITORY "${value}") + endif() + + if(key STREQUAL "SVN_TAG") + set_target_properties(${name} PROPERTIES AEP_SVN_TAG "${value}") + endif() + + if(key STREQUAL "TAR") + set_target_properties(${name} PROPERTIES AEP_TAR "${value}") + endif() + + if(key STREQUAL "TAR_URL") + set_target_properties(${name} PROPERTIES AEP_TAR_URL "${value}") + endif() + + if(key STREQUAL "TGZ") + set_target_properties(${name} PROPERTIES AEP_TGZ "${value}") + endif() + + if(key STREQUAL "TGZ_URL") + set_target_properties(${name} PROPERTIES AEP_TGZ_URL "${value}") + endif() + + math(EXPR i ${i}+2) + endwhile() + + add_external_project_download_command(${name}) + add_external_project_configure_command(${name}) + add_external_project_build_command(${name}) + add_external_project_install_command(${name}) + + add_dependencies(${name} CMakeExternals) +endfunction(add_external_project) diff --git a/Modules/DownloadFile.cmake b/Modules/DownloadFile.cmake new file mode 100644 index 000000000..db45db9f9 --- /dev/null +++ b/Modules/DownloadFile.cmake @@ -0,0 +1,31 @@ +# +# Use 'cmake -Dremote=${url} -Dlocal=${filename} -Dtimeout=${seconds} +# -P DownloadFile.cmake' to call this script... +# +if(NOT DEFINED remote) + message(FATAL_ERROR "error: required variable 'remote' not defined...") +endif() + +if(NOT DEFINED local) + message(FATAL_ERROR "error: required variable 'local' not defined...") +endif() + +if(NOT DEFINED timeout) + set(timeout 30) +endif(NOT DEFINED timeout) + +message(STATUS "info: downloading '${remote}'...") +file(DOWNLOAD "${remote}" "${local}" TIMEOUT ${timeout} STATUS status LOG log) + +list(GET status 0 status_code) +list(GET status 1 status_string) + +if(NOT status_code EQUAL 0) + message(FATAL_ERROR "error: download of '${remote}' failed +status_code: ${status_code} +status_string: ${status_string} +log: ${log} +") +endif() + +message(STATUS "info: done downloading '${remote}'...") diff --git a/Modules/RepositoryInfo.txt.in b/Modules/RepositoryInfo.txt.in new file mode 100644 index 000000000..df8e32272 --- /dev/null +++ b/Modules/RepositoryInfo.txt.in @@ -0,0 +1,3 @@ +repository='@repository@' +module='@module@' +tag='@tag@' diff --git a/Modules/UntarFile.cmake b/Modules/UntarFile.cmake new file mode 100644 index 000000000..9aa218f0d --- /dev/null +++ b/Modules/UntarFile.cmake @@ -0,0 +1,94 @@ +# +# Use 'cmake -Dfilename=${tar_or_tgz_file} -Dtmp=${tmp_directory} -Ddirectory=${final_directory} +# -P UntarFile.cmake' to call this script... +# +if(NOT DEFINED filename) + message(FATAL_ERROR "error: required variable 'filename' not defined...") +endif() + +if(NOT DEFINED tmp) + message(FATAL_ERROR "error: required variable 'tmp' not defined...") +endif() + +if(NOT DEFINED directory) + message(FATAL_ERROR "error: required variable 'directory' not defined...") +endif() + +if(NOT DEFINED args) + if(filename MATCHES ".tar$") + set(args xf) + endif() + + if(filename MATCHES ".tgz$") + set(args xfz) + endif() + + if(filename MATCHES ".tar.gz$") + set(args xfz) + endif() +endif() + + +# Make file names absolute: +# +get_filename_component(filename "${filename}" ABSOLUTE) +get_filename_component(tmp "${tmp}" ABSOLUTE) +get_filename_component(directory "${directory}" ABSOLUTE) + + +# Prepare a space for untarring: +# +#message(STATUS "info: creating empty subdir of '${tmp}'...") +set(i 1) +while(EXISTS "${tmp}/untar${i}") + math(EXPR i "${i} + 1") +endwhile() +set(ut_dir "${tmp}/untar${i}") +file(MAKE_DIRECTORY "${ut_dir}") + + +# Untar it: +# +#message(STATUS "info: untarring '${filename}' in '${ut_dir}' with '${args}'...") +execute_process(COMMAND ${CMAKE_COMMAND} -E tar ${args} ${filename} + WORKING_DIRECTORY ${ut_dir} + RESULT_VARIABLE rv) + +if(NOT rv EQUAL 0) + message(FATAL_ERROR "error: untar of '${filename}' failed") +endif() + + +# Analyze what came out of the tar file: +# +file(GLOB contents "${ut_dir}/*") + +set(is_one_directory 0) +list(LENGTH contents n) +if(n EQUAL 1) + if(IS_DIRECTORY "${contents}") + set(is_one_directory 1) + endif() +endif() + + +# Copy "the one" directory to the final directory: +# +if(is_one_directory EQUAL 1) + #message(STATUS "info: (1) copying '${contents}' to '${directory}'...") + execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${contents}" "${directory}" + RESULT_VARIABLE rv) +else() + #message(STATUS "info: (more) copying '${ut_dir}' to '${directory}'...") + execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${ut_dir}" "${directory}" + RESULT_VARIABLE rv) +endif() + +if(NOT rv EQUAL 0) + message(FATAL_ERROR "error: copy_directory failed after untar in '${ut_dir}'") +endif() + + +# Clean up: +# +file(REMOVE_RECURSE "${ut_dir}") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 05dafb0a9..dea933008 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -510,6 +510,19 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel ) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Environment") + ADD_TEST(ExternalProject ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/ExternalProject" + "${CMake_BINARY_DIR}/Tests/ExternalProject" + --build-generator ${CMAKE_TEST_GENERATOR} + --build-project ExternalProjectTest + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-exe-dir "${CMake_BINARY_DIR}/Tests/ExternalProject" + --force-new-ctest-process + --test-command ${CMAKE_CTEST_COMMAND} -VV + ) + LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject") + # do each of the tutorial steps FOREACH(STP RANGE 1 7) ADD_TEST(TutorialStep${STP} ${CMAKE_CTEST_COMMAND} diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt new file mode 100644 index 000000000..086159caa --- /dev/null +++ b/Tests/ExternalProject/CMakeLists.txt @@ -0,0 +1,201 @@ +cmake_minimum_required(VERSION 2.6) +project(ExternalProjectTest NONE) + +include(AddExternalProject) + +get_external_project_directories(base_dir build_dir downloads_dir install_dir + sentinels_dir source_dir tmp_dir) + +set(prefix "${install_dir}") + + +# Local DIR: +# +set(proj TutorialStep5-Local) +add_external_project(${proj} + DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" +) + + +# Local TAR: +# +set(proj TutorialStep1-LocalTAR) +add_external_project(${proj} + TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" +) + +set(proj TutorialStep1-LocalNoDirTAR) +add_external_project(${proj} + TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" +) + + +# Local TGZ: +# +set(proj TutorialStep1-LocalTGZ) +add_external_project(${proj} + TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" +) + +set(proj TutorialStep1-LocalNoDirTGZ) +add_external_project(${proj} + TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" +) + + +# Download TAR: +# +# TODO: Add a remote .tar file + + +# Download TGZ: +# +# TODO: Add a remote .tgz file + + +# Download CVS: +# +if(CVS_EXECUTABLE) + # CVS by date stamp: + # + set(proj KWStyle-20081201) + add_external_project(${proj} + CVS_REPOSITORY ":pserver:anoncvs@public.kitware.com:/cvsroot/KWStyle" + CVS_MODULE "KWStyle" + CVS_TAG "-D\;2008-12-01 01:00:00 UTC" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + ) + + # CVS by tag: + # + set(proj kwsys-from-CMake-2-6-2) + add_external_project(${proj} + CVS_REPOSITORY ":pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake" + CVS_MODULE "CMake/Source/kwsys" + CVS_TAG "-r\;CMake-2-6-2" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" + ) + + # Live CVS / HEAD (no CVS_TAG): + # + set(proj TutorialStep1-CVSHEAD) + add_external_project(${proj} + CVS_REPOSITORY ":pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake" + CVS_MODULE "CMake/Tests/Tutorial/Step1" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" + ) +endif() + + +# Download SVN: +# +if(Subversion_SVN_EXECUTABLE) + # SVN by date stamp: + # + set(proj gdcm-md5-20081204) + add_external_project(${proj} + SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5" + SVN_TAG "-r\;{2008-12-04 01:00:00 +0000}" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + ) + + # SVN by revision number: + # + set(proj gdcm-md5-r4824) + add_external_project(${proj} + SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5" + SVN_TAG "-r\;4824" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" + ) + + # Live SVN / trunk (no SVN_TAG): + # + set(proj gdcm-md5-SVNtrunk) + add_external_project(${proj} + SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + INSTALL_COMMAND "" + ) +endif() + + +# Test the testable built/installed products: +# +enable_testing() + + +# Use these as input to the KWStyle tests: +# +set(kwstyleXmlFile "${source_dir}/KWStyle-20081201/Testing/Data/0001-KWStyleConfiguration.kws.xml") +set(header "${install_dir}/include/TutorialConfig.h") + + +# Do at least a smoke test of a built executable from each +# project's build directory... +# +# BuildTree tests: +# +add_test(TutorialStep5-Local-BuildTreeTest + "${build_dir}/TutorialStep5-Local/Tutorial" 42) + +add_test(TutorialStep1-LocalTAR-BuildTreeTest + "${build_dir}/TutorialStep1-LocalTAR/Tutorial" 36) + +add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest + "${build_dir}/TutorialStep1-LocalNoDirTAR/Tutorial" 25) + +add_test(TutorialStep1-LocalTGZ-BuildTreeTest + "${build_dir}/TutorialStep1-LocalTGZ/Tutorial" 16) + +add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest + "${build_dir}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9) + +if(CVS_EXECUTABLE) + add_test(KWStyle-20081201-BuildTreeTest + "${build_dir}/KWStyle-20081201/KWStyle" -xml "${kwstyleXmlFile}" "${header}") + + add_test(kwsys-from-CMake-2-6-2-BuildTreeTest + "${build_dir}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1) + + add_test(TutorialStep1-CVSHEAD-BuildTreeTest + "${build_dir}/TutorialStep1-LocalNoDirTGZ/Tutorial" 4) +endif() + +if(Subversion_SVN_EXECUTABLE) + add_test(gdcm-md5-20081204-BuildTreeTest + "${build_dir}/gdcm-md5-20081204/md5main" --version) + + add_test(gdcm-md5-r4824-BuildTreeTest + "${build_dir}/gdcm-md5-r4824/md5main" --version) + + add_test(gdcm-md5-SVNtrunk-BuildTreeTest + "${build_dir}/gdcm-md5-SVNtrunk/md5main" --version) +endif() + + +# InstallTree tests: +# +add_test(TutorialStep5-InstallTreeTest + "${install_dir}/bin/Tutorial" 49) + +if(CVS_EXECUTABLE) + add_test(KWStyle-InstallTreeTest + "${install_dir}/bin/KWStyle" -xml "${kwstyleXmlFile}" "${header}") +endif() + +if(Subversion_SVN_EXECUTABLE) + add_test(gdcm-md5-InstallTreeTest + "${install_dir}/bin/md5main" --version) +endif() diff --git a/Tests/ExternalProject/Step1.tar b/Tests/ExternalProject/Step1.tar new file mode 100644 index 0000000000000000000000000000000000000000..3711f07fb32155892d64834cd35d2755def21594 GIT binary patch literal 5632 zcmeHKZExBz5ax4!#fc6HCIksDMOwS5UDpp(Ynh;}G<8*E5(m5`F|{4aRQ12_Yyu?+ z+7F}BUg9s{^ZERopX9mAK+%a)FTCo2mfdN$p#T7#{rN96T4s(WJ#27rw42TSPOAkt zX*O&qv|klf8a$DTh=OhVWXgPxhjh!K=oSQ9*8XDi!0>-^PJYnOOe$GZGqvk<9Q#@R z9lP0F^55<>k^h#XpBH=AKsLqu&-wQvWZsQf%%UW61-(m{pgxqZPy2&z?*baN{fada z{5$m&lrIy-1tVd_vi9I|OkqleWITpAiH20vEJ;_q+%$-Letg#JgHzeI+`YhM+XVG^ z9I#O$C=eJ^;!^iEPsoQ_7FLFCE2x{XRi;G$BkKK#o{@2ak+SMdLeBXc= zvY3dUpaeDG4K7NAH^w~F7y>SU#a@{B)Fi0kOAVhWxTkQ>!VvAT59_e3beHQRQJ$uQ z%JND|D%VR1`oDW3Hbkt~;TR-~CaAF}^CLl`xd?eYnk0(KxuV`B1SMH;uC(})RPU|5g@heS z0)V_?RxUO$S3l&a5L|6=E{f~%|R|RiO1iZ!n)0^9h^?+*20x0V> zID|$8=K$IY5KIJa3(AOyC#qU3Nw`j{RLQTE{BLowY88+AWoy_=KDv-q z4mQHLl4L~R0iv1LN)01DIo%V&zjc*#4V@b(rK#!%cJj zUp(zAz0VGDzo7s4Ex4}#ZO6gyzr6q7AqiVTq5kXEblE2Rz$XejdI(#S+OjS-f+(q0eiv^-F$x=gtm)8+W*cO{l&g; zrIo2?deb#*>)HO>RYg9>zZH8Y zuIUR<&r3;+ctquI(2}tQFGi(1!S~P;@Pz~(xk2o)^aT_8DsiJ4ZW-M2AV7QM!FnN* zM>!rg%1!2&GKxu7R|v5gb7M_M0V8N~9v&AB0i6#_cQ&h$zr8d|Yyp}6FE@VkHD1zx zRQ`4Sx2#hCw}M6kjzRHoisFbeKbADiM93B4G}cUI%5@!6lw>J{PQ;hydQW!d682tc zj|+41an%&?(W)&(?OU-_9}6ieoQ9C{2#jPz<=Cx*JE0QZ;`rwKRgK)C+HxO^WDefL zUX3IR=`OwcQ;A`|f#pT4>(yNam-#NW>zTXWkEmKFu!J-1>67?DP3GBor4Ppi#fNJ3zX`r12=1y2-$xB^J zZ9K%Kj_Ztuj~lx?2CneB_KhAA)tBp}S##FbA-OMijDHWA{ui8mHdx~Y{m1dT{beyesN6pKuk4ir2>kF&-vLpJ+96d3EA-&9!=R38VN_m_M>Ow(jS0=xWs-$ VN?j>YqC|3GKTj{h{dXf4vnYvN zL2nZ#s1KE^AZM-+Gf3K#F`vkSPS zV)0laBLr!?gD>lQJ&roDl01~t&l9`2+=w95=BNKwUDFxI9%>3sC0Yl-h5uQ z{+~l$Wb$kU){hsS`e(7*PQ0N1_$_Fgk3g%{X(1N%A0LfE|F^C8CVqQ+My-}I=>wlC zRCEah#V6BNBUjl`v37lm(nOciw5Ici88B}@{EMIY06gKR?T1#OM4RmBX4qB9-^}y% z=ojw4<2dR4@1hboP2K<5cBi=iudnd-NWA|?AXzlU9t+#Nu^`c+3GsL|O%#xI$%``X5q$G{|%$7?lu3{-=a dbxhQhwY_gW6gs{AJuEzn3KSJ6D)6r>@CSzD>0bZ< literal 0 HcmV?d00001 diff --git a/Tests/ExternalProject/Step1NoDir.tgz b/Tests/ExternalProject/Step1NoDir.tgz new file mode 100644 index 0000000000000000000000000000000000000000..71a2d814217eade48fa2856e7e83f32cbc6ff53b GIT binary patch literal 770 zcmV+d1O5CTiwFP!000001MOB_Z`v>v<=MaDiVi7EC{6g3)^2LY`ardoiPB2bRz)Up zz*`bi+i97q{`cLOK%u4U%V3(6^WZqw_bah;a=K^qC;QBmR<@q$(pKO)PN&s^5&(4C z^DESw^DDx28VwveoqFAEcIqx#8g8otC1*SBtRq#L%97&*^p*#{h}a8$=oW^%XlS?a zW88l)<_V9}*puug<&p(pU7ZXrdi`^#+wCfuO7VmF8mwWeh2%7<60!%w34>cE6&DF4 zX*^=mCW@_id3h4=?D(`l0Jr+ma_=0M9h1}-Nyx{kWI$oUXuu?dJYt{)OsP_!M9e^h zps{#2JG+26HBZJ0gV8CoE0Ic{VXAvZni#ym^GBQQM}LSjKY$H!nf-_qOtd|$QvSATyr%zLH~;=S$OLX9 z(|?ZBF24U=0KflZP&}TZI6|2>mNcG=5MRX8R5LYKE;lJfNhXERnfRi)-XnVp33I4) zz=b{eux^U@Xx$d0_F1!(p9?8eI2vNg6R@%wm1DmK{)9?+i}TxW*Hv3*!tx^3wQ@zlRjyJifn5o{C*>M}6_}*X^}2C0hrQ;L@m2L;V;h%> zj@diFZszYUYa_3mM@XhqnSeXLd%zJRQJHfh!!JyraiNwbeQ%Yu>eUKpqO7E>NIAf&T};0Tl0fbO00p0OR6? A3jhEB literal 0 HcmV?d00001