Andrew Johnson
3a4ad7bfd8
Merged Dirk Zimoch's non-val-attributes branch
2012-01-21 15:20:11 -06:00
Andrew Johnson
946ab722a1
Merged changes from 3.14 branch
...
Includes all changes up to the 3.14.12.2 release on 2011-12-12.
2011-12-12 16:16:33 -06:00
Janet Anderson
0c67efd50a
R3.14.12.2-DEV
2011-12-12 14:37:04 -06:00
Janet Anderson
5b0693f53d
R3.14.12.2
2011-12-12 14:09:32 -06:00
Janet Anderson
36be34656e
Creating 3.14.12.2
2011-12-12 14:08:00 -06:00
Andrew Johnson
4a5b8a37df
cap5: Load libCap5.so from lib/perl/<perl-version>/<perl-archname>
...
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.
2011-12-10 23:11:33 -06:00
Andrew Johnson
e289af684f
configure/linux: Move -g option to OPT_CFLAGS_YES
...
We were adding it to OP_SYS_CFLAGS but if HOST_OPT=NO
you then get two -g options on the gcc command line.
2011-12-07 13:56:04 -06:00
Andrew Johnson
f207b00b05
tools: Use Carp
...
Use carp and croak instead of warn and die in library routines.
2011-12-05 14:56:50 -06:00
Andrew Johnson
8cb8ad081b
softIoc: Strip single-quote chars from arg
...
Most shells strip the single-quote chars from arguments, but on
win32-x86 this is not happening so we need to do it ourselves.
The single quotes are important to prevent un-escaping of things
that shouldn't be unescaped.
2011-12-05 12:43:26 -06:00
Andrew Johnson
52ee9916e6
configure: Print a warning when CHECK_RELEASE = NO
2011-12-02 14:10:24 -06:00
Andrew Johnson
3fc6a77fb0
libCom/posix: Define finite() for uClibc
...
The finite() function is provided in glibc but not in uClibc.
C99 requires isfinite() to be a macro, so we can test for it
and define our own finite() macro in osi/os/posix/epicsMath.h
2011-12-02 11:07:04 -06:00
Andrew Johnson
df6f042b5a
configure: Update Apple iOS builds
...
* Default IOS_VERSION to 5.0
* Allow ARMv6 and ARMv7 universal binaries by setting ARCH_CLASS
* Switch from g++ to clang++
2011-12-02 10:42:43 -06:00
Andrew Johnson
3b268475d3
Fix some warnings reported by Clang.
2011-11-29 16:14:19 -06:00
Andrew Johnson
2010e58c61
libCom/win32: Conditionally define MINLONGLONG
...
Some version of Visual Studio define MAXLONGLONG but not
MINLONGLONG, so they need separate checks.
2011-11-29 14:07:29 -06:00
Andrew Johnson
54401d5426
Set snapshot to 3.14.12.2-rc1-DEV
2011-11-28 16:37:47 -06:00
Andrew Johnson
db0c9d7d82
Creating 3.14.12.2-rc1
...
Set version number, update release notes.
2011-11-28 16:35:43 -06:00
Andrew Johnson
b791a3692b
libCom: Clean up win32 build warning
...
Delete CFLAG added for the Borland compiler (no longer supported).
2011-11-28 15:54:49 -06:00
Benjamin Franksen
0e41c03ff2
dbStatic: Fix windows build issue
...
fixes: lp:894276
2011-11-28 12:55:55 -06:00
Andrew Johnson
b5ec6e2448
catools: Edited camonitor help text.
2011-11-21 12:30:02 -06:00
unknown
d077c8b0ff
dbStatic: Added -b option to dbExpand
...
-b turns off monotonic checking of breakpoint tables.
2011-11-21 11:33:26 -06:00
Andrew Johnson
7529ca7a9b
menuGlobal: Now needs dbExpand executable
2011-11-14 18:25:13 -06:00
Andrew Johnson
ab4376c54a
Merge 3.14 changes up to 3.14.12.2-pre1 release
2011-11-14 17:42:50 -06:00
Andrew Johnson
1b345481ba
ioc/db: Generate menuGlobal.dbd
...
The source just duplicates what's in the Makefile anyway.
2011-11-14 17:38:36 -06:00
Andrew Johnson
b48979f5a5
Set snapshot to 3.14.12.2-pre1-DEV
2011-11-14 14:07:02 -06:00
Andrew Johnson
967ce8eb84
Creating 3.14.12.2-pre1
...
Set version number, update release notes.
2011-11-14 14:03:22 -06:00
Andrew Johnson
b27e22d75e
Makefile cleanup
...
Various minor changes to comments and build variable names.
2011-11-14 12:33:07 -06:00
Jeff Hill
6ef52b5d03
fixed launchpad bug 697509, Thread synchronization issue in libCom/osi/os/WIN32/osdTime.cpp
2011-11-10 17:34:47 -07:00
Jeff Hill
652235ef13
fixed LP Bug #697517 , WIN32 osdtime should handle the system time change properly
2011-11-10 17:22:22 -07:00
Jeff Hill
5b46eebe1a
fixed LP bug 697516, PLL time adjustments fail if user sets system time before EPICS epoch
2011-11-10 14:52:22 -07:00
Jeff Hill
a252218e69
fixed launchpad bug 697519 (rollover time diff calc off by two ticks)
2011-11-10 14:03:01 -07:00
Andrew Johnson
fae5bbcf86
cap5: Don't try to process POD on Win32
2011-11-10 13:29:33 -06:00
Andrew Johnson
a0c1c0fb15
makeBaseApp: Remove local duplicates of library functions
...
Replace the buggy local copies of the functions UnixPath(),
LocalPath(), readRelease() and expandRelease() with the
library versions from our EPICS::Path and EPICS::Release
perl modules.
2011-11-08 17:51:19 -06:00
Andrew Johnson
bb14c6594b
Win32: Fix for lp:861214
2011-11-08 15:57:15 -06:00
Andrew Johnson
0dfbd460e1
configure: Fix potential parallel build issue
...
When creating files in ../O.Common it is eesential to use atomic
file replacement rather than deleting the old file and creating
a new one in its place, because two or three architectures could
be being built in parallel which might interfere.
This commit also ensures that .dbd.d files are constructed
properly when using 'make -s'; $(ECHO) does nothing then.
2011-11-08 13:23:25 -06:00
Andrew Johnson
b36b07db9e
Clean up some compiler warnings reported by J. Lewis Muir.
2011-11-07 11:58:09 -06:00
Andrew Johnson
4d0c0f4b51
Merged changes from 3.14 branch up to 2011-11-02
2011-11-02 14:59:18 -05:00
Andrew Johnson
ee95f0c4b7
catools: Fix array handling in caget and camonitor.
...
Fixes lp:794749
2011-11-02 11:26:29 -05:00
Andrew Johnson
5c8c08bf66
documentation: Regenerate README.1st, add instructions to .html
...
I use the elinks program to convert the .html into the text format.
2011-10-28 18:27:50 -05:00
Michael Davidsaver
5c8e6e9224
libCom: printf spec for cantProceed
2011-10-28 15:30:08 -05:00
Andrew Johnson
0b92d61a14
libCom/test: Added epicsTypesTest, checks type sizes.
2011-10-28 15:19:54 -05:00
Andrew Johnson
d72b4a3c1e
Fix install problems when using parallel builds.
...
If two targets using the same OS are built in parallel,
they can both try to install the same include/os/* file
at the same time, causing the installEpics.pl script to
die. We fix this by making all installations atomic:
First copy the file to the installation directory using
a unique name, then rename it to the target name. The
target name is in the same directory and filesystem as
the temporary name, so the rename should be atomic.
2011-10-28 13:19:08 -05:00
Andrew Johnson
21b4acfa86
ca: Remove anonymous namespace from acctstRegister.cpp
...
The 3.14 branch still supports vxWorks 5.4.2 whose compiler
doesn't contain any namespace support.
2011-10-19 17:36:21 -05:00
Jeff Hill johill@lanl.gov
96cad82a2a
o fixed launchpad epics base bug 878372
...
o fixed launchpad epics base bug 878387
o added regression test for bug 878372
o build the optional test and diagnostic codes for all (not just vxWorks) IOCs
o added acctstRegister optional IOC shell registration for regression tests
2011-10-19 12:07:00 -06:00
Andrew Johnson
b3ec73edcf
Moved devTestAsyn to lp:epics-base-tests
...
These device supports are for testing asynchronous processing
and are currently only used in the regression test suite.
2011-10-04 04:42:00 -05:00
Andrew Johnson
d088d4b664
configure: Correct INSTALL_DBDFLAGS and INSTALL_DBFLAGS
...
fixes lp:861627
2011-09-28 15:33:22 -05:00
Andrew Johnson
6cb9a3f7c1
iocInit: Added some database sanity checks to iocIInit
...
Two menus can get modified by users; these checks make sure they
haven't been damaged too much:
* menuConvert is checked to flag problems with IOCs converted from
3.13.x, where the SLOPE choice didn't exist.
* menuScan is checked to ensure the three initial choices are still
present and that there is at least one periodic scan rate.
2011-09-26 16:42:15 -05:00
Till Straumann
6c4164d953
libCom: Second fix for RT thread priority
...
The previous fix prevented epicsThreads from working properly when
the RT scheduler is *not* used.
fixes lp:835138
2011-09-21 09:55:52 -05:00
Andrew Johnson
d59a0ac06f
Merged 3.14 changes from 2011-08-23 to 2011-09-15
2011-09-20 13:07:52 -05:00
Janet Anderson
032e990c1e
Made all clean rules single colon rules. Added CLEANS macro to list
...
created files to be removed by "make clean" in O.<arch> directory.
Replaced clean rule in Makefiles with a CLEANS definition.
2011-09-15 14:12:14 -05:00
Janet Anderson
69609896e4
Made all clean rules single colon rules. Added CLEANS macro to list
...
created files to be removed by "make clean" in O.<arch> directory.
Replaced clean rule in Makefiles with a CLEANS definition.
2011-09-15 14:05:05 -05:00