From db4ad455d269415f478e34234f571327dcadbdb6 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 31 Oct 2019 15:23:11 -0500 Subject: [PATCH] Update version numbers for 3.15.8-DEV (3.15.7.1-DEV) --- configure/CONFIG_BASE_VERSION | 6 +++--- documentation/KnownProblems.html | 8 ++++---- documentation/README.md | 32 ++++++++++++++--------------- documentation/RELEASE_NOTES.md | 8 +++++++- documentation/ReleaseChecklist.html | 16 +++++++-------- 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index d920337b4..16a54b1e5 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -31,10 +31,10 @@ EPICS_MODIFICATION = 7 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included if zero -EPICS_PATCH_LEVEL = 0 +EPICS_PATCH_LEVEL = 1 # This will end in -DEV between official releases -#EPICS_DEV_SNAPSHOT=-DEV +EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 @@ -43,7 +43,7 @@ EPICS_PATCH_LEVEL = 0 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -EPICS_DEV_SNAPSHOT= +#EPICS_DEV_SNAPSHOT= # No changes should be needed below here diff --git a/documentation/KnownProblems.html b/documentation/KnownProblems.html index 82f37ec7b..307d98d5a 100644 --- a/documentation/KnownProblems.html +++ b/documentation/KnownProblems.html @@ -4,17 +4,17 @@ - Known Problems in R3.15.7 + Known Problems in R3.15.8 -

EPICS Base R3.15.7: Known Problems

+

EPICS Base R3.15.8: Known Problems

Any patch files linked below should be applied at the root of the -base-3.15.7 tree. Download them, then use the GNU Patch program as +base-3.15.8 tree. Download them, then use the GNU Patch program as follows:

-
% cd /path/to/base-3.15.7
+
% cd /path/to/base-3.15.8
 % patch -p1 < /path/to/file.patch

 
 
The following significant problems have been reported with this
diff --git a/documentation/README.md b/documentation/README.md
index bf6d70e37..770f14bad 100644
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,6 +1,6 @@
 # Installation Instructions
 
-## EPICS Base Release 3.15.7
+## EPICS Base Release 3.15.8
 
 -----
 
@@ -62,7 +62,7 @@ vendor's C and C++ compilers, as well as the GNU gcc and g++
 compilers. The GNU cross-compilers work for all cross-compiled
 targets. You may need the C and C++ compilers to be in your search
 path to do EPICS builds; check the definitions of CC and CCC in
-base/configure/os/CONFIG.<host>.<host> if you have problems.
+`base/configure/os/CONFIG..` if you have problems.
 
 ### Software requirements
 
@@ -187,7 +187,7 @@ base/documentation directory of the distribution.
         CONFIG                Includes configure files and allows variable overrides
         CONFIG.CrossCommon    Cross build definitions
         CONFIG.gnuCommon      Gnu compiler build definitions for all archs
-        CONFIG_ADDONS         Definitions for <osclass> and DEFAULT options
+        CONFIG_ADDONS         Definitions for  and DEFAULT options
         CONFIG_APP_INCLUDE
         CONFIG_BASE           EPICS base tool and location definitions
         CONFIG_BASE_VERSION   Definitions for EPICS base version number
@@ -207,22 +207,22 @@ base/documentation directory of the distribution.
         RULES_EXPAND
         RULES_FILE_TYPE
         RULES_TARGET
-        RULES_TOP             Rules specific to a <top> dir (uninstall and tar)
+        RULES_TOP             Rules specific to a  dir (uninstall and tar)
         Sample.Makefile       Sample makefile with comments
 ```
 
 #### base/configure/os directory - contains os-arch specific definitions
 
 ```
-        CONFIG.<host>.<target>      Specific host-target build definitions
-        CONFIG.Common.<target>      Specific target definitions for all hosts
-        CONFIG.<host>.Common        Specific host definitions for all targets
+        CONFIG..      Specific host-target build definitions
+        CONFIG.Common.      Specific target definitions for all hosts
+        CONFIG..Common        Specific host definitions for all targets
         CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
         CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
         CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
-        CONFIG_SITE.<host>.<target> Site specific host-target definitions
-        CONFIG_SITE.Common.<target> Site specific target defs for all hosts
-        CONFIG_SITE.<host>.Common   Site specific host defs for all targets
+        CONFIG_SITE.. Site specific host-target definitions
+        CONFIG_SITE.Common. Site specific target defs for all hosts
+        CONFIG_SITE..Common   Site specific host defs for all targets
 ```
 
 ### Building EPICS base (Unix and Win32)
@@ -294,8 +294,8 @@ distribution file to be overridden except with CONFIG in the name
 changed to `CONFIG_SITE`.
 
 ```
-        configure/os/CONFIG.<host>.<host>      Host build settings
-        configure/os/CONFIG.<host>.Common      Host common build settings
+        configure/os/CONFIG..      Host build settings
+        configure/os/CONFIG..Common      Host common build settings
 ```
 
 **Target configuration**
@@ -307,8 +307,8 @@ replaced by `CONFIG_SITE`. This step is necessary even if the host
 system is the only target system.
 
 ```
-        configure/os/CONFIG.Common.<target>     Target common settings
-        configure/os/CONFIG.<host>.<target>     Host-target settings
+        configure/os/CONFIG.Common.     Target common settings
+        configure/os/CONFIG..     Host-target settings
 ```
 
 #### Build EPICS base
@@ -351,7 +351,7 @@ the host system.
 A perl script, makeBaseExt.pl, is included in the distribution file.
 This script will create a sample extension that can be built and
 executed. The makeBaseApp.pl and makeBaseExt.pl scripts are installed
-into the install location bin/<hostarch> directory during the base
+into the install location `bin/` directory during the base
 build.
 
 ### Multiple host platforms
@@ -365,7 +365,7 @@ into the `$(INSTALL_LOCATION)/bin/` directories. Libraries are
 installed into $`(INSTALL_LOCATION)/lib/`. The default
 definition for `$(INSTALL_LOCATION)` is `$(TOP)` which is the root
 directory in the distribution directory structure, base. Created
-object files are stored in O.<arch> source subdirectories, This
+object files are stored in `O.` source subdirectories, This
 allows objects for multiple cross target architectures to be
 maintained at the same time. To build EPICS base for a specific
 host/target combination you must have the proper host/target C/C++
diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index 2adaed582..9b35b4a8b 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,4 +1,10 @@
-# EPICS Base Release 3.15.7
+# EPICS Base Release 3.15.8
+
+This version of EPICS Base has not been released yet.
+
+## Changes made on the 3.15 branch since 3.15.7
+
+
 
 ## Changes made between 3.15.6 and 3.15.7
 
diff --git a/documentation/ReleaseChecklist.html b/documentation/ReleaseChecklist.html
index 1e3a20b37..af0f1dad2 100644
--- a/documentation/ReleaseChecklist.html
+++ b/documentation/ReleaseChecklist.html
@@ -136,17 +136,17 @@ relevent roles unless the Release Manager designates otherwise:

       Tag the module in Git, using these tag conventions:
         
    
           
  • 
-            R3.15.7-pre1
+            R3.15.8-pre1
             — pre-release tag
             
    • 
           
  • 
-            R3.15.7-rc1
+            R3.15.8-rc1
             — release candidate tag
             
    • 
         

         

           cd base-3.15

-          git tag -m 'ANJ: Tagged for 3.15.7-rc1' R3.15.7-rc1
+          git tag -m 'ANJ: Tagged for 3.15.8-rc1' R3.15.8-rc1
           

         
       
@@ -158,11 +158,11 @@ relevent roles unless the Release Manager designates otherwise:

         files and directories that are only used for continuous integration:
         

           cd base-3.15

-          git archive --prefix=base-3.15.7-rc1/ --output=base-3.15.7-rc1.tar.gz R3.15.7-rc1 configure documentation LICENSE Makefile README src startup
+          git archive --prefix=base-3.15.8-rc1/ --output=base-3.15.8-rc1.tar.gz R3.15.8-rc1 configure documentation LICENSE Makefile README src startup
           

         Create a GPG signature file of the tarfile as follows:
         

-          gpg --armor --sign --detach-sig base-3.15.7-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.8-rc1.tar.gz
           

         
       
@@ -274,7 +274,7 @@ relevent roles unless the Release Manager designates otherwise:

       Tag the module in Git:
         

           cd base-3.15

-          git tag -m 'ANJ: Tagged for 3.15.7' R3.15.7
+          git tag -m 'ANJ: Tagged for 3.15.8' R3.15.8
           

         
       
@@ -285,11 +285,11 @@ relevent roles unless the Release Manager designates otherwise:

         generates a gzipped tarfile directly from the repository:
         

           cd base-3.15

-          git archive --prefix=base-3.15.7/ --output=base-3.15.7.tar.gz R3.15.7 configure documentation LICENSE Makefile README src startup
+          git archive --prefix=base-3.15.8/ --output=base-3.15.8.tar.gz R3.15.8 configure documentation LICENSE Makefile README src startup
           

         Create a GPG signature file of the tarfile as follows:
         

-          gpg --armor --sign --detach-sig base-3.15.7.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.8.tar.gz