From 74a90d141b6ae162bc5bee1e42fe8efec3bdd8ac Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 31 Oct 2019 13:00:24 -0500 Subject: [PATCH] Update version numbers Also contains some reformatting in README.md --- configure/CONFIG_BASE_VERSION | 6 +- documentation/KnownProblems.html | 8 +-- documentation/README.md | 92 ++++++++++++++--------------- documentation/RELEASE_NOTES.md | 6 +- documentation/ReleaseChecklist.html | 16 ++--- 5 files changed, 61 insertions(+), 67 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index ffbd15d86..d920337b4 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -27,14 +27,14 @@ EPICS_VERSION = 3 EPICS_REVISION = 15 # EPICS_MODIFICATION must be a number >=0 and <256 -EPICS_MODIFICATION = 6 +EPICS_MODIFICATION = 7 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included if zero EPICS_PATCH_LEVEL = 0 # 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_DEV_SNAPSHOT=-DEV #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 e54a3c722..82f37ec7b 100644 --- a/documentation/KnownProblems.html +++ b/documentation/KnownProblems.html @@ -4,17 +4,17 @@ - Known Problems in R3.15.6 + Known Problems in R3.15.7 -

EPICS Base R3.15.6: Known Problems

+

EPICS Base R3.15.7: Known Problems

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

-
% cd /path/to/base-3.15.6
+
% cd /path/to/base-3.15.7
 % 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 444dd44cc..bf6d70e37 100644
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,8 +1,6 @@
 # Installation Instructions
 
-## EPICS Base Release 3.15.6
-
-  
+## EPICS Base Release 3.15.7
 
 -----
 
@@ -38,7 +36,7 @@ interfaces) of various types.
 
 ### What is new in this release?
 
-Please check the RELEASE\_NOTES file in the distribution for
+Please check the `RELEASE_NOTES` file in the distribution for
 description of changes and release migration details.
 
 ### Copyright
@@ -49,7 +47,7 @@ terms of usage.
 ### Supported platforms
 
 The list of platforms supported by this version of EPICS base is given
-in the configure/CONFIG\_SITE file. If you are trying to build EPICS
+in the `configure/CONFIG_SITE` file. If you are trying to build EPICS
 Base on an unlisted host or for a different target machine you must
 have the proper host/target cross compiler and header files, and you
 will have to create and add the appropriate new configure files to the
@@ -68,31 +66,31 @@ base/configure/os/CONFIG.<host>.<host> if you have problems.
 
 ### Software requirements
 
-**GNU make**  
+**GNU make**
 You must use GNU make, gnumake, for any EPICS builds. Set your path so
 that a gnumake version 3.81 or later is available.
 
-**Perl**  
+**Perl**
 You must have Perl version 5.8.1 or later installed. The EPICS
 configuration files do not specify the perl full pathname, so the perl
 executable must be found through your normal search path.
 
-**Unzip and tar (Winzip on WIN32 systems)**  
+**Unzip and tar (Winzip on WIN32 systems)**
 You must have tools available to unzip and untar the EPICS base
 distribution file.
 
-**Target systems**  
+**Target systems**
 EPICS supports IOCs running on embedded platforms such as VxWorks and
 RTEMS built using a cross-compiler, and also supports soft IOCs
 running as processes on the host platform.
 
-**vxWorks**  
+**vxWorks**
 You must have vxWorks 5.5.x or 6.x installed if any of your target
 systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is now
 too old to support. The vxWorks installation provides the
 cross-compiler and header files needed to build for these targets. The
 absolute path to and the version number of the vxWorks installation
