diff options
author | Craig Scott <craig.scott@crascit.com> | 2018-11-05 04:58:24 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-11-05 12:56:03 (GMT) |
commit | 20d5e77a270639a124fea587bb68b2fb6a5356fc (patch) | |
tree | c08b444f63cad8d3b337dc21ae4684f3cd0aeba5 /Tests/RunCMake/CPack/tests/EXT | |
parent | 44cc305ac12d58fe476f815b89f42288455e44a9 (diff) | |
download | CMake-20d5e77a270639a124fea587bb68b2fb6a5356fc.zip CMake-20d5e77a270639a124fea587bb68b2fb6a5356fc.tar.gz CMake-20d5e77a270639a124fea587bb68b2fb6a5356fc.tar.bz2 |
CPack: Rename Ext generator to External
Ext and External were used inconsistently in the code and the
docs. This change converts all uses of Ext to External, including
within variable names used by the generator.
Diffstat (limited to 'Tests/RunCMake/CPack/tests/EXT')
9 files changed, 0 insertions, 315 deletions
diff --git a/Tests/RunCMake/CPack/tests/EXT/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/EXT/ExpectedFiles.cmake deleted file mode 100644 index 91608c9..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/ExpectedFiles.cmake +++ /dev/null @@ -1,7 +0,0 @@ -if(RunCMake_SUBTEST_SUFFIX MATCHES "^(none|good(_multi)?|invalid_good)$" - OR RunCMake_SUBTEST_SUFFIX STREQUAL "stage_and_package") - set(EXPECTED_FILES_COUNT "1") - set(EXPECTED_FILE_CONTENT_1_LIST "/share;/share/cpack-test;/share/cpack-test/f1.txt;/share/cpack-test/f2.txt;/share/cpack-test/f3.txt;/share/cpack-test/f4.txt") -else() - set(EXPECTED_FILES_COUNT "0") -endif() diff --git a/Tests/RunCMake/CPack/tests/EXT/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/EXT/VerifyResult.cmake deleted file mode 100644 index 97b74f7..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/VerifyResult.cmake +++ /dev/null @@ -1,3 +0,0 @@ -if(RunCMake_SUBTEST_SUFFIX MATCHES "^(none|good(_multi)?|invalid_good)") - check_ext_json("${src_dir}/tests/EXT/expected-json-1.0.txt" "${FOUND_FILE_1}") -endif() diff --git a/Tests/RunCMake/CPack/tests/EXT/bad_major-stderr.txt b/Tests/RunCMake/CPack/tests/EXT/bad_major-stderr.txt deleted file mode 100644 index 372c5e4..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/bad_major-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error at .*/Modules/Internal/CPack/CPackExt\.cmake:[0-9]+ \(message\): - Could not find a suitable version in CPACK_EXT_REQUESTED_VERSIONS - - -CPack Error: Error while executing CPackExt\.cmake -CPack Error: Cannot initialize the generator Ext diff --git a/Tests/RunCMake/CPack/tests/EXT/bad_minor-stderr.txt b/Tests/RunCMake/CPack/tests/EXT/bad_minor-stderr.txt deleted file mode 100644 index 372c5e4..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/bad_minor-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error at .*/Modules/Internal/CPack/CPackExt\.cmake:[0-9]+ \(message\): - Could not find a suitable version in CPACK_EXT_REQUESTED_VERSIONS - - -CPack Error: Error while executing CPackExt\.cmake -CPack Error: Cannot initialize the generator Ext diff --git a/Tests/RunCMake/CPack/tests/EXT/create_package.cmake b/Tests/RunCMake/CPack/tests/EXT/create_package.cmake deleted file mode 100644 index e308ccb..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/create_package.cmake +++ /dev/null @@ -1,24 +0,0 @@ -message("This script could run an external packaging tool") - -function(expect_variable VAR) - if(NOT ${VAR}) - message(FATAL_ERROR "${VAR} is unexpectedly not set") - endif() -endfunction() - -function(expect_file FILE) - if(NOT EXISTS "${FILE}") - message(FATAL_ERROR "${FILE} is unexpectedly missing") - endif() -endfunction() - -expect_variable(CPACK_COMPONENTS_ALL) -expect_variable(CPACK_TOPLEVEL_DIRECTORY) -expect_variable(CPACK_TEMPORARY_DIRECTORY) -expect_variable(CPACK_PACKAGE_DIRECTORY) -expect_variable(CPACK_PACKAGE_FILE_NAME) - -expect_file(${CPACK_TEMPORARY_DIRECTORY}/f1/share/cpack-test/f1.txt) -expect_file(${CPACK_TEMPORARY_DIRECTORY}/f2/share/cpack-test/f2.txt) -expect_file(${CPACK_TEMPORARY_DIRECTORY}/f3/share/cpack-test/f3.txt) -expect_file(${CPACK_TEMPORARY_DIRECTORY}/f4/share/cpack-test/f4.txt) diff --git a/Tests/RunCMake/CPack/tests/EXT/expected-json-1.0.txt b/Tests/RunCMake/CPack/tests/EXT/expected-json-1.0.txt deleted file mode 100644 index b96cf0b..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/expected-json-1.0.txt +++ /dev/null @@ -1,176 +0,0 @@ -^\{ - "componentGroups" :[ ] - \{ - "f12" :[ ] - \{ - "components" :[ ] - \[ - "f1", - "f2" - \], - "description" : "Component group for files 1 and 2", - "displayName" : "Files 1 and 2", - "isBold" : false, - "isExpandedByDefault" : false, - "name" : "f12", - "parentGroup" : "f1234", - "subgroups" : \[\] - \}, - "f1234" :[ ] - \{ - "components" : \[\], - "description" : "Component group for all files", - "displayName" : "Files 1-4", - "isBold" : false, - "isExpandedByDefault" : false, - "name" : "f1234", - "subgroups" :[ ] - \[ - "f12", - "f34" - \] - \}, - "f34" :[ ] - \{ - "components" :[ ] - \[ - "f3", - "f4" - \], - "description" : "Component group for files 3 and 4", - "displayName" : "Files 3 and 4", - "isBold" : false, - "isExpandedByDefault" : false, - "name" : "f34", - "parentGroup" : "f1234", - "subgroups" : \[\] - \} - \}, - "components" :[ ] - \{ - "f1" :[ ] - \{ - "archiveFile" : "", - "dependencies" : \[\], - "description" : "Component for file 1", - "displayName" : "File 1", - "group" : "f12", - "installationTypes" :[ ] - \[ - "full", - "f12" - \], - "isDisabledByDefault" : false, - "isDownloaded" : false, - "isHidden" : false, - "isRequired" : false, - "name" : "f1" - \}, - "f2" :[ ] - \{ - "archiveFile" : "", - "dependencies" :[ ] - \[ - "f1" - \], - "description" : "Component for file 2", - "displayName" : "File 2", - "group" : "f12", - "installationTypes" :[ ] - \[ - "full", - "f12" - \], - "isDisabledByDefault" : false, - "isDownloaded" : false, - "isHidden" : false, - "isRequired" : false, - "name" : "f2" - \}, - "f3" :[ ] - \{ - "archiveFile" : "", - "dependencies" :[ ] - \[ - "f1", - "f2" - \], - "description" : "Component for file 3", - "displayName" : "File 3", - "group" : "f34", - "installationTypes" :[ ] - \[ - "full" - \], - "isDisabledByDefault" : false, - "isDownloaded" : false, - "isHidden" : false, - "isRequired" : false, - "name" : "f3" - \}, - "f4" :[ ] - \{ - "archiveFile" : "", - "dependencies" :[ ] - \[ - "f2", - "f3", - "f1" - \], - "description" : "Component for file 4", - "displayName" : "File 4", - "group" : "f34", - "installationTypes" :[ ] - \[ - "full" - \], - "isDisabledByDefault" : false, - "isDownloaded" : false, - "isHidden" : false, - "isRequired" : false, - "name" : "f4" - \} - \}, - "errorOnAbsoluteInstallDestination" : false, - "formatVersionMajor" : 1, - "formatVersionMinor" : 0, - "installationTypes" :[ ] - \{ - "f12" :[ ] - \{ - "displayName" : "Only files 1 and 2", - "index" : 2, - "name" : "f12" - \}, - "full" :[ ] - \{ - "displayName" : "Full installation", - "index" : 1, - "name" : "full" - \} - \}, - "packageDescriptionFile" : ".*/Templates/CPack\.GenericDescription\.txt", - "packageDescriptionSummary" : "EXT-(none|good(_multi)?|invalid_good)-subtest-(MONOLITHIC|COMPONENT)-type built using CMake", - "packageName" : "ext", - "packageVersion" : "0\.1\.1", - "projects" :[ ] - \[ - \{ - "component" : "ALL", - "components" :[ ] - \[ - "f1", - "f2", - "f3", - "f4" - \], - "directory" : ".*/Tests/RunCMake/Ext/CPack/EXT-build-(none|good(_multi)?|invalid_good)-subtest", - "installationTypes" : \[\], - "projectName" : "EXT-(none|good(_multi)?|invalid_good)-subtest-(MONOLITHIC|COMPONENT)-type", - "subDirectory" : "/" - \} - \], - "setDestdir" : false, - "stripFiles" : false, - "warnOnAbsoluteInstallDestination" : false -\}$ diff --git a/Tests/RunCMake/CPack/tests/EXT/invalid_bad-stderr.txt b/Tests/RunCMake/CPack/tests/EXT/invalid_bad-stderr.txt deleted file mode 100644 index 372c5e4..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/invalid_bad-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error at .*/Modules/Internal/CPack/CPackExt\.cmake:[0-9]+ \(message\): - Could not find a suitable version in CPACK_EXT_REQUESTED_VERSIONS - - -CPack Error: Error while executing CPackExt\.cmake -CPack Error: Cannot initialize the generator Ext diff --git a/Tests/RunCMake/CPack/tests/EXT/stage_and_package-stderr.txt b/Tests/RunCMake/CPack/tests/EXT/stage_and_package-stderr.txt deleted file mode 100644 index 40f2743..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/stage_and_package-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^This script could run an external packaging tool$ diff --git a/Tests/RunCMake/CPack/tests/EXT/test.cmake b/Tests/RunCMake/CPack/tests/EXT/test.cmake deleted file mode 100644 index 976cb6a..0000000 --- a/Tests/RunCMake/CPack/tests/EXT/test.cmake +++ /dev/null @@ -1,86 +0,0 @@ -include(CPackComponent) - -if(RunCMake_SUBTEST_SUFFIX STREQUAL "none") - unset(CPACK_EXT_REQUESTED_VERSIONS) -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "good") - set(CPACK_EXT_REQUESTED_VERSIONS "1.0") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "good_multi") - set(CPACK_EXT_REQUESTED_VERSIONS "1.0;2.0") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "bad_major") - set(CPACK_EXT_REQUESTED_VERSIONS "2.0") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "bad_minor") - set(CPACK_EXT_REQUESTED_VERSIONS "1.1") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "invalid_good") - set(CPACK_EXT_REQUESTED_VERSIONS "1;1.0") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "invalid_bad") - set(CPACK_EXT_REQUESTED_VERSIONS "1") -elseif(RunCMake_SUBTEST_SUFFIX STREQUAL "stage_and_package") - set(CPACK_EXT_ENABLE_STAGING 1) - set(CPACK_EXT_PACKAGE_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/create_package.cmake") -endif() - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/f1.txt" test1) -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/f2.txt" test2) -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/f3.txt" test3) -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/f4.txt" test4) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/f1.txt" DESTINATION share/cpack-test COMPONENT f1) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/f2.txt" DESTINATION share/cpack-test COMPONENT f2) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/f3.txt" DESTINATION share/cpack-test COMPONENT f3) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/f4.txt" DESTINATION share/cpack-test COMPONENT f4) - -cpack_add_component(f1 - DISPLAY_NAME "File 1" - DESCRIPTION "Component for file 1" - GROUP f12 - INSTALL_TYPES full f12 -) - -cpack_add_component(f2 - DISPLAY_NAME "File 2" - DESCRIPTION "Component for file 2" - GROUP f12 - DEPENDS f1 - INSTALL_TYPES full f12 -) - -cpack_add_component(f3 - DISPLAY_NAME "File 3" - DESCRIPTION "Component for file 3" - GROUP f34 - DEPENDS f1 f2 - INSTALL_TYPES full -) - -cpack_add_component(f4 - DISPLAY_NAME "File 4" - DESCRIPTION "Component for file 4" - GROUP f34 - DEPENDS f2 f3 f1 - INSTALL_TYPES full -) - -cpack_add_component_group(f12 - DISPLAY_NAME "Files 1 and 2" - DESCRIPTION "Component group for files 1 and 2" - PARENT_GROUP f1234 -) - -cpack_add_component_group(f34 - DISPLAY_NAME "Files 3 and 4" - DESCRIPTION "Component group for files 3 and 4" - PARENT_GROUP f1234 -) - -cpack_add_component_group(f1234 - DISPLAY_NAME "Files 1-4" - DESCRIPTION "Component group for all files" -) - -cpack_add_install_type(full - DISPLAY_NAME "Full installation" -) - -cpack_add_install_type(f12 - DISPLAY_NAME "Only files 1 and 2" -) |