diff options
| -rw-r--r-- | api/leveldb/port/port.h | 27 | ||||
| -rw-r--r-- | dist/api_err.py | 2 | ||||
| -rw-r--r-- | dist/filelist | 4 | ||||
| -rw-r--r-- | dist/s_copyright | 13 | ||||
| -rw-r--r-- | dist/s_copyright.list | 19 | ||||
| -rw-r--r-- | src/conn/api_strerror.c (renamed from src/api/api_strerror.c) | 0 | ||||
| -rw-r--r-- | src/conn/api_version.c (renamed from src/api/api_version.c) | 0 |
7 files changed, 43 insertions, 22 deletions
diff --git a/api/leveldb/port/port.h b/api/leveldb/port/port.h index b6f551182da..1f83635a82c 100644 --- a/api/leveldb/port/port.h +++ b/api/leveldb/port/port.h @@ -1,3 +1,30 @@ +/*- + * Public Domain 2008-2014 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. + * + * 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. + */ + #ifndef _PORT_H_ #define _PORT_H_ 1 /* Stub portability header for imported LevelDB code. */ diff --git a/dist/api_err.py b/dist/api_err.py index 158a7e7ff56..7598b3aef80 100644 --- a/dist/api_err.py +++ b/dist/api_err.py @@ -84,7 +84,7 @@ tfile.write('''\ } ''') tfile.close() -compare_srcfile(tmp_file, '../src/api/api_strerror.c') +compare_srcfile(tmp_file, '../src/conn/api_strerror.c') # Update the error documentation block. tmp_file = '__tmp' diff --git a/dist/filelist b/dist/filelist index b6c86adc9bd..30889760d38 100644 --- a/dist/filelist +++ b/dist/filelist @@ -1,8 +1,6 @@ # filelist -- # List of source files for WiredTiger library. -src/api/api_strerror.c -src/api/api_version.c src/async/async_api.c src/async/async_op.c src/async/async_worker.c @@ -59,6 +57,8 @@ src/config/config_collapse.c src/config/config_concat.c src/config/config_def.c src/config/config_ext.c +src/conn/api_strerror.c +src/conn/api_version.c src/conn/conn_api.c src/conn/conn_cache.c src/conn/conn_cache_pool.c diff --git a/dist/s_copyright b/dist/s_copyright index ba78996044d..76a8ed3b7d2 100644 --- a/dist/s_copyright +++ b/dist/s_copyright @@ -39,7 +39,7 @@ ENDOFTEXT check() { - # Skip auto-generated files, files in which WiredTiger holds no rights. + # Skip files in which WiredTiger holds no rights. if `egrep "skip $1" s_copyright.list > /dev/null`; then return; fi @@ -68,13 +68,16 @@ check() echo "$1: copyright information is incorrect" } -# Search for files, ignoring test/3rdparty. +# Search for files, skipping some well-known 3rd party directories. for i in `cd .. && find [a-z]* -name '*.[chi]' \ -o -name '*.cxx' -o -name '*.in' -o -name '*.java' -o -name '*.py' | - sed -e '/test\/3rdparty\//d' \ - -e '/^build/d' \ - -e '/Makefile.in/d' \ + sed -e '/Makefile.in/d' \ + -e '/^build_posix\//d' \ + -e '/api\/leveldb\/db\//d' \ + -e '/api\/leveldb\/include\//d' \ + -e '/api\/leveldb\/util\//d' \ + -e '/test\/3rdparty\//d' \ -e 's/^\.\///'` do check $i diff --git a/dist/s_copyright.list b/dist/s_copyright.list index 29ec5edcb6f..0cb78ad0aa8 100644 --- a/dist/s_copyright.list +++ b/dist/s_copyright.list @@ -1,13 +1,4 @@ -skip api/leveldb/util/logging.h -skip api/leveldb/util/arena.h -skip api/leveldb/util/posix_logger.h -skip api/leveldb/util/random.h -skip api/leveldb/util/coding.h -skip api/leveldb/port/port.h skip api/leveldb/leveldb_wt.h -skip api/leveldb/db/skiplist.h -skip api/leveldb/db/write_batch_internal.h -skip api/leveldb/db/dbformat.h skip bench/tcbench/wttest.c skip build_posix/wiredtiger_config.h skip dist/api_config.py @@ -24,18 +15,18 @@ skip dist/stat.py skip dist/stat_data.py skip dist/style.py skip lang/java/java_doc.i -skip lang/java/wiredtiger_wrap.c -skip lang/java/src/com/wiredtiger/db/SearchStatus.java skip lang/java/src/com/wiredtiger/db/Connection.java +skip lang/java/src/com/wiredtiger/db/Cursor.java +skip lang/java/src/com/wiredtiger/db/SearchStatus.java skip lang/java/src/com/wiredtiger/db/Session.java +skip lang/java/src/com/wiredtiger/db/wiredtiger.java skip lang/java/src/com/wiredtiger/db/wiredtigerConstants.java -skip lang/java/src/com/wiredtiger/db/Cursor.java skip lang/java/src/com/wiredtiger/db/wiredtigerJNI.java -skip lang/java/src/com/wiredtiger/db/wiredtiger.java +skip lang/java/wiredtiger_wrap.c skip lang/python/wiredtiger/__init__.py skip lang/python/wiredtiger_wrap.c -skip src/api/api_strerror.c skip src/config/config_def.c +skip src/conn/api_strerror.c skip src/docs/tools/doxypy.py skip src/include/extern.h skip src/include/flags.h diff --git a/src/api/api_strerror.c b/src/conn/api_strerror.c index 8cd410d4f01..8cd410d4f01 100644 --- a/src/api/api_strerror.c +++ b/src/conn/api_strerror.c diff --git a/src/api/api_version.c b/src/conn/api_version.c index 1355220c585..1355220c585 100644 --- a/src/api/api_version.c +++ b/src/conn/api_version.c |