-must be set in the base/configure/os/CONFIG\_SITE.Common.vxWorksCommon
+must be set in the `base/configure/os/CONFIG_SITE.Common.vxWorksCommon`
 file or in one of its target-specific overrides.
 
 Consult the [vxWorks 5.x](https://epics.anl.gov/base/tornado.php) or
@@ -100,19 +98,19 @@ Consult the [vxWorks 5.x](https://epics.anl.gov/base/tornado.php) or
 about and the vxWorks documentation for information about configuring
 your vxWorks operating system for use with EPICS.
 
-**RTEMS**  
+**RTEMS**
 For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
 later.
 
-**GNU readline or Tecla library**  
+**GNU readline or Tecla library**
 GNU readline and Tecla libraries can be used by the IOC shell to
 provide command line editing and command line history recall and edit.
 GNU readline (or Tecla library) must be installed on your target
-system when COMMANDLINE\_LIBRARY is set to READLINE (or TECLA) for
+system when `COMMANDLINE_LIBRARY` is set to READLINE (or TECLA) for
 that target. EPICS (EPICS shell) is the default specified in
-CONFIG\_COMMON. A READLINE override is defined for linux-x86 in the
-EPICS distribution. Comment out COMMANDLINE\_LIBRARY=READLINE in
-configure/os/CONFIG\_SITE.Common.linux-x86 if readline is not
+`CONFIG_COMMON`. A READLINE override is defined for linux-x86 in the
+EPICS distribution. Comment out `COMMANDLINE_LIBRARY=READLINE` in
+`configure/os/CONFIG_SITE.Common.linux-x86` if readline is not
 installed on linux-x86. Command-line editing and history will then be
 those supplied by the os. On vxWorks the ledLib command-line input
 library is used instead.
@@ -136,7 +134,7 @@ base/documentation directory of the distribution.
 
 #### Distribution directory structure:
 
-``` 
+```
         base                    Root directory of the base distribution
         base/configure          Operating system independent build config files
         base/configure/os       Operating system dependent build config files
@@ -147,7 +145,7 @@ base/documentation directory of the distribution.
 
 #### Install directories created by the build:
 
-``` 
+```
         bin                     Installed scripts and executables in subdirs
         cfg                     Installed build configuration files
         db                      Installed data bases
@@ -166,7 +164,7 @@ base/documentation directory of the distribution.
 
 #### base/documentation directory - contains setup, build, and install documents
 
-``` 
+```
         README.md            Instructions for setup and building epics base
         README.darwin.html   Installation notes for Mac OS X (Darwin)
         RELEASE_NOTES.html   Notes on release changes
@@ -175,7 +173,7 @@ base/documentation directory of the distribution.
 
 #### base/startup directory - contains scripts to set environment and path
 
-``` 
+```
         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
         unix.csh            C shell script to set path and env variables
         unix.sh             Bourne shell script to set path and env variables
@@ -185,17 +183,17 @@ base/documentation directory of the distribution.
 
 #### base/configure directory - contains build definitions and rules
 
-``` 
+```
         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_APP_INCLUDE    
+        CONFIG_APP_INCLUDE
         CONFIG_BASE           EPICS base tool and location definitions
         CONFIG_BASE_VERSION   Definitions for EPICS base version number
         CONFIG_COMMON         Definitions common to all builds
         CONFIG_ENV            Definitions of EPICS environment variables
-        CONFIG_FILE_TYPE      
+        CONFIG_FILE_TYPE
         CONFIG_SITE           Site specific make definitions
         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
         MAKEFILE              Installs CONFIG* RULES* creates
@@ -206,16 +204,16 @@ base/documentation directory of the distribution.
         RULES_ARCHS           Definitions and rules for building architectures
         RULES_BUILD           Build and install rules and definitions
         RULES_DIRS            Definitions and rules for building subdirectories
-        RULES_EXPAND          
-        RULES_FILE_TYPE       
-        RULES_TARGET          
+        RULES_EXPAND
+        RULES_FILE_TYPE
+        RULES_TARGET
         RULES_TOP             Rules specific to a <top> 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
@@ -239,24 +237,24 @@ systems.
 Files in the base/startup directory have been provided to help set
 required path and other environment variables.
 
-**EPICS\_HOST\_ARCH**  
+* `EPICS_HOST_ARCH`
 Before you can build or use EPICS R3.15, the environment variable
-EPICS\_HOST\_ARCH must be defined. A perl script EpicsHostArch.pl in
+`EPICS_HOST_ARCH` must be defined. A perl script EpicsHostArch.pl in
 the base/startup directory has been provided to help set
-EPICS\_HOST\_ARCH. You should have EPICS\_HOST\_ARCH set to your
+`EPICS_HOST_ARCH.` You should have `EPICS_HOST_ARCH` set to your
 host operating system followed by a dash and then your host
 architecture, e.g. solaris-sparc. If you are not using the OS
 vendor's c/c++ compiler for host builds, you will need another dash
 followed by the alternate compiler name (e.g. "-gnu" for GNU c/c++
 compilers on a solaris host or "-mingw" for MinGW c/c++ compilers on
-a WIN32 host). See configure/CONFIG\_SITE for a list of supported
-EPICS\_HOST\_ARCH values.
+a WIN32 host). See `configure/CONFIG_SITE` for a list of supported
+`EPICS_HOST_ARCH` values.
 
-**PERLLIB**  
+* `PERLLIB`
 On WIN32, some versions of Perl require that the environment
 variable PERLLIB be set to <perl directory location>.
 
-**PATH**  
+* `PATH`
 As already mentioned, you must have the perl executable and you may
 need C and C++ compilers in your search path. For building base you
 also must have echo in your search path. For Unix host builds you
@@ -265,50 +263,50 @@ also need ln, cpp, cp, rm, mv, and mkdir in your search path and
 ranlib in your path, and the C compiler may require as and ld in
 your path. On solaris systems you need uname in your path.
 
-**LD\_LIBRARY\_PATH**  
+* `LD_LIBRARY_PATH`
 R3.15 shared libraries and executables normally contain the full
 path to any libraries they require. However, if you move the EPICS
 files or directories from their build-time location then in order
-for the shared libraries to be found at runtime LD\_LIBRARY\_PATH
+for the shared libraries to be found at runtime `LD_LIBRARY_PATH`
 must include the full pathname to
-$(INSTALL\_LOCATION)/lib/$(EPICS\_HOST\_ARCH) when invoking
+`$(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)` when invoking
 executables, or some equivalent OS-specific mechanism (such as
 /etc/ld.so.conf on Linux) must be used. Shared libraries are now
 built by default on all Unix type hosts.
 
 #### Do site-specific build configuration
 
-**Site configuration**  
+**Site configuration**
 To configure EPICS, you may want to modify the default definitions
 in the following files:
 
-``` 
+```
         configure/CONFIG_SITE      Build choices. Specify target archs.
         configure/CONFIG_SITE_ENV  Environment variable defaults
         configure/RELEASE          TORNADO2 full path location
 ```
 
-**Host configuration**  
+**Host configuration**
 To configure each host system, you may override the default
 definitions by adding a new file in the configure/os directory with
 override definitions. The new file should have the same name as the
 distribution file to be overridden except with CONFIG in the name
-changed to CONFIG\_SITE.
+changed to `CONFIG_SITE`.
 
-``` 
+```
         configure/os/CONFIG.<host>.<host>      Host build settings
         configure/os/CONFIG.<host>.Common      Host common build settings
 ```
 
-**Target configuration**  
+**Target configuration**
 To configure each target system, you may override the default
 definitions by adding a new file in the configure/os directory with
 override definitions. The new file should have the same name as the
 distribution file to be overridden except with CONFIG in the name
-replaced by CONFIG\_SITE. This step is necessary even if the host
+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
 ```
@@ -319,7 +317,7 @@ After configuring the build you should be able to build EPICS base
 by issuing the following commands in the distribution's root
 directory (base):
 
-``` 
+```
         gnumake clean uninstall
         gnumake
 ```
diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index 707b8b1a7..2adaed582 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,10 +1,6 @@
 # EPICS Base Release 3.15.7
 
-This version of EPICS Base has not been released yet.
-
-## Changes made on the 3.15 branch since 3.15.6
-
-
+## Changes made between 3.15.6 and 3.15.7
 
 ### GNU Readline detection on Linux
 
diff --git a/documentation/ReleaseChecklist.html b/documentation/ReleaseChecklist.html
index 25fe94326..1e3a20b37 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.6-pre1
+            R3.15.7-pre1
             — pre-release tag
             
    • 
           
  • 
-            R3.15.6-rc1
+            R3.15.7-rc1
             — release candidate tag
             
    • 
         

         

           cd base-3.15

-          git tag -m 'RL: Tagged for 3.15.6-rc1' R3.15.6-rc1
+          git tag -m 'ANJ: Tagged for 3.15.7-rc1' R3.15.7-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.6-rc1/ --output=base-3.15.6-rc1.tar.gz R3.15.6-rc1 configure documentation LICENSE Makefile README src startup
+          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
           

         Create a GPG signature file of the tarfile as follows:
         

-          gpg --armor --sign --detach-sig base-3.15.6-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.7-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 'RL: Tagged for 3.15.6' R3.15.6
+          git tag -m 'ANJ: Tagged for 3.15.7' R3.15.7
           

         
       
@@ -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.6/ --output=base-3.15.6.tar.gz R3.15.6 configure documentation LICENSE Makefile README src startup
+          git archive --prefix=base-3.15.7/ --output=base-3.15.7.tar.gz R3.15.7 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.6.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.7.tar.gz