From bd9b8394a75c77578ac5d8ea3c15e482b0550292 Mon Sep 17 00:00:00 2001 From: Ben Bierens <39762930+benbierens@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:06:00 +0100 Subject: [PATCH] Update to nim 2 x (#3) * Change the LevelDbCmakeFlags option case * Add nimbledeps to ignored files * Increase version * Add Nim 2.0.12 to the matrix * Fixes STD_REGEX issue introduced by gtest/benchmark submodule * Revert "Fixes STD_REGEX issue introduced by gtest/benchmark submodule" This reverts commit b4db94d75300f9d638869279ab736571eda632e6. * Disables building benchmark tests --------- Co-authored-by: Arnaud --- .github/workflows/main.yml | 2 +- .gitignore | 2 +- leveldbstatic.nimble | 2 +- leveldbstatic/prelude.nim | 8 ++-- leveldbstatic/raw.nim | 78 +++++++++++++++++++------------------- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc86b01..00096b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - nim: [stable, 1.6.18] + nim: [stable, 1.6.18, 2.0.12] steps: - uses: actions/checkout@v2 with: diff --git a/.gitignore b/.gitignore index 8acf99f..71cf941 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,5 @@ leveldbtool *.html *.css build - +nimbledeps *.exe diff --git a/leveldbstatic.nimble b/leveldbstatic.nimble index 8b952fb..46ce744 100644 --- a/leveldbstatic.nimble +++ b/leveldbstatic.nimble @@ -1,6 +1,6 @@ # Package -version = "0.1.6" +version = "0.2.0" author = "leveldbstatic authors" description = "Statically linked LevelDB wrapper for Nim" license = "MIT" diff --git a/leveldbstatic/prelude.nim b/leveldbstatic/prelude.nim index c27e1b9..d6e7322 100644 --- a/leveldbstatic/prelude.nim +++ b/leveldbstatic/prelude.nim @@ -7,11 +7,11 @@ const LevelDbCMakeFlags {.strdefine.} = when defined(macosx): - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" elif defined(windows): - "-G\"MSYS Makefiles\" -DCMAKE_BUILD_TYPE=Release" + "-G\"MSYS Makefiles\" -DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" else: - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" LevelDbDir {.strdefine.} = $(root/"vendor") buildDir = $(root/"build") @@ -29,7 +29,7 @@ proc buildLevelDb() = discard gorge "rm -rf " & buildDir discard gorge "mkdir -p " & buildDir - let cmd = "cmake -S \"" & LevelDbDir & "\" -B \"" & buildDir & "\" " & LevelDbCmakeFlags + let cmd = "cmake -S \"" & LevelDbDir & "\" -B \"" & buildDir & "\" " & LevelDbCMakeFlags echo "\nBuilding LevelDB: " & cmd let (output, exitCode) = gorgeEx cmd if exitCode != 0: diff --git a/leveldbstatic/raw.nim b/leveldbstatic/raw.nim index ea90034..c5116ba 100644 --- a/leveldbstatic/raw.nim +++ b/leveldbstatic/raw.nim @@ -7,11 +7,11 @@ const LevelDbCMakeFlags {.strdefine.} = when defined(macosx): - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" elif defined(windows): - "-G\"MSYS Makefiles\" -DCMAKE_BUILD_TYPE=Release" + "-G\"MSYS Makefiles\" -DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" else: - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release -DLEVELDB_BUILD_BENCHMARKS=OFF" LevelDbDir {.strdefine.} = $(root/"vendor") buildDir = $(root/"build") @@ -29,7 +29,7 @@ proc buildLevelDb() = discard gorge "rm -rf " & buildDir discard gorge "mkdir -p " & buildDir - let cmd = "cmake -S \"" & LevelDbDir & "\" -B \"" & buildDir & "\" " & LevelDbCmakeFlags + let cmd = "cmake -S \"" & LevelDbDir & "\" -B \"" & buildDir & "\" " & LevelDbCMakeFlags echo "\nBuilding LevelDB: " & cmd let (output, exitCode) = gorgeEx cmd if exitCode != 0: @@ -50,9 +50,9 @@ when defined(posix): {.compile: envPosix.} {.passc: "-DLEVELDB_PLATFORM_POSIX".} -# Generated @ 2024-05-22T10:00:37+02:00 +# Generated @ 2024-12-09T16:35:09+01:00 # Command line: -# /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 ./vendor/include/leveldb/c.h +# /home/arnaud/.nimble/pkgs2/nimterop-0.6.13-a93246b2ad5531db11e51de7b2d188c42d95576a/nimterop/toast --compile=./vendor/util/bloom.cc --compile=./vendor/util/arena.cc --compile=./vendor/util/env.cc --compile=./vendor/util/filter_policy.cc --compile=./vendor/util/histogram.cc --compile=./vendor/util/hash.cc --compile=./vendor/util/comparator.cc --compile=./vendor/util/options.cc --compile=./vendor/util/logging.cc --compile=./vendor/util/status.cc --compile=./vendor/util/coding.cc --compile=./vendor/util/cache.cc --compile=./vendor/util/crc32c.cc --compile=./vendor/table/table.cc --compile=./vendor/table/format.cc --compile=./vendor/table/table_builder.cc --compile=./vendor/table/block_builder.cc --compile=./vendor/table/merger.cc --compile=./vendor/table/block.cc --compile=./vendor/table/filter_block.cc --compile=./vendor/table/iterator.cc --compile=./vendor/table/two_level_iterator.cc --compile=./vendor/helpers/memenv/memenv.cc --compile=./vendor/db/filename.cc --compile=./vendor/db/dbformat.cc --compile=./vendor/db/c.cc --compile=./vendor/db/memtable.cc --compile=./vendor/db/version_set.cc --compile=./vendor/db/repair.cc --compile=./vendor/db/builder.cc --compile=./vendor/db/write_batch.cc --compile=./vendor/db/version_edit.cc --compile=./vendor/db/dumpfile.cc --compile=./vendor/db/db_impl.cc --compile=./vendor/db/log_reader.cc --compile=./vendor/db/table_cache.cc --compile=./vendor/db/db_iter.cc --compile=./vendor/db/log_writer.cc --pnim --preprocess --noHeader --includeDirs=./vendor --includeDirs=./vendor/helpers --includeDirs=./vendor/helpers/memenv --includeDirs=./vendor/port --includeDirs=./vendor/include ./vendor/include/leveldb/c.h {.push hint[ConvFromXtoItselfNotNeeded]: off.} import macros @@ -105,44 +105,44 @@ macro defineEnum(typ: untyped): untyped = {.passc: "-I" & root & "/vendor/helpers/memenv".} {.passc: "-I" & root & "/vendor/port".} {.passc: "-I" & root & "/vendor/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/util/bloom.cc".} +{.compile: root & "/vendor/util/arena.cc".} +{.compile: root & "/vendor/util/env.cc".} +{.compile: root & "/vendor/util/filter_policy.cc".} +{.compile: root & "/vendor/util/histogram.cc".} +{.compile: root & "/vendor/util/hash.cc".} +{.compile: root & "/vendor/util/comparator.cc".} +{.compile: root & "/vendor/util/options.cc".} +{.compile: root & "/vendor/util/logging.cc".} +{.compile: root & "/vendor/util/status.cc".} +{.compile: root & "/vendor/util/coding.cc".} +{.compile: root & "/vendor/util/cache.cc".} +{.compile: root & "/vendor/util/crc32c.cc".} +{.compile: root & "/vendor/table/table.cc".} +{.compile: root & "/vendor/table/format.cc".} +{.compile: root & "/vendor/table/table_builder.cc".} +{.compile: root & "/vendor/table/block_builder.cc".} +{.compile: root & "/vendor/table/merger.cc".} +{.compile: root & "/vendor/table/block.cc".} +{.compile: root & "/vendor/table/filter_block.cc".} +{.compile: root & "/vendor/table/iterator.cc".} +{.compile: root & "/vendor/table/two_level_iterator.cc".} +{.compile: root & "/vendor/helpers/memenv/memenv.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/c.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".} +{.compile: root & "/vendor/db/builder.cc".} +{.compile: root & "/vendor/db/write_batch.cc".} +{.compile: root & "/vendor/db/version_edit.cc".} +{.compile: root & "/vendor/db/dumpfile.cc".} +{.compile: root & "/vendor/db/db_impl.cc".} +{.compile: root & "/vendor/db/log_reader.cc".} +{.compile: root & "/vendor/db/table_cache.cc".} +{.compile: root & "/vendor/db/db_iter.cc".} +{.compile: root & "/vendor/db/log_writer.cc".} defineEnum(Enum_ch1) const leveldb_no_compression* = (0).cint