Move include files into a leveldb subdir.

git-svn-id: https://leveldb.googlecode.com/svn/trunk@18 62dab493-f737-651d-591e-8d6aee1b9529

Makefile

@@ -8,7 +8,7 @@ CC = g++
 #OPT = -O2 -DNDEBUG
 OPT = -g2
 
-CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -std=c++0x $(OPT)
+CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -I./include -std=c++0x $(OPT)
 
 LDFLAGS=-lpthread
 

db/builder.cc

@@ -8,9 +8,9 @@
 #include "db/dbformat.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 

db/builder.h

@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_BUILDER_H_
 #define STORAGE_LEVELDB_DB_BUILDER_H_
 
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

db/corruption_test.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/table.h"
+#include "leveldb/table.h"
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/log_format.h"

db/db_bench.cc

@@ -7,10 +7,10 @@
 #include <stdlib.h>
 #include "db/db_impl.h"
 #include "db/version_set.h"
-#include "include/cache.h"
+#include "leveldb/cache.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 #include "port/port.h"
 #include "util/crc32c.h"
 #include "util/histogram.h"

db/db_impl.cc

@@ -20,11 +20,11 @@
 #include "db/table_cache.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/status.h"
+#include "leveldb/status.h"
-#include "include/table.h"
+#include "leveldb/table.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 #include "port/port.h"
 #include "table/block.h"
 #include "table/merger.h"

db/db_impl.h

@@ -9,8 +9,8 @@
 #include "db/dbformat.h"
 #include "db/log_writer.h"
 #include "db/snapshot.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "port/port.h"
 
 namespace leveldb {

db/db_iter.cc

@@ -6,8 +6,8 @@
 
 #include "db/filename.h"
 #include "db/dbformat.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 #include "port/port.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/db_iter.h

@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_DB_DB_ITER_H_
 
 #include <stdint.h>
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 
 namespace leveldb {

db/db_test.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/table.h"
+#include "leveldb/table.h"
 #include "util/logging.h"
 #include "util/testharness.h"
 #include "util/testutil.h"

db/dbformat.h

@@ -6,10 +6,10 @@
 #define STORAGE_LEVELDB_DB_FORMAT_H_
 
 #include <stdio.h>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 #include "util/coding.h"
 #include "util/logging.h"
 

db/filename.cc

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include "db/filename.h"
 #include "db/dbformat.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/filename.h

@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 #include <string>
-#include "include/slice.h"
+#include "leveldb/slice.h"
-#include "include/status.h"
+#include "leveldb/status.h"
 #include "port/port.h"
 
 namespace leveldb {

db/log_reader.cc

@@ -5,7 +5,7 @@
 #include "db/log_reader.h"
 
 #include <stdint.h>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

db/log_reader.h

@@ -6,8 +6,8 @@
 #define STORAGE_LEVELDB_DB_LOG_READER_H_
 
 #include "db/log_format.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

db/log_test.cc

@@ -4,7 +4,7 @@
 
 #include "db/log_reader.h"
 #include "db/log_writer.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 #include "util/random.h"

db/log_writer.cc

@@ -5,7 +5,7 @@
 #include "db/log_writer.h"
 
 #include <stdint.h>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

db/log_writer.h

@@ -7,8 +7,8 @@
 
 #include <stdint.h>
 #include "db/log_format.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

db/memtable.cc

@@ -4,9 +4,9 @@
 
 #include "db/memtable.h"
 #include "db/dbformat.h"
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 #include "util/coding.h"
 
 namespace leveldb {

db/memtable.h

@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_DB_MEMTABLE_H_
 
 #include <string>
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 #include "db/skiplist.h"
 #include "util/arena.h"

db/repair.cc

@@ -36,9 +36,9 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 

db/skiplist_test.cc

@@ -4,7 +4,7 @@
 
 #include "db/skiplist.h"
 #include <set>
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/arena.h"
 #include "util/hash.h"
 #include "util/random.h"

db/snapshot.h

@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_SNAPSHOT_H_
 #define STORAGE_LEVELDB_DB_SNAPSHOT_H_
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 namespace leveldb {
 

db/table_cache.cc

@@ -5,8 +5,8 @@
 #include "db/table_cache.h"
 
 #include "db/filename.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/table.h"
+#include "leveldb/table.h"
 #include "util/coding.h"
 
 namespace leveldb {

db/table_cache.h

@@ -10,8 +10,8 @@
 #include <string>
 #include <stdint.h>
 #include "db/dbformat.h"
-#include "include/cache.h"
+#include "leveldb/cache.h"
-#include "include/table.h"
+#include "leveldb/table.h"
 #include "port/port.h"
 
 namespace leveldb {

db/version_set.cc

@@ -11,8 +11,8 @@
 #include "db/log_writer.h"
 #include "db/memtable.h"
 #include "db/table_cache.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 #include "table/merger.h"
 #include "table/two_level_iterator.h"
 #include "util/coding.h"

db/write_batch.cc

@@ -14,9 +14,9 @@
 //    len: varint32
 //    data: uint8[len]
 
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 
-#include "include/db.h"
+#include "leveldb/db.h"
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"

db/write_batch_internal.h

@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 #define STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_
 
-#include "include/write_batch.h"
+#include "leveldb/write_batch.h"
 
 namespace leveldb {
 

db/write_batch_test.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/db.h"
+#include "leveldb/db.h"
 
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "util/logging.h"
 #include "util/testharness.h"
 

leveldb.gyp

@@ -12,6 +12,7 @@
     ],
     'include_dirs': [
       '.',
+      'include/',
     ],
     'conditions': [
       ['OS == "win"', {
@@ -42,6 +43,11 @@
           ],
         }],
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'include/',
+        ],
+      },
       'sources': [
         # Include and then exclude so that all files show up in IDEs, even if
         # they don't build.
@@ -73,17 +79,17 @@
         'db/version_set.h',
         'db/write_batch.cc',
         'db/write_batch_internal.h',
-        'include/cache.h',
+        'include/leveldb/cache.h',
-        'include/comparator.h',
+        'include/leveldb/comparator.h',
-        'include/db.h',
+        'include/leveldb/db.h',
-        'include/env.h',
+        'include/leveldb/env.h',
-        'include/iterator.h',
+        'include/leveldb/iterator.h',
-        'include/options.h',
+        'include/leveldb/options.h',
-        'include/slice.h',
+        'include/leveldb/slice.h',
-        'include/status.h',
+        'include/leveldb/status.h',
-        'include/table.h',
+        'include/leveldb/table.h',
-        'include/table_builder.h',
+        'include/leveldb/table_builder.h',
-        'include/write_batch.h',
+        'include/leveldb/write_batch.h',
         'port/port.h',
         'port/port_chromium.cc',
         'port/port_chromium.h',

table/block.cc

@@ -8,7 +8,7 @@
 
 #include <vector>
 #include <algorithm>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
 #include "util/coding.h"
 #include "util/logging.h"
 

table/block.h

@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 

table/block_builder.cc

@@ -30,8 +30,8 @@
 
 #include <algorithm>
 #include <assert.h>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 #include "util/coding.h"
 
 namespace leveldb {

table/block_builder.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include <stdint.h>
-#include "include/slice.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 

table/format.cc

@@ -4,7 +4,7 @@
 
 #include "table/format.h"
 
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "port/port.h"
 #include "table/block.h"
 #include "util/coding.h"

table/format.h

@@ -7,9 +7,9 @@
 
 #include <string>
 #include <stdint.h>
-#include "include/slice.h"
+#include "leveldb/slice.h"
-#include "include/status.h"
+#include "leveldb/status.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 

table/iterator.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 #include "util/logging.h"
 
 namespace leveldb {

table/merger.cc

@@ -4,8 +4,8 @@
 
 #include "table/merger.h"
 
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {

table/table.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table.h"
+#include "leveldb/table.h"
 
-#include "include/cache.h"
+#include "leveldb/cache.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "table/block.h"
 #include "table/format.h"
 #include "table/two_level_iterator.h"

table/table_builder.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 
 #include <assert.h>
 #include <stdio.h>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 #include "table/block_builder.h"
 #include "table/format.h"
 #include "util/coding.h"

table/table_test.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/table.h"
+#include "leveldb/table.h"
 
 #include <map>
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "include/db.h"
+#include "leveldb/db.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
-#include "include/table_builder.h"
+#include "leveldb/table_builder.h"
 #include "table/block.h"
 #include "table/block_builder.h"
 #include "table/format.h"

table/two_level_iterator.cc

@@ -4,7 +4,7 @@
 
 #include "table/two_level_iterator.h"
 
-#include "include/table.h"
+#include "leveldb/table.h"
 #include "table/block.h"
 #include "table/format.h"
 #include "table/iterator_wrapper.h"

table/two_level_iterator.h

@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 
-#include "include/iterator.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 

util/cache.cc

@@ -12,7 +12,7 @@
 
 #include <assert.h>
 
-#include "include/cache.h"
+#include "leveldb/cache.h"
 #include "port/port.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"

util/cache_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/cache.h"
+#include "leveldb/cache.h"
 
 #include <vector>
 #include "util/coding.h"

util/coding.h

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <string>
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 
 namespace leveldb {

util/comparator.cc

@@ -3,8 +3,8 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include <stdint.h>
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "util/logging.h"
 
 namespace leveldb {

util/env.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/env.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 

util/env_chromium.cc

@@ -19,8 +19,8 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 #include "util/logging.h"
 

util/env_posix.cc

@@ -19,8 +19,8 @@
 #if defined(LEVELDB_PLATFORM_ANDROID)
 #include <sys/stat.h>
 #endif
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "port/port.h"
 #include "util/logging.h"
 

util/env_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/env.h"
+#include "leveldb/env.h"
 
 #include "port/port.h"
 #include "util/testharness.h"

util/logging.cc

@@ -8,8 +8,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 

util/options.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "include/options.h"
+#include "leveldb/options.h"
 
-#include "include/comparator.h"
+#include "leveldb/comparator.h"
-#include "include/env.h"
+#include "leveldb/env.h"
 
 namespace leveldb {
 

util/status.cc

@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include "port/port.h"
-#include "include/status.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

util/testharness.h

@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sstream>
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "util/random.h"
 
 namespace leveldb {

util/testutil.h

@@ -5,8 +5,8 @@
 #ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 #define STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 
-#include "include/env.h"
+#include "leveldb/env.h"
-#include "include/slice.h"
+#include "leveldb/slice.h"
 #include "util/random.h"
 
 namespace leveldb {