Revision: 73061
http://sourceforge.net/p/brlcad/code/73061
Author: starseeker
Date: 2019-05-13 19:21:15 +0000 (Mon, 13 May 2019)
Log Message:
-----------
Cherrypick 73043, 73049-73051 from trunk to STABLE to get the ability to apply
an amend increment to the version number.
Modified Paths:
--------------
brlcad/branches/STABLE/CMakeLists.txt
brlcad/branches/STABLE/HACKING
brlcad/branches/STABLE/include/brlcad_version.h.in
Property Changed:
----------------
brlcad/branches/STABLE/
brlcad/branches/STABLE/CHANGES
brlcad/branches/STABLE/NEWS
brlcad/branches/STABLE/doc/STRATEGY
brlcad/branches/STABLE/src/libbu/
brlcad/branches/STABLE/src/libged/polyclip.cpp
brlcad/branches/STABLE/src/tclscripts/archer/
Index: brlcad/branches/STABLE
===================================================================
--- brlcad/branches/STABLE 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE 2019-05-13 19:21:15 UTC (rev 73061)
Property changes on: brlcad/branches/STABLE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-72826,73001
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-72826,73001,73043,73049-73051
\ No newline at end of property
Index: brlcad/branches/STABLE/CHANGES
===================================================================
--- brlcad/branches/STABLE/CHANGES 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE/CHANGES 2019-05-13 19:21:15 UTC (rev 73061)
Property changes on: brlcad/branches/STABLE/CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/CHANGES:65867-66137
/brlcad/branches/osg/CHANGES:62110-62113
/brlcad/branches/prep-cache/CHANGES:68236-68933
-/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-54103,55606-68122,68125-72826,73001
\ No newline at end of property
+/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-54103,55606-68122,68125-72826,73001,73043,73049-73051
\ No newline at end of property
Modified: brlcad/branches/STABLE/CMakeLists.txt
===================================================================
--- brlcad/branches/STABLE/CMakeLists.txt 2019-05-13 19:13:46 UTC (rev
73060)
+++ brlcad/branches/STABLE/CMakeLists.txt 2019-05-13 19:21:15 UTC (rev
73061)
@@ -96,6 +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_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
@@ -940,6 +943,11 @@
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_DOC_DIR \"${DOC_DIR}\"\n")
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_MAN_DIR \"${MAN_DIR}\"\n")
+# 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
# the NDEBUG flag accordingly, and common.h will take it from there.
@@ -3347,9 +3355,14 @@
set(CPACK_RPM_SPEC_INSTALL_POST /bin/true)
if(CPACK_RPM_VERSION)
- set(CPACK_RPM_PACKAGE_NAME
"brlcad_${BRLCAD_VERSION_MAJOR}_${BRLCAD_VERSION_MINOR}_${BRLCAD_VERSION_PATCH}")
- # If we've got a Redhat release, include some info about the specific
release in the name.
- # Otherwise, just go generic.
+ 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_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})
@@ -3363,6 +3376,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)
Modified: brlcad/branches/STABLE/HACKING
===================================================================
--- brlcad/branches/STABLE/HACKING 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE/HACKING 2019-05-13 19:21:15 UTC (rev 73061)
@@ -1082,11 +1082,8 @@
{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}
All "development" builds use an odd number for the minor version. All
-"release" builds use an even number for the minor version. Patched
-versions should include a release count:
+"release" builds use an even number for the minor version.
- {MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{RELEASE_COUNT}]
-
The MAJOR_VERSION should only increment when it is deemed that a
significant amount of major changes have accumulated, new features
have been added, or enough significant backwards incompatibilities
@@ -1107,11 +1104,15 @@
version number.
If it becomes necessary to update a posted release, use and increment
-the RELEASE_COUNT. The first posted release is implicitly the "-0"
-release count (e.g., 7.10.2 is implicitly 7.10.2-0) with subsequent
-updated releases incrementing the count (e.g., 7.10.2-1).
+the AMEND_COUNT format outlined below. The first posted release is
+implicitly the "-0" release (e.g., 7.10.2 is implicitly 7.10.2-0) with
+subsequent updated releases incrementing the count (e.g., 7.10.2-1).
+See the "AMENDING A RELEASE" section below for guidelines on when a
+release should be amended in lieu of a new PATCH_VERSION release.
+ {MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{AMEND_COUNT}]
+
NAMING A SOURCE RELEASE
-----------------------
@@ -1203,33 +1204,35 @@
zip
-PATCHING A RELEASE
+AMENDING A RELEASE
------------------
-Should it become necessary to patch a release that has already been
-posted and announced, the mechanism is to post patch files for the
-source release and update the uploaded release notes README file.
+Should it become necessary to modify a release after it has been
+tagged, uploaded, and announced, a release amendment may be issued.
+Releases that are neither tagged, uploaded, or announced are subject
+to at-will change and re-tagging.
+Amendments to source releases are expressed as a sequence of one or
+more patch files that are to be applied sequentially. Patch files may
+be descriptively named but must be incrementally numbered. The
+uploaded release notes and/or README file(s) should instruct users
+building from source to download and apply all available patch files
+in order.
+
Example: stop_rt_crashing-0.patch and fix_fbserv-1.patch
-It's expected that all patch files are independent and will be applied
-sequentially. They should be consistently and incrementally numbered.
-Users should be instructed in the release notes README to download and
-apply all available patch files.
-
-For binary releases, it's recommended to just "move on" and let issues
+For binary builds, it's recommended to just "move on" and let issues
become resolved in the next release unless there's a critical security
-or significant data corruption issue involved. If it becomes
-necessary to repost a release, use the RELEASE_COUNT file name
-convention described in VERSION NUMBERS & COMPATIBILITY.
+or data corruption issue involved. That said, binary releases may be
+re-posted with a modified name per the convention described in VERSION
+NUMBERS & COMPATIBILITY.
Example: BRL-CAD-7.12.2.dmg is superseded by BRL-CAD-7.12.2-1.dmg
-Patched binary releases may be moved to the hidden attic folder if
-critical, though not necessary or recommended. They are preserved for
-historic record and should never be deleted once announced. Releases
-not yet been announced may be updated within two days of being posted
-without involving a patch.
+Older binary releases may be moved to the hidden attic folder, though
+not necessary or recommended except where critical vulnerabilities are
+involved. Releases are preserved for historic record and should never
+be deleted once announced.
MAKING A RELEASE
@@ -1273,10 +1276,14 @@
#####################################################################
# 02: Test the merge.
+ # NON-AUTO: Confirm versioning in include/conf/.
+ # BRLCAD_VERSION_AMEND may be defined during CMake for an
+ # amendment build.
+
mkdir -p .build && cd .build
cmake .. -DBRLCAD_BUNDLED_LIBS=ON -DCMAKE_BUILD_TYPE=Release && make
- # Manually check rt, mged, and archer.
+ # NON-AUTO: Manually check rt, mged, and archer.
bin/rt # should report usage with correct library versions
bin/mged -c test.g "make sph sph ; draw sph ; rt" # pops up a sphere
bin/mged # displays gui, run: opendb test.g ; draw sph ; rt
Index: brlcad/branches/STABLE/NEWS
===================================================================
--- brlcad/branches/STABLE/NEWS 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE/NEWS 2019-05-13 19:21:15 UTC (rev 73061)
Property changes on: brlcad/branches/STABLE/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/trunk:68170-68252
-/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-72826,73001
\ No newline at end of property
+/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-72826,73001,73043,73049-73051
\ No newline at end of property
Index: brlcad/branches/STABLE/doc/STRATEGY
===================================================================
--- brlcad/branches/STABLE/doc/STRATEGY 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE/doc/STRATEGY 2019-05-13 19:21:15 UTC (rev 73061)
Property changes on: brlcad/branches/STABLE/doc/STRATEGY
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/doc/STRATEGY:65867-66137
/brlcad/branches/osg/doc/STRATEGY:62110-62113
/brlcad/branches/prep-cache/doc/STRATEGY:68236-68933
-/brlcad/trunk/doc/STRATEGY:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66807,67001-72826,73001
\ No newline at end of property
+/brlcad/trunk/doc/STRATEGY:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66807,67001-72826,73001,73043,73049-73051
\ No newline at end of property
Modified: brlcad/branches/STABLE/include/brlcad_version.h.in
===================================================================
--- brlcad/branches/STABLE/include/brlcad_version.h.in 2019-05-13 19:13:46 UTC
(rev 73060)
+++ brlcad/branches/STABLE/include/brlcad_version.h.in 2019-05-13 19:21:15 UTC
(rev 73061)
@@ -119,9 +119,12 @@
/**
* Run-time string of the "MAJOR.MINOR.PATCH" version number.
*/
+#if !defined(BRLCAD_VERSION_AMEND)
static char BRLCAD_VERSION[32] = NUM2STR(BRLCAD_VERSION_MAJOR) "."
NUM2STR(BRLCAD_VERSION_MINOR) "." NUM2STR(BRLCAD_VERSION_PATCH);
+#else
+static char BRLCAD_VERSION[32] = NUM2STR(BRLCAD_VERSION_MAJOR) "."
NUM2STR(BRLCAD_VERSION_MINOR) "." NUM2STR(BRLCAD_VERSION_PATCH) "-"
NUM2STR(BRLCAD_VERSION_AMEND);
+#endif
-
__BEGIN_DECLS
/**
Index: brlcad/branches/STABLE/src/libbu
===================================================================
--- brlcad/branches/STABLE/src/libbu 2019-05-13 19:13:46 UTC (rev 73060)
+++ brlcad/branches/STABLE/src/libbu 2019-05-13 19:21:15 UTC (rev 73061)
Property changes on: brlcad/branches/STABLE/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/RELEASE/src/libbu:72828-72838
-/brlcad/trunk/src/libbu:72525-72826,73001
\ No newline at end of property
+/brlcad/trunk/src/libbu:72525-72826,73001,73043,73049-73051
\ No newline at end of property
Index: brlcad/branches/STABLE/src/libged/polyclip.cpp
===================================================================
--- brlcad/branches/STABLE/src/libged/polyclip.cpp 2019-05-13 19:13:46 UTC
(rev 73060)
+++ brlcad/branches/STABLE/src/libged/polyclip.cpp 2019-05-13 19:21:15 UTC
(rev 73061)
Property changes on: brlcad/branches/STABLE/src/libged/polyclip.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -5,4 +5,4 ##
/brlcad/branches/gct/src/libged/polyclip.cpp:62423-62425
/brlcad/branches/osg/src/libged/polyclip.cpp:62110-62113
/brlcad/branches/prep-cache/src/libged/polyclip.cpp:68236-68933
-/brlcad/trunk/src/libged/polyclip.cpp:50761-68099,68132-72826,73001
\ No newline at end of property
+/brlcad/trunk/src/libged/polyclip.cpp:50761-68099,68132-72826,73001,73043,73049-73051
\ No newline at end of property
Index: brlcad/branches/STABLE/src/tclscripts/archer
===================================================================
--- brlcad/branches/STABLE/src/tclscripts/archer 2019-05-13 19:13:46 UTC
(rev 73060)
+++ brlcad/branches/STABLE/src/tclscripts/archer 2019-05-13 19:21:15 UTC
(rev 73061)
Property changes on: brlcad/branches/STABLE/src/tclscripts/archer
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/RELEASE/src/tclscripts/archer:72828-72838
-/brlcad/trunk/src/tclscripts/archer:72525-72826,73001
\ No newline at end of property
+/brlcad/trunk/src/tclscripts/archer:72525-72826,73001,73043,73049-73051
\ No newline at end of property
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
