diff --git a/build.sh b/build.sh index c81f595..5128be9 100755 --- a/build.sh +++ b/build.sh @@ -42,5 +42,25 @@ toast \ --pnim \ --preprocess \ --noHeader \ + --includeDirs="${sourceDir}" \ + --includeDirs="${sourceDir}/helpers" \ + --includeDirs="${sourceDir}/helpers/memenv" \ + --includeDirs="${sourceDir}/port" \ + --includeDirs="${sourceDir}/include" \ + --includeDirs="${buildDir}/include" \ "${sourceDir}/include/leveldb/c.h" >> "${output}" +# {.compile: "./vendor +# {.compile: root & "/vendor + +# {.passC: "-I./vendor".} +# {.passC: "-I./build/include".} +# {.passC: "-I" & root/"vendor + + + +sed -i 's/\bpassC\b/passc/g' "${output}" + +sed -i 's/{\.compile\:\ \"\./{\.compile\:\ root\ \&\ \"/g' "${output}" +sed -i 's/{\.passc\:\ \"-I\./{\.passc\:\ \"-I\"\ \&\ root\ \&\ \"/g' "${output}" + diff --git a/leveldb/prelude.nim b/leveldb/prelude.nim index b827657..c5cc946 100644 --- a/leveldb/prelude.nim +++ b/leveldb/prelude.nim @@ -12,10 +12,4 @@ when defined(posix): {.compile: envPosix.} {.passc: "-DLEVELDB_PLATFORM_WINDOWS".} -{.passC: "-I" & root/"vendor".} -{.passC: "-I" & root/"vendor"/"helpers".} -{.passC: "-I" & root/"vendor"/"helpers"/"memenv".} -{.passC: "-I" & root/"vendor"/"port".} -{.passC: "-I" & root/"vendor"/"include".} -{.passC: "-I" & root/"build"/"include".} diff --git a/leveldb/raw.nim b/leveldb/raw.nim index 32891e9..8557131 100644 --- a/leveldb/raw.nim +++ b/leveldb/raw.nim @@ -12,17 +12,11 @@ when defined(posix): {.compile: envPosix.} {.passc: "-DLEVELDB_PLATFORM_WINDOWS".} -{.passC: "-I" & root/"vendor".} -{.passC: "-I" & root/"vendor"/"helpers".} -{.passC: "-I" & root/"vendor"/"helpers"/"memenv".} -{.passC: "-I" & root/"vendor"/"port".} -{.passC: "-I" & root/"vendor"/"include".} -{.passC: "-I" & root/"build"/"include".} -# Generated @ 2024-05-10T13:57:11+02:00 +# Generated @ 2024-05-13T10:59:44+02:00 # Command line: -# /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 ./vendor/include/leveldb/c.h +# /home/ben/.nimble/pkgs/nimterop-0.6.13/nimterop/toast --compile=./vendor/db/log_writer.cc --compile=./vendor/db/db_impl.cc --compile=./vendor/db/db_iter.cc --compile=./vendor/db/dumpfile.cc --compile=./vendor/db/c.cc --compile=./vendor/db/builder.cc --compile=./vendor/db/filename.cc --compile=./vendor/db/write_batch.cc --compile=./vendor/db/table_cache.cc --compile=./vendor/db/version_edit.cc --compile=./vendor/db/dbformat.cc --compile=./vendor/db/log_reader.cc --compile=./vendor/db/memtable.cc --compile=./vendor/db/version_set.cc --compile=./vendor/db/repair.cc --compile=./vendor/table/block.cc --compile=./vendor/table/two_level_iterator.cc --compile=./vendor/table/table_builder.cc --compile=./vendor/table/iterator.cc --compile=./vendor/table/block_builder.cc --compile=./vendor/table/merger.cc --compile=./vendor/table/format.cc --compile=./vendor/table/filter_block.cc --compile=./vendor/table/table.cc --compile=./vendor/util/hash.cc --compile=./vendor/util/arena.cc --compile=./vendor/util/options.cc --compile=./vendor/util/histogram.cc --compile=./vendor/util/crc32c.cc --compile=./vendor/util/env.cc --compile=./vendor/util/filter_policy.cc --compile=./vendor/util/bloom.cc --compile=./vendor/util/logging.cc --compile=./vendor/util/coding.cc --compile=./vendor/util/status.cc --compile=./vendor/util/cache.cc --compile=./vendor/util/comparator.cc --compile=./vendor/helpers/memenv/memenv.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 @@ -70,44 +64,50 @@ macro defineEnum(typ: untyped): untyped = {.experimental: "codeReordering".} -{.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".} +{.passc: "-I" & root & "/vendor".} +{.passc: "-I" & root & "/vendor/helpers".} +{.passc: "-I" & root & "/vendor/helpers/memenv".} +{.passc: "-I" & root & "/vendor/port".} +{.passc: "-I" & root & "/vendor/include".} +{.passc: "-I" & root & "/build/include".} +{.compile: root & "/vendor/db/log_writer.cc".} +{.compile: root & "/vendor/db/db_impl.cc".} +{.compile: root & "/vendor/db/db_iter.cc".} +{.compile: root & "/vendor/db/dumpfile.cc".} +{.compile: root & "/vendor/db/c.cc".} +{.compile: root & "/vendor/db/builder.cc".} +{.compile: root & "/vendor/db/filename.cc".} +{.compile: root & "/vendor/db/write_batch.cc".} +{.compile: root & "/vendor/db/table_cache.cc".} +{.compile: root & "/vendor/db/version_edit.cc".} +{.compile: root & "/vendor/db/dbformat.cc".} +{.compile: root & "/vendor/db/log_reader.cc".} +{.compile: root & "/vendor/db/memtable.cc".} +{.compile: root & "/vendor/db/version_set.cc".} +{.compile: root & "/vendor/db/repair.cc".} +{.compile: root & "/vendor/table/block.cc".} +{.compile: root & "/vendor/table/two_level_iterator.cc".} +{.compile: root & "/vendor/table/table_builder.cc".} +{.compile: root & "/vendor/table/iterator.cc".} +{.compile: root & "/vendor/table/block_builder.cc".} +{.compile: root & "/vendor/table/merger.cc".} +{.compile: root & "/vendor/table/format.cc".} +{.compile: root & "/vendor/table/filter_block.cc".} +{.compile: root & "/vendor/table/table.cc".} +{.compile: root & "/vendor/util/hash.cc".} +{.compile: root & "/vendor/util/arena.cc".} +{.compile: root & "/vendor/util/options.cc".} +{.compile: root & "/vendor/util/histogram.cc".} +{.compile: root & "/vendor/util/crc32c.cc".} +{.compile: root & "/vendor/util/env.cc".} +{.compile: root & "/vendor/util/filter_policy.cc".} +{.compile: root & "/vendor/util/bloom.cc".} +{.compile: root & "/vendor/util/logging.cc".} +{.compile: root & "/vendor/util/coding.cc".} +{.compile: root & "/vendor/util/status.cc".} +{.compile: root & "/vendor/util/cache.cc".} +{.compile: root & "/vendor/util/comparator.cc".} +{.compile: root & "/vendor/helpers/memenv/memenv.cc".} defineEnum(Enum_ch1) const leveldb_no_compression* = (0).cint