R3.14.12.2

This allows the same version of Base to be used from both RHEL5 and RHEL6
for example; they use different Perl versions which are not compatible at
the ABI level.

configure/CONFIG_BASE_VERSION

@@ -35,14 +35,14 @@ EPICS_PATCH_LEVEL = 2
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
-#PICS_DEV_SNAPSHOT=-pre1-DEV
+#EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
-EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1
 #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
 

configure/CONFIG_COMMON

@@ -47,7 +47,7 @@ DB_OPT = NO
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
-CHECK_RELEASE_NO =
+CHECK_RELEASE_NO = noCheckRelease
 CHECK_RELEASE_WARN = warnRelease
 
 #-------------------------------------------------------

configure/RULES_BUILD

@@ -167,6 +167,10 @@ checkRelease:
 	$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
+noCheckRelease:
+ifeq ($(EPICS_HOST_ARCH),$(T_A))
+	@echo "Warning: RELEASE file consistency checks have been disabled"
+endif
 
 #---------------------------------------------------------------
 #  The order of the following rules is
@@ -458,7 +462,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all inc build install clean rebuild buildInstall
-.PHONY: runtests checkRelease warnRelease
+.PHONY: runtests checkRelease warnRelease noCheckRelease
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/os/CONFIG.Common.ios-arm

@@ -1,17 +1,15 @@
 # CONFIG.Common.ios-arm
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-arm target builds
+# Sites may override these definitions in CONFIG_SITE.Common.ios-arm
+# or CONFIG_SITE.<host>.ios-arm
 #-------------------------------------------------------
 
 IOS_PLATFORM = iPhoneOS
 
-#
-# Architecture-specific information
-#
-ARCH_CLASS = armv6
-
 OP_SYS_CFLAGS += -fno-inline-functions
 
 # iOS optimization flags for arm architecture

configure/os/CONFIG.Common.ios-x86

@@ -1,8 +1,11 @@
 # CONFIG.Common.ios-x86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.ios-x86
+# or CONFIG_SITE.<host>.ios-x86
 #-------------------------------------------------------
 
 IOS_PLATFORM = iPhoneSimulator

configure/os/CONFIG.Common.iosCommon

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for iOS target archs
+# Definitions for all Apple iOS builds
 # Sites may override these definitions in CONFIG_SITE.Common.iosCommon
 # or CONFIG_SITE.<host>.iosCommon
 #-------------------------------------------------------
@@ -29,8 +29,14 @@ SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_VERSION).sdk
 
 #-------------------------------------------------------
 # Build architecture flags
-ARCH_DEP_CFLAGS += -arch $(ARCH_CLASS)
-ARCH_DEP_LDFLAGS += -arch $(ARCH_CLASS)
+#   ARCH_CLASS must contain a list of CPU architectures which must be
+#   valid arguments to the -arch options for the cc and ld commands.
+#   ARCH_CLASS is defined in a CONFIG_SITE file which is not loaded
+#   until after this file.
+#
+ARCH_DEP_FLAGS = $(addprefix -arch ,$(ARCH_CLASS))
+ARCH_DEP_CFLAGS += $(ARCH_DEP_FLAGS)
+ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 
 #--------------------------------------------------
 # Operating system flags
@@ -49,9 +55,9 @@ OPT_CXXFLAGS_YES += -g
 #-------------------------------------------------------
 # Compiler definitions:
 #   Use clang instead of gcc
-#   Must use g++ still
 CC = $(GNU_BIN)/clang
-CCC = $(GNU_BIN)/c++
+CCC = $(GNU_BIN)/clang++
+GNU_LDLIBS_YES =
 
 #-------------------------------------------------------
 # Linker flags
@@ -80,6 +86,15 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 %.o: %.m
 	$(COMPILE.c) -c $<
 
+#--------------------------------------------------
+# Header dependency file generation
+#
+# Use compiler when ARCH_CLASS is a single arch value
+# otherwise use perl script command
+SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS)))
+HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS)))
+HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD)
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.iosCommon

configure/os/CONFIG_SITE.Common.ios-arm

@@ -0,0 +1,28 @@
+# CONFIG_SITE.Common.ios-arm
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Site-specific settings for ios-arm target builds
+#-------------------------------------------------------
+
+# Which ARM instruction set(s) to generate code for:
+#   Most iOS devices can run programs compiled for both the
+#   ARMv6 and ARMv7 instruction sets. ARMv7 code is usually
+#   more efficient, but the older devices listed below can only
+#   use the ARMv6 instruction set. Including both architectures
+#   generates a Universal binary, which is larger and takes
+#   longer to compile but runs efficiently on all devices.
+#
+#   ARMv6-only devices: iPhone 1 or 3G, iPod Touch Gen 1 or 2
+#
+ARCH_CLASS = armv7
+#ARCH_CLASS = armv6 armv7
+#ARCH_CLASS = armv6
+
+
+# Uncomment these two definitions to use g++ instead of clang++
+# which may be needed in some circumstances:
+#
+#CCC = $(GNU_BIN)/c++
+#GNU_LDLIBS_YES = -lgcc

