From f226c7ac969f191f0a494b25f82b3300a26d9fe5 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 3 Aug 2015 16:23:21 -0500 Subject: [PATCH 1/4] Add LICENSE file copied from pvDataCPP --- LICENSE | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3f43ff2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,78 @@ + +Copyright (c) 2008 Martin R. Kraimer +Copyright (c) 2006 The University of Chicago, as Operator of Argonne + National Laboratory. +Copyright (c) 2006 Deutsches Elektronen-Synchrotron, + Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. +Copyright (c) 2007 Control System Laboratory, + (COSYLAB) Ljubljana Slovenia + + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +________________________________________________________________________ + +This software is in part copyrighted by the University of Chicago (UofC) + +In no event shall UofC be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +UofC has been advised of the possibility of such damage. + +UofC specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and UofC has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + +________________________________________________________________________ + +This software is in part copyrighted by the BERLINER SPEICHERRING +GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. + +In no event shall BESSY be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +BESSY has been advised of the possibility of such damage. + +BESSY specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and BESSY has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + +________________________________________________________________________ + +This software is in part copyrighted by the Deutsches Elektronen-Synchroton, + Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. + +In no event shall DESY be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +DESY has been advised of the possibility of such damage. + +DESY specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and DESY has no obligation to provide maintenance, support, +updates, enhancements, or modifications. +________________________________________________________________________ From 36b8e601528a2e2fc5093fa1a62958f2d50e14e3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 3 Aug 2015 16:47:28 -0500 Subject: [PATCH 2/4] Fix module name in sources LICENSE reference --- src/nt/nt.h | 2 +- src/nt/ntfield.cpp | 2 +- src/nt/ntfield.h | 2 +- src/nt/ntmultiChannel.cpp | 2 +- src/nt/ntmultiChannel.h | 2 +- src/nt/ntnameValue.cpp | 2 +- src/nt/ntnameValue.h | 2 +- src/nt/ntndarray.cpp | 2 +- src/nt/ntndarray.h | 2 +- src/nt/ntscalar.cpp | 2 +- src/nt/ntscalar.h | 2 +- src/nt/ntscalarArray.cpp | 2 +- src/nt/ntscalarArray.h | 2 +- src/nt/nttable.cpp | 2 +- src/nt/nttable.h | 2 +- src/nt/ntutils.cpp | 2 +- src/nt/ntutils.h | 2 +- test/nt/ntfieldTest.cpp | 2 +- test/nt/ntmultiChannelTest.cpp | 2 +- test/nt/ntnameValueTest.cpp | 2 +- test/nt/ntndarrayTest.cpp | 2 +- test/nt/ntscalarArrayTest.cpp | 2 +- test/nt/ntscalarTest.cpp | 2 +- test/nt/nttableTest.cpp | 2 +- test/nt/ntutilsTest.cpp | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/nt/nt.h b/src/nt/nt.h index 41d5666..4dd5e48 100644 --- a/src/nt/nt.h +++ b/src/nt/nt.h @@ -1,7 +1,7 @@ /* nt.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NT_H diff --git a/src/nt/ntfield.cpp b/src/nt/ntfield.cpp index 450ee3e..31744bc 100644 --- a/src/nt/ntfield.cpp +++ b/src/nt/ntfield.cpp @@ -1,7 +1,7 @@ /* ntfield.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntfield.h b/src/nt/ntfield.h index 9ad6d7e..644130f 100644 --- a/src/nt/ntfield.h +++ b/src/nt/ntfield.h @@ -1,7 +1,7 @@ /* ntfield.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTFIELD_H diff --git a/src/nt/ntmultiChannel.cpp b/src/nt/ntmultiChannel.cpp index b48086a..8a2a0a4 100644 --- a/src/nt/ntmultiChannel.cpp +++ b/src/nt/ntmultiChannel.cpp @@ -1,7 +1,7 @@ /* ntmultiChannel.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntmultiChannel.h b/src/nt/ntmultiChannel.h index c0e806f..1b15b6f 100644 --- a/src/nt/ntmultiChannel.h +++ b/src/nt/ntmultiChannel.h @@ -1,7 +1,7 @@ /* ntmultiChannel.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTMULTICHANNEL_H diff --git a/src/nt/ntnameValue.cpp b/src/nt/ntnameValue.cpp index c396758..6e7f8d8 100644 --- a/src/nt/ntnameValue.cpp +++ b/src/nt/ntnameValue.cpp @@ -1,7 +1,7 @@ /* ntnameValue.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntnameValue.h b/src/nt/ntnameValue.h index eb617a1..ec3c185 100644 --- a/src/nt/ntnameValue.h +++ b/src/nt/ntnameValue.h @@ -1,7 +1,7 @@ /* ntnameValue.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTNAMEVALUE_H diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp index f00be5c..498997a 100644 --- a/src/nt/ntndarray.cpp +++ b/src/nt/ntndarray.cpp @@ -1,7 +1,7 @@ /* ntndarray.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntndarray.h b/src/nt/ntndarray.h index fd0725f..ea485f3 100644 --- a/src/nt/ntndarray.h +++ b/src/nt/ntndarray.h @@ -1,7 +1,7 @@ /* ntndarray.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTNDARRAY_H diff --git a/src/nt/ntscalar.cpp b/src/nt/ntscalar.cpp index 969a4f2..e55f934 100644 --- a/src/nt/ntscalar.cpp +++ b/src/nt/ntscalar.cpp @@ -1,7 +1,7 @@ /* ntscalar.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntscalar.h b/src/nt/ntscalar.h index d4e3da6..6c4193e 100644 --- a/src/nt/ntscalar.h +++ b/src/nt/ntscalar.h @@ -1,7 +1,7 @@ /* ntscalar.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTSCALAR_H diff --git a/src/nt/ntscalarArray.cpp b/src/nt/ntscalarArray.cpp index 07bc2d2..8b77739 100644 --- a/src/nt/ntscalarArray.cpp +++ b/src/nt/ntscalarArray.cpp @@ -1,7 +1,7 @@ /* ntscalarArray.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntscalarArray.h b/src/nt/ntscalarArray.h index 6584eb0..3eac531 100644 --- a/src/nt/ntscalarArray.h +++ b/src/nt/ntscalarArray.h @@ -1,7 +1,7 @@ /* ntscalarArray.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTSCALARARRAY_H diff --git a/src/nt/nttable.cpp b/src/nt/nttable.cpp index e455cf8..7a67233 100644 --- a/src/nt/nttable.cpp +++ b/src/nt/nttable.cpp @@ -1,7 +1,7 @@ /* nttable.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/nttable.h b/src/nt/nttable.h index 38a427a..d43bb59 100644 --- a/src/nt/nttable.h +++ b/src/nt/nttable.h @@ -1,7 +1,7 @@ /* nttable.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTTABLE_H diff --git a/src/nt/ntutils.cpp b/src/nt/ntutils.cpp index 0e38f31..5e244af 100644 --- a/src/nt/ntutils.cpp +++ b/src/nt/ntutils.cpp @@ -1,7 +1,7 @@ /* ntutils.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntutils.h b/src/nt/ntutils.h index a3c9cb5..1f28c91 100644 --- a/src/nt/ntutils.h +++ b/src/nt/ntutils.h @@ -1,7 +1,7 @@ /* ntutils.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTUTILS_H diff --git a/test/nt/ntfieldTest.cpp b/test/nt/ntfieldTest.cpp index dccee87..c05f09a 100644 --- a/test/nt/ntfieldTest.cpp +++ b/test/nt/ntfieldTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/test/nt/ntmultiChannelTest.cpp b/test/nt/ntmultiChannelTest.cpp index 8d4c1fe..3717dd1 100644 --- a/test/nt/ntmultiChannelTest.cpp +++ b/test/nt/ntmultiChannelTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ /* diff --git a/test/nt/ntnameValueTest.cpp b/test/nt/ntnameValueTest.cpp index a42695d..96dba60 100644 --- a/test/nt/ntnameValueTest.cpp +++ b/test/nt/ntnameValueTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/test/nt/ntndarrayTest.cpp b/test/nt/ntndarrayTest.cpp index 6939739..546b96c 100644 --- a/test/nt/ntndarrayTest.cpp +++ b/test/nt/ntndarrayTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/test/nt/ntscalarArrayTest.cpp b/test/nt/ntscalarArrayTest.cpp index aee7e2e..35a74e9 100644 --- a/test/nt/ntscalarArrayTest.cpp +++ b/test/nt/ntscalarArrayTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/test/nt/ntscalarTest.cpp b/test/nt/ntscalarTest.cpp index 070f3da..d081956 100644 --- a/test/nt/ntscalarTest.cpp +++ b/test/nt/ntscalarTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/test/nt/nttableTest.cpp b/test/nt/nttableTest.cpp index 5e1d509..07913d4 100644 --- a/test/nt/nttableTest.cpp +++ b/test/nt/nttableTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/test/nt/ntutilsTest.cpp b/test/nt/ntutilsTest.cpp index 5180657..cc57ddc 100644 --- a/test/nt/ntutilsTest.cpp +++ b/test/nt/ntutilsTest.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ From c7a58af787feee20337e6a4a24347d7644877d12 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 11 Aug 2015 16:53:36 -0500 Subject: [PATCH 3/4] Add COPYRIGHT file --- COPYRIGHT | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 COPYRIGHT diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..8ae1591 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,29 @@ +This software is in part copyrighted by the various organizations and +individuals listed below. Permission to use it is set out in the file +LICENSE that accompanies the software. + +In no event shall any copyright holder be liable to any party for +direct, indirect, special, incidental, or consequential damages arising +out of the use of this software, its documentation, or any derivatives +thereof, even if they have been advised of the possibility of such +damage. + +The copyright holders specifically disclaim any warranties, including, +but not limited to, the implied warranties of merchantability, fitness +for a particular purpose, and non-infringement. This software is +provided on an "as is" basis, and the copyright holders have no +obligation either collectively or individually to provide maintenance, +support, updates, enhancements, or modifications. + +Copyright (c) 2006 - 2015 + +Martin R. Kraimer +The University of Chicago, as Operator of Argonne National Laboratory. +Deutsches Elektronen-Synchroton, Member of the Helmholtz Association, + (DESY), HAMBURG, GERMANY, +BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. + (BESSY), BERLIN, GERMANY. +COSYLAB (Control System Laboratory), Ljubljana Slovenia +Brookhaven Science Associates, as Operator of Brookhaven + National Laboratory. +Diamond Light Source Ltd. From b976d918d572b12c0a4be3030b49857683fd0429 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 11 Aug 2015 17:43:31 -0500 Subject: [PATCH 4/4] Resolves epics-base/normativeTypesCPP #1