Revision: 73049
http://sourceforge.net/p/brlcad/code/73049
Author: brlcad
Date: 2019-05-13 14:42:06 +0000 (Mon, 13 May 2019)
Log Message:
-----------
use AMEND instead of ERRATA as the latter implies a mistake, which may or may
not be. additional release postings can be provoked by some extrinsic
rationale (e.g., antivirus signature match or additional information in release
notes or some run-time warning, etc).
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2019-05-13 13:09:32 UTC (rev 73048)
+++ brlcad/trunk/CMakeLists.txt 2019-05-13 14:42:06 UTC (rev 73049)
@@ -96,9 +96,9 @@
string(STRIP ${BRLCAD_VERSION_PATCH} BRLCAD_VERSION_PATCH)
set(BRLCAD_VERSION
"${BRLCAD_VERSION_MAJOR}.${BRLCAD_VERSION_MINOR}.${BRLCAD_VERSION_PATCH}")
-if(DEFINED BRLCAD_VERSION_ERRATA)
- set(BRLCAD_VERSION "${BRLCAD_VERSION}-${BRLCAD_VERSION_ERRATA}")
-endif(DEFINED BRLCAD_VERSION_ERRATA)
+if(DEFINED BRLCAD_VERSION_AMEND)
+ set(BRLCAD_VERSION "${BRLCAD_VERSION}-${BRLCAD_VERSION_AMEND}")
+endif(DEFINED BRLCAD_VERSION_AMEND)
#---------------------------------------------------------------------
# Let CMake know where to look for our counting file for configuration
@@ -943,10 +943,10 @@
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_DOC_DIR \"${DOC_DIR}\"\n")
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_MAN_DIR \"${MAN_DIR}\"\n")
-# Define the errata version if we have one
-if(DEFINED BRLCAD_VERSION_ERRATA)
- CONFIG_H_APPEND(BRLCAD "#define BRLCAD_VERSION_ERRATA
${BRLCAD_VERSION_ERRATA}\n")
-endif(DEFINED BRLCAD_VERSION_ERRATA)
+# Define the ammendment count if we have one
+if(DEFINED BRLCAD_VERSION_AMEND)
+ CONFIG_H_APPEND(BRLCAD "#define BRLCAD_VERSION_AMEND
${BRLCAD_VERSION_AMEND}\n")
+endif(DEFINED BRLCAD_VERSION_AMEND)
#----------------------------------------------------------------------
# If we're not debugging, we want HIDDEN to be defined as static. Set
@@ -3357,13 +3357,14 @@
set(CPACK_RPM_SPEC_INSTALL_POST /bin/true)
if(CPACK_RPM_VERSION)
- if(DEFINED BRLCAD_VERSION_ERRATA)
- set(CPACK_RPM_PACKAGE_NAME
"brlcad_${BRLCAD_VERSION_MAJOR}_${BRLCAD_VERSION_MINOR}_${BRLCAD_VERSION_PATCH}_${BRLCAD_VERSION_ERRATA}")
- else(DEFINED BRLCAD_VERSION_ERRATA)
+ if(DEFINED BRLCAD_VERSION_AMEND)
+ set(CPACK_RPM_PACKAGE_NAME
"brlcad_${BRLCAD_VERSION_MAJOR}_${BRLCAD_VERSION_MINOR}_${BRLCAD_VERSION_PATCH}_${BRLCAD_VERSION_AMEND}")
+ else(DEFINED BRLCAD_VERSION_AMEND)
set(CPACK_RPM_PACKAGE_NAME
"brlcad_${BRLCAD_VERSION_MAJOR}_${BRLCAD_VERSION_MINOR}_${BRLCAD_VERSION_PATCH}")
- endif(DEFINED BRLCAD_VERSION_ERRATA)
- # If we've got a Redhat release, include some info about the specific
release in the name.
- # Otherwise, just go generic.
+ endif(DEFINED BRLCAD_VERSION_AMEND)
+
+ # If we've got a Redhat release, include some info about the
+ # specific release in the name. Otherwise, just go generic.
if(EXISTS /etc/redhat-release)
file(READ /etc/redhat-release REDHAT_RELEASE)
string(REGEX MATCH "[0-9]+" REDHAT_VERSION ${REDHAT_RELEASE})
@@ -3377,6 +3378,7 @@
else(EXISTS /etc/redhat-release)
set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_RPM_VERSION})
endif(EXISTS /etc/redhat-release)
+
endif(CPACK_RPM_VERSION)
endif(RPMBUILD_EXEC AND NOT CPACK_RPM_SKIP)
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