configure/os/CONFIG_SITE.Common.iosCommon

@@ -10,7 +10,8 @@
 
 #IOS_VERSION = 3.2
 #IOS_VERSION = 4.1
-IOS_VERSION = 4.3
+#IOS_VERSION = 4.3
+IOS_VERSION = 5.0
 
 
 # Most sites will want shared libraries

configure/os/CONFIG_SITE.Common.linux-x86

@@ -33,4 +33,8 @@ COMMANDLINE_LIBRARY = READLINE
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
 
-OP_SYS_CFLAGS += -g
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -33,4 +33,8 @@ COMMANDLINE_LIBRARY = READLINE
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
 
-OP_SYS_CFLAGS += -g
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g

documentation/RELEASE_NOTES.html

@@ -3,16 +3,56 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.14.12.2-rc1 Release Notes</title>
+  <title>EPICS Base R3.14.12.2 Release Notes</title>
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Base Release 3.14.12.2-rc1</h1>
+<h1 align="center">EPICS Base Release 3.14.12.2</h1>
 
-<h2 align="center">Changes between 3.14.12.1 and 3.14.12.2-rc1</h2>
+<h2 align="center">Changes between 3.14.12.1 and 3.14.12.2</h2>
 
 <!-- Insert new items immediately below here ... -->
 
+<h4>Path for Cap5 loadable library changed</h4>
+
+<p>The perl CA module makes use of a loadable library, which used to be loaded
+from the base/lib/&lt;host-arch&gt; directory.  However different versions of
+Perl require different loadable library binaries as the Perl ABI can change.
+Now the library will be installed into and loaded from the directory
+base/lib/perl/&lt;version&gt;/&lt;archname&gt; where both &lt;version&gt; and
+&lt;archname&gt; are taken from the Perl configuration.  This makes it possible
+for the same Perl script to be run on both RHEL5 and RHEL6 workstations say, even
+though they use different versions of Perl.</p>
+
+<p>To achieve that, first build EPICS Base using the older OS version.  Then
+on a machine running the newer version, go into the base/src/cap5 directory and
+run a <tt>make rebuild</tt> command.  This will rebuild the libCap5.so file and
+install it into the location appropriate for its Perl version and architecture.</p>
+
+<h4>Build configurations updated for Apple iOS targets</h4>
+
+<p>The build process can now construct universal binaries containing both ARMv6
+and ARMv7 code, and several defaults have been changed when building for iOS
+targets:</p>
+
+<ul>
+
+<li>The default value for IOS_VERSION is now 5.0, edit the setting in
+<tt>configure/os/CONFIG_SITE.Common.iosCommon</tt> to use an older version.</li>
+
+<li>With the introduction of iOS 5.0 we have switched the C++ compiler for
+ios-arm from GNU g++ to using the LLVM-based clang++ (the GNU compilers are
+apparetnly no longer included with the SDK).  This can be switched back by
+editing the new <tt>CONFIG_SITE.Common.ios-arm</tt> file.</li>
+
+<li>Like the Darwin builds, universal binaries can now be compiled for the
+ios-arm target, containing either or both ARMv6 and ARMv7 instructions. This is
+configured by setting ARCH_CLASS in the new <tt>CONFIG_SITE.Common.ios-arm</tt>
+file. The default is now to build for ARMv7 only, which is not compatible with
+the original iPhone 1 or 3G, or with the iPod Touch Generations 1 or 2.</li>
+
+</ul>
+
 <h4>Added <tt>-b</tt> option to dbExpand</h4>
 
 <p>This turns off monotonic checking of breakpoint tables.</p>

src/cap5/CA.pm

@@ -6,9 +6,6 @@ use warnings;
 
 my $version = '0.4';
 
-exists $ENV{EPICS_HOST_ARCH}
-    or die "EPICS_HOST_ARCH environment variable not set";
-
 
 package CA;
 
@@ -26,12 +23,17 @@ package Cap5;
 our $VERSION = $version;
 our @ISA = qw(DynaLoader);
 
