From b5301c2084e46b3b65eb06337de77d40cde916dd Mon Sep 17 00:00:00 2001 From: ThatBen Date: Thu, 9 May 2024 15:37:37 +0200 Subject: [PATCH] remove src folder --- .gitmodules | 4 +- build.sh | 4 +- src/leveldb.nim => leveldb.nim | 0 leveldb.nimble | 5 +- {src/leveldb => leveldb}/raw.nim | 100 +++++++++++++------------ src/leveldbtool.nim => leveldbtool.nim | 0 prelude.nim | 10 ++- src/vendor => vendor | 0 8 files changed, 68 insertions(+), 55 deletions(-) rename src/leveldb.nim => leveldb.nim (100%) rename {src/leveldb => leveldb}/raw.nim (77%) rename src/leveldbtool.nim => leveldbtool.nim (100%) rename src/vendor => vendor (100%) diff --git a/.gitmodules b/.gitmodules index b11fceb..7cf389c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "src/vendor"] - path = src/vendor +[submodule "vendor"] + path = vendor url = https://github.com/google/leveldb diff --git a/build.sh b/build.sh index f7c21f3..a62d04a 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,9 @@ #!/bin/bash root=$(dirname "$0") -sourceDir="${root}/src/vendor" +sourceDir="${root}/vendor" buildDir="${root}/build" -output="${root}/src/leveldb/raw.nim" +output="${root}/leveldb/raw.nim" # install nimterop, if not already installed if ! [ -x "$(command -v toast)" ]; then diff --git a/src/leveldb.nim b/leveldb.nim similarity index 100% rename from src/leveldb.nim rename to leveldb.nim diff --git a/leveldb.nimble b/leveldb.nimble index d113654..41a06b6 100644 --- a/leveldb.nimble +++ b/leveldb.nimble @@ -4,9 +4,10 @@ version = "0.4.1" author = "Michał Zieliński" description = "LevelDB wrapper for Nim" license = "MIT" -srcDir = "src" -installExt = @["nim"] bin = @["leveldbtool"] +installExt = @["nim", "cc", "h", "c", "cpp"] +skipDirs = @["tests"] + # Dependencies diff --git a/src/leveldb/raw.nim b/leveldb/raw.nim similarity index 77% rename from src/leveldb/raw.nim rename to leveldb/raw.nim index 4a1d04b..3235701 100644 --- a/src/leveldb/raw.nim +++ b/leveldb/raw.nim @@ -1,14 +1,20 @@ +import os + +const root = currentSourcePath.parentDir.parentDir +const envWindows = root/"vendor"/"util"/"env_windows.cc" +const envPosix = root/"vendor"/"util"/"env_posix.cc" + when defined(windows): - {.compile: "./src/vendor/util/env_windows.cc".} + {.compile: envWindows.} {.passc: "-DLEVELDB_PLATFORM_POSIX".} when defined(posix): - {.compile: "./src/vendor/util/env_posix.cc".} + {.compile: envPosix.} {.passc: "-DLEVELDB_PLATFORM_WINDOWS".} -# Generated @ 2024-05-09T14:57:19+02:00 +# Generated @ 2024-05-09T15:32:29+02:00 # Command line: -# /home/ben/.nimble/pkgs/nimterop-0.6.13/nimterop/toast --compile=./src/vendor/helpers/memenv/memenv.cc --compile=./src/vendor/table/table.cc --compile=./src/vendor/table/iterator.cc --compile=./src/vendor/table/merger.cc --compile=./src/vendor/table/block.cc --compile=./src/vendor/table/table_builder.cc --compile=./src/vendor/table/format.cc --compile=./src/vendor/table/two_level_iterator.cc --compile=./src/vendor/table/filter_block.cc --compile=./src/vendor/table/block_builder.cc --compile=./src/vendor/db/write_batch.cc --compile=./src/vendor/db/version_edit.cc --compile=./src/vendor/db/dbformat.cc --compile=./src/vendor/db/builder.cc --compile=./src/vendor/db/repair.cc --compile=./src/vendor/db/db_impl.cc --compile=./src/vendor/db/dumpfile.cc --compile=./src/vendor/db/filename.cc --compile=./src/vendor/db/log_reader.cc --compile=./src/vendor/db/memtable.cc --compile=./src/vendor/db/table_cache.cc --compile=./src/vendor/db/c.cc --compile=./src/vendor/db/log_writer.cc --compile=./src/vendor/db/version_set.cc --compile=./src/vendor/db/db_iter.cc --compile=./src/vendor/util/hash.cc --compile=./src/vendor/util/options.cc --compile=./src/vendor/util/comparator.cc --compile=./src/vendor/util/coding.cc --compile=./src/vendor/util/histogram.cc --compile=./src/vendor/util/logging.cc --compile=./src/vendor/util/cache.cc --compile=./src/vendor/util/env.cc --compile=./src/vendor/util/filter_policy.cc --compile=./src/vendor/util/arena.cc --compile=./src/vendor/util/bloom.cc --compile=./src/vendor/util/crc32c.cc --compile=./src/vendor/util/status.cc --pnim --preprocess --noHeader --includeDirs=./src/vendor --includeDirs=./src/vendor/helpers --includeDirs=./src/vendor/helpers/memenv --includeDirs=./src/vendor/port --includeDirs=./src/vendor/include --includeDirs=./build/include ./src/vendor/include/leveldb/c.h +# /home/ben/.nimble/pkgs/nimterop-0.6.13/nimterop/toast --compile=./vendor/helpers/memenv/memenv.cc --compile=./vendor/table/table.cc --compile=./vendor/table/iterator.cc --compile=./vendor/table/merger.cc --compile=./vendor/table/block.cc --compile=./vendor/table/table_builder.cc --compile=./vendor/table/format.cc --compile=./vendor/table/two_level_iterator.cc --compile=./vendor/table/filter_block.cc --compile=./vendor/table/block_builder.cc --compile=./vendor/db/write_batch.cc --compile=./vendor/db/version_edit.cc --compile=./vendor/db/dbformat.cc --compile=./vendor/db/builder.cc --compile=./vendor/db/repair.cc --compile=./vendor/db/db_impl.cc --compile=./vendor/db/dumpfile.cc --compile=./vendor/db/filename.cc --compile=./vendor/db/log_reader.cc --compile=./vendor/db/memtable.cc --compile=./vendor/db/table_cache.cc --compile=./vendor/db/c.cc --compile=./vendor/db/log_writer.cc --compile=./vendor/db/version_set.cc --compile=./vendor/db/db_iter.cc --compile=./vendor/util/hash.cc --compile=./vendor/util/options.cc --compile=./vendor/util/comparator.cc --compile=./vendor/util/coding.cc --compile=./vendor/util/histogram.cc --compile=./vendor/util/logging.cc --compile=./vendor/util/cache.cc --compile=./vendor/util/env.cc --compile=./vendor/util/filter_policy.cc --compile=./vendor/util/arena.cc --compile=./vendor/util/bloom.cc --compile=./vendor/util/crc32c.cc --compile=./vendor/util/status.cc --pnim --preprocess --noHeader --includeDirs=./vendor --includeDirs=./vendor/helpers --includeDirs=./vendor/helpers/memenv --includeDirs=./vendor/port --includeDirs=./vendor/include --includeDirs=./build/include ./vendor/include/leveldb/c.h {.push hint[ConvFromXtoItselfNotNeeded]: off.} import macros @@ -56,50 +62,50 @@ macro defineEnum(typ: untyped): untyped = {.experimental: "codeReordering".} -{.passC: "-I./src/vendor".} -{.passC: "-I./src/vendor/helpers".} -{.passC: "-I./src/vendor/helpers/memenv".} -{.passC: "-I./src/vendor/port".} -{.passC: "-I./src/vendor/include".} +{.passC: "-I./vendor".} +{.passC: "-I./vendor/helpers".} +{.passC: "-I./vendor/helpers/memenv".} +{.passC: "-I./vendor/port".} +{.passC: "-I./vendor/include".} {.passC: "-I./build/include".} -{.compile: "./src/vendor/helpers/memenv/memenv.cc".} -{.compile: "./src/vendor/table/table.cc".} -{.compile: "./src/vendor/table/iterator.cc".} -{.compile: "./src/vendor/table/merger.cc".} -{.compile: "./src/vendor/table/block.cc".} -{.compile: "./src/vendor/table/table_builder.cc".} -{.compile: "./src/vendor/table/format.cc".} -{.compile: "./src/vendor/table/two_level_iterator.cc".} -{.compile: "./src/vendor/table/filter_block.cc".} -{.compile: "./src/vendor/table/block_builder.cc".} -{.compile: "./src/vendor/db/write_batch.cc".} -{.compile: "./src/vendor/db/version_edit.cc".} -{.compile: "./src/vendor/db/dbformat.cc".} -{.compile: "./src/vendor/db/builder.cc".} -{.compile: "./src/vendor/db/repair.cc".} -{.compile: "./src/vendor/db/db_impl.cc".} -{.compile: "./src/vendor/db/dumpfile.cc".} -{.compile: "./src/vendor/db/filename.cc".} -{.compile: "./src/vendor/db/log_reader.cc".} -{.compile: "./src/vendor/db/memtable.cc".} -{.compile: "./src/vendor/db/table_cache.cc".} -{.compile: "./src/vendor/db/c.cc".} -{.compile: "./src/vendor/db/log_writer.cc".} -{.compile: "./src/vendor/db/version_set.cc".} -{.compile: "./src/vendor/db/db_iter.cc".} -{.compile: "./src/vendor/util/hash.cc".} -{.compile: "./src/vendor/util/options.cc".} -{.compile: "./src/vendor/util/comparator.cc".} -{.compile: "./src/vendor/util/coding.cc".} -{.compile: "./src/vendor/util/histogram.cc".} -{.compile: "./src/vendor/util/logging.cc".} -{.compile: "./src/vendor/util/cache.cc".} -{.compile: "./src/vendor/util/env.cc".} -{.compile: "./src/vendor/util/filter_policy.cc".} -{.compile: "./src/vendor/util/arena.cc".} -{.compile: "./src/vendor/util/bloom.cc".} -{.compile: "./src/vendor/util/crc32c.cc".} -{.compile: "./src/vendor/util/status.cc".} +{.compile: "./vendor/helpers/memenv/memenv.cc".} +{.compile: "./vendor/table/table.cc".} +{.compile: "./vendor/table/iterator.cc".} +{.compile: "./vendor/table/merger.cc".} +{.compile: "./vendor/table/block.cc".} +{.compile: "./vendor/table/table_builder.cc".} +{.compile: "./vendor/table/format.cc".} +{.compile: "./vendor/table/two_level_iterator.cc".} +{.compile: "./vendor/table/filter_block.cc".} +{.compile: "./vendor/table/block_builder.cc".} +{.compile: "./vendor/db/write_batch.cc".} +{.compile: "./vendor/db/version_edit.cc".} +{.compile: "./vendor/db/dbformat.cc".} +{.compile: "./vendor/db/builder.cc".} +{.compile: "./vendor/db/repair.cc".} +{.compile: "./vendor/db/db_impl.cc".} +{.compile: "./vendor/db/dumpfile.cc".} +{.compile: "./vendor/db/filename.cc".} +{.compile: "./vendor/db/log_reader.cc".} +{.compile: "./vendor/db/memtable.cc".} +{.compile: "./vendor/db/table_cache.cc".} +{.compile: "./vendor/db/c.cc".} +{.compile: "./vendor/db/log_writer.cc".} +{.compile: "./vendor/db/version_set.cc".} +{.compile: "./vendor/db/db_iter.cc".} +{.compile: "./vendor/util/hash.cc".} +{.compile: "./vendor/util/options.cc".} +{.compile: "./vendor/util/comparator.cc".} +{.compile: "./vendor/util/coding.cc".} +{.compile: "./vendor/util/histogram.cc".} +{.compile: "./vendor/util/logging.cc".} +{.compile: "./vendor/util/cache.cc".} +{.compile: "./vendor/util/env.cc".} +{.compile: "./vendor/util/filter_policy.cc".} +{.compile: "./vendor/util/arena.cc".} +{.compile: "./vendor/util/bloom.cc".} +{.compile: "./vendor/util/crc32c.cc".} +{.compile: "./vendor/util/status.cc".} defineEnum(Enum_ch1) const leveldb_no_compression* = (0).cint diff --git a/src/leveldbtool.nim b/leveldbtool.nim similarity index 100% rename from src/leveldbtool.nim rename to leveldbtool.nim diff --git a/prelude.nim b/prelude.nim index 21eb4a1..4309bed 100644 --- a/prelude.nim +++ b/prelude.nim @@ -1,7 +1,13 @@ +import os + +const root = currentSourcePath.parentDir.parentDir +const envWindows = root/"vendor"/"util"/"env_windows.cc" +const envPosix = root/"vendor"/"util"/"env_posix.cc" + when defined(windows): - {.compile: "./src/vendor/util/env_windows.cc".} + {.compile: envWindows.} {.passc: "-DLEVELDB_PLATFORM_POSIX".} when defined(posix): - {.compile: "./src/vendor/util/env_posix.cc".} + {.compile: envPosix.} {.passc: "-DLEVELDB_PLATFORM_WINDOWS".} diff --git a/src/vendor b/vendor similarity index 100% rename from src/vendor rename to vendor