Revision: 74201
http://sourceforge.net/p/brlcad/code/74201
Author: starseeker
Date: 2019-10-21 01:32:04 +0000 (Mon, 21 Oct 2019)
Log Message:
-----------
More svn vs git changes for distcheck
Modified Paths:
--------------
brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
Modified: brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in 2019-10-21
01:20:08 UTC (rev 74200)
+++ brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in 2019-10-21
01:32:04 UTC (rev 74201)
@@ -335,7 +335,7 @@
list(REMOVE_ITEM IGNORED_FS_FILES ${BUILD_FILES})
if(IGNORED_FS_FILES)
string(REPLACE ";" "\n" IGNORED_FS_FILES "${IGNORED_FS_FILES}")
- message("\nFiles unknown to both Subversion and the Build logic (will not be
incorporated into dist):\n${IGNORED_FS_FILES}\n")
+ message("\nFiles unknown to both Version Control System and the Build logic
(will not be incorporated into dist):\n${IGNORED_FS_FILES}\n")
endif(IGNORED_FS_FILES)
# Write out the archive status so the build targets can see it later.
@@ -347,11 +347,21 @@
file(APPEND
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid"
"execute_process(COMMAND @CMAKE_COMMAND@ -E remove
\"${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2\")\n")
file(APPEND
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid"
"execute_process(COMMAND @CMAKE_COMMAND@ -E remove
\"${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip\")\n")
else(NOT_DISTCHECK_READY)
- if(NOT SVN_EXEC OR NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn")
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND SVN_EXEC)
+ file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid" "")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND SVN_EXEC)
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND GIT_EXEC)
+ file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid" "")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND GIT_EXEC)
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT SVN_EXEC)
file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid"
"execute_process(COMMAND @CMAKE_COMMAND@ -E echo \"Note: Archive files were
generated without being able to compare them to the Subversion archive master
file lists..\")\n")
- else(NOT SVN_EXEC OR NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn")
- file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid" "")
- endif(NOT SVN_EXEC OR NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT SVN_EXEC)
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND NOT GIT_EXEC)
+ file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid"
"execute_process(COMMAND @CMAKE_COMMAND@ -E echo \"Note: Archive files were
generated without being able to compare them to the Git archive master file
lists..\")\n")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND NOT GIT_EXEC)
+ if(NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT EXISTS
"@CMAKE_SOURCE_DIR@/.git")
+ file(WRITE
"@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_remove_archives_if_invalid"
"execute_process(COMMAND @CMAKE_COMMAND@ -E echo \"Note: Archive files were
generated without being able to compare them to the Version Control System
master file lists..\")\n")
+ endif(NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT EXISTS
"@CMAKE_SOURCE_DIR@/.git")
endif(NOT_DISTCHECK_READY)
# All done - print result messages and prepare the appropriate final message
for the distcheck build.
@@ -359,9 +369,15 @@
if("${NOT_DISTCHECK_READY}")
set(FINAL_DIST_MESSAGE "--- distcheck compilation succeeded, archives not
ready ---")
endif("${NOT_DISTCHECK_READY}")
-if(NOT SVN_EXEC OR NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn")
- set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** Archive files pass
available checks, but a distcheck using Subversion is recommended for archive
files intended for distribution. ***")
-endif(NOT SVN_EXEC OR NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn")
+ if(NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT EXISTS
"@CMAKE_SOURCE_DIR@/.git")
+ set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** Archive files
pass available checks, but a distcheck using a Version Controlled checkout is
recommended for archive files intended for distribution. ***")
+ endif(NOT EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT EXISTS
"@CMAKE_SOURCE_DIR@/.git")
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT SVN_EXEC)
+ set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** Archive files
pass available checks, but a distcheck using a Version Controlled checkout is
recommended for archive files intended for distribution. ***")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.svn" AND NOT SVN_EXEC)
+ if(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND GIT_EXEC)
+ set(FINAL_DIST_MESSAGE "--- distcheck succeeded ---\n*** Archive files
pass available checks, but a distcheck using a Version Controlled checkout is
recommended for archive files intended for distribution. ***")
+ endif(EXISTS "@CMAKE_SOURCE_DIR@/.git" AND GIT_EXEC)
file(WRITE "@CMAKE_BINARY_DIR@/CMakeTmp/distcheck_message"
"execute_process(COMMAND @CMAKE_COMMAND@ -E echo \"${FINAL_DIST_MESSAGE}\")")
# If we got this far, it worked
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