+# Library is specific to the Perl version and archname
+use Config;
+my $perl_version  = $Config::Config{version};
+my $perl_archname = $Config::Config{archname};
+
 require DynaLoader;
 
 # Add our lib/<arch> directory to the shared library search path
 use File::Basename;
 my $Lib = dirname(__FILE__);
-push @DynaLoader::dl_library_path, "$Lib/../$ENV{EPICS_HOST_ARCH}";
+push @DynaLoader::dl_library_path, "$Lib/$perl_version/$perl_archname";
 
 bootstrap Cap5 $VERSION;
 

src/cap5/Makefile

@@ -22,6 +22,11 @@ ifneq ($(findstring darwin,$(T_A)),)
   LOADABLE_SHRLIB_SUFFIX = .bundle
 endif
 
+PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version)
+PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname)
+PERL_ARCHPATH = $(PERL_VERSION)/$(PERL_ARCHNAME)
+
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),)
   # Doesn't build on WIN32
   LOADABLE_LIBRARY_HOST = Cap5
@@ -33,12 +38,11 @@ ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),)
   PERL_SCRIPTS += camonitor.pl
 
   PERL_MODULES += CA.pm
+  PERL_MODULES += $(PERL_ARCHPATH)/$(LOADABLE_SHRLIB_PREFIX)Cap5$(LOADABLE_SHRLIB_SUFFIX)
 
-  ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
-    # Can only create docs in Host build
-    HTMLS_DIR = .
-    HTMLS = CA.html
-  endif
+  HTMLS_DIR = .
+  HTMLS = CA.html
+endif
 endif
 
 Cap5_SRCS = Cap5.xs
@@ -59,6 +63,10 @@ ifdef T_A
 	$(RM) $@
 	podchecker $< && pod2html --infile=$< --outfile=$@
 
+  $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)/%: %
+	$(ECHO) "Installing loadable shared library $@"
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)
+
   clean::
 	$(RM) Cap5.c
 endif

src/dbStatic/dbStaticLib.c

@@ -3916,7 +3916,7 @@ void  epicsShareAPI dbDumpField(
 	    else
 		printf("\t     field_type: %s\n", pamapdbfType[j].strvalue);
 	    printf("\tprocess_passive: %hd\n",pdbFldDes->process_passive);
-	    printf("\t           base: %hd\n",pdbFldDes->base);
+	    printf("\t           base: %d\n",pdbFldDes->base);
 	    if(!pdbFldDes->promptgroup) {
 		printf("\t    promptgroup: %d\n",pdbFldDes->promptgroup);
 	    } else {
@@ -3929,7 +3929,7 @@ void  epicsShareAPI dbDumpField(
 		}
 	    }
 	    printf("\t       interest: %hd\n", pdbFldDes->interest);
-	    printf("\t       as_level: %hd\n",pdbFldDes->as_level);
+	    printf("\t       as_level: %d\n",pdbFldDes->as_level);
             printf("\t        initial: %s\n",
                 (pdbFldDes->initial ? pdbFldDes->initial : ""));
 	    if(pdbFldDes->field_type==DBF_MENU) {

src/gdd/gdd.cc

@@ -1109,7 +1109,7 @@ gddStatus gdd::clearData(void)
 			str->clear();
         }
         else if ( this->primitiveType() == aitEnumFixedString ) {
-            memset ( this->data.FString, '\0', sizeof ( this->data.FString ) );
+            memset ( this->data.FString, '\0', sizeof(aitFixedString) );
         }
         else {
             memset ( & this->data, '\0', sizeof ( this->data ) );

src/libCom/osi/os/WIN32/osdTime.cpp

@@ -60,6 +60,8 @@ static int osdTimeGetCurrent ( epicsTimeStamp *pDest );
 // for mingw
 #if !defined ( MAXLONGLONG )
 #define MAXLONGLONG LL_CONSTANT(0x7fffffffffffffff)
+#endif
+#if !defined ( MINLONGLONG )
 #define MINLONGLONG LL_CONSTANT(~0x7fffffffffffffff)
 #endif
 

src/libCom/osi/os/posix/epicsMath.h

@@ -17,6 +17,11 @@
 extern "C" {
 #endif
 
+#ifdef isfinite
+#  undef finite
+#  define finite(x) isfinite(x)
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 

src/softIoc/makeInstallDir.pl

@@ -14,6 +14,8 @@ die "Path to INSTALL_LOCATION missing\n" unless @ARGV == 1;
 my $path = shift;
 
 $path =~ s/\\/\\\\/gx;
+$path =~ s/^'//;
+$path =~ s/'$//;
 
 print "/* THIS IS A GENERATED FILE. DO NOT EDIT! */\n",
       "\n",