diff options
| -rw-r--r-- | dist/s_copyright | 16 | ||||
| -rw-r--r-- | lang/python/LICENSE | 22 | ||||
| -rw-r--r-- | lang/python/fpacking.py | 24 | ||||
| -rw-r--r-- | lang/python/intpack-test.py | 24 | ||||
| -rw-r--r-- | lang/python/intpacking.py | 24 | ||||
| -rw-r--r-- | lang/python/packing-test.py | 24 | ||||
| -rw-r--r-- | lang/python/packing.py | 24 | ||||
| -rw-r--r-- | lang/python/setup.py | 24 | ||||
| -rw-r--r-- | lang/python/src/server.py | 24 | ||||
| -rw-r--r-- | lang/python/src/wiredtiger/__init__.py | 7 | ||||
| -rw-r--r-- | lang/python/src/wiredtiger/impl/__init__.py | 7 | ||||
| -rw-r--r-- | lang/python/src/wiredtiger/util.py | 7 | ||||
| -rw-r--r-- | lang/python/wiredtiger.i | 5 |
13 files changed, 67 insertions, 165 deletions
diff --git a/dist/s_copyright b/dist/s_copyright index 7c99ebb1273..1ab73970f87 100644 --- a/dist/s_copyright +++ b/dist/s_copyright @@ -14,7 +14,6 @@ trap 'rm -f $c1 $c2 $c3 $c4; exit 0' 0 1 2 3 13 15 year=`date +%Y` cat > $c1 <<ENDOFTEXT -/*- * Copyright (c) 2008-$year WiredTiger, Inc. * All rights reserved. * @@ -23,15 +22,12 @@ ENDOFTEXT # Copyright for files WiredTiger does not own. cat > $c2 <<ENDOFTEXT -/*- * Copyright (c) 2008-$year WiredTiger, Inc. * * This is free and unencumbered software released into the public domain. ENDOFTEXT cat > $c3 <<ENDOFTEXT -# -# # Copyright (c) 2008-$year WiredTiger, Inc. # All rights reserved. # @@ -39,8 +35,6 @@ cat > $c3 <<ENDOFTEXT ENDOFTEXT cat > $c4 <<ENDOFTEXT -# -# # Copyright (c) 2008-$year WiredTiger, Inc. # # This is free and unencumbered software released into the public domain. @@ -58,18 +52,16 @@ check() test -f ../$i || return # Check for a correct copyright header. - if `sed -e 5q ../$1 | diff - $c1 > /dev/null` ; then + if `sed -e 2,4p -e 5q -e d ../$1 | diff - $c1 > /dev/null` ; then return; fi - if `sed -e 4q ../$1 | diff - $c2 > /dev/null` ; then + if `sed -e 2,3p -e 4q -e d ../$1 | diff - $c2 > /dev/null` ; then return; fi - if `sed -e 's/^#!.*/#/' \ - -e 6q ../$1 | diff - $c3 > /dev/null` ; then + if `sed -e 3,5p -e 6q -e d ../$1 | diff - $c3 > /dev/null` ; then return; fi - if `sed -e 's/^#!.*/#/' \ - -e 5q ../$1 | diff - $c4 > /dev/null` ; then + if `sed -e 3,4p -e 5q -e d ../$1 | diff - $c4 > /dev/null` ; then return; fi diff --git a/lang/python/LICENSE b/lang/python/LICENSE new file mode 100644 index 00000000000..d7a422fda11 --- /dev/null +++ b/lang/python/LICENSE @@ -0,0 +1,22 @@ +SWIG is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. See the LICENSE-GPL file for +the full terms of the GNU General Public license version 3. + +Portions of SWIG are also licensed under the terms of the licenses +in the file LICENSE-UNIVERSITIES. You must observe the terms of +these licenses, as well as the terms of the GNU General Public License, +when you distribute SWIG. + +The SWIG library and examples, under the Lib and Examples top level +directories, are distributed under the following terms: + + You may copy, modify, distribute, and make derivative works based on + this software, in source code or object code form, without + restriction. If you distribute the software to others, you may do + so according to the terms of your choice. This software is offered as + is, without warranty of any kind. + +See the COPYRIGHT file for a list of contributors to SWIG and their +copyright notices. diff --git a/lang/python/fpacking.py b/lang/python/fpacking.py index e3c9498a932..adabcfa807e 100644 --- a/lang/python/fpacking.py +++ b/lang/python/fpacking.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. # # WiredTiger fixed-size packing and unpacking functions, using the Python # struct library. diff --git a/lang/python/intpack-test.py b/lang/python/intpack-test.py index acf99ff3045..02c5bf54701 100644 --- a/lang/python/intpack-test.py +++ b/lang/python/intpack-test.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. from intpacking import compress_int diff --git a/lang/python/intpacking.py b/lang/python/intpacking.py index 6b039006836..3c94c1e7416 100644 --- a/lang/python/intpacking.py +++ b/lang/python/intpacking.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. import math, struct diff --git a/lang/python/packing-test.py b/lang/python/packing-test.py index a2e6c0b7a79..065e26e029b 100644 --- a/lang/python/packing-test.py +++ b/lang/python/packing-test.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. from packing import pack, unpack diff --git a/lang/python/packing.py b/lang/python/packing.py index 10e415cd982..a642f70ba75 100644 --- a/lang/python/packing.py +++ b/lang/python/packing.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. # # WiredTiger variable-length packing and unpacking functions diff --git a/lang/python/setup.py b/lang/python/setup.py index 81f14b86280..366f71532eb 100644 --- a/lang/python/setup.py +++ b/lang/python/setup.py @@ -1,27 +1,9 @@ -# Copyright (c) 2008-2012 WiredTiger, Inc. -# -# This is free and unencumbered software released into the public domain. # -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. # -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. +# Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# 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 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. +# See the file LICENSE for redistribution information. import re, os from distutils.core import setup, Extension diff --git a/lang/python/src/server.py b/lang/python/src/server.py index 0cf105c9156..6ec75ef8a24 100644 --- a/lang/python/src/server.py +++ b/lang/python/src/server.py @@ -1,29 +1,9 @@ #!/usr/bin/env python # # Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. # -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# 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 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. +# See the file LICENSE for redistribution information. # # WiredTiger Python RPC server for testing and tutorials. diff --git a/lang/python/src/wiredtiger/__init__.py b/lang/python/src/wiredtiger/__init__.py index c455de1d153..149a95d5138 100644 --- a/lang/python/src/wiredtiger/__init__.py +++ b/lang/python/src/wiredtiger/__init__.py @@ -1,3 +1,10 @@ +# +# +# Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. +# +# See the file LICENSE for redistribution information. +# # WiredTiger public interface ''' diff --git a/lang/python/src/wiredtiger/impl/__init__.py b/lang/python/src/wiredtiger/impl/__init__.py index cb213eef5a1..2078d90a72c 100644 --- a/lang/python/src/wiredtiger/impl/__init__.py +++ b/lang/python/src/wiredtiger/impl/__init__.py @@ -1,3 +1,10 @@ +# +# +# Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. +# +# See the file LICENSE for redistribution information. +# # WiredTiger API implementation ''' diff --git a/lang/python/src/wiredtiger/util.py b/lang/python/src/wiredtiger/util.py index ad4281ffc7c..b8e8f1d65a4 100644 --- a/lang/python/src/wiredtiger/util.py +++ b/lang/python/src/wiredtiger/util.py @@ -1,3 +1,10 @@ +# +# +# Copyright (c) 2008-2012 WiredTiger, Inc. +# All rights reserved. +# +# See the file LICENSE for redistribution information. + import re def parse_config(config): diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index fa8f62225ea..01e0785720b 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -1,4 +1,9 @@ /*- + * Copyright (c) 2008-2012 WiredTiger, Inc. + * All rights reserved. + * + * See the file LICENSE for redistribution information. + * * wiredtiger.i * The SWIG interface file defining the wiredtiger python API. */ |