From 466509b8fc225db0e37021f6e71d0d7648ffcf83 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 7 Mar 2020 07:59:13 -0500 Subject: meson build (subproject imageformats pinned 7.0.0) - subprojects with "manual" git download where upstream git lacks meson.build - imageformats git tag (version) pinned, else build fails --- subprojects/d2sqlite3/.gitignore | 10 -------- subprojects/d2sqlite3/dub.sdl | 29 ----------------------- subprojects/d2sqlite3/meson.build | 48 --------------------------------------- 3 files changed, 87 deletions(-) delete mode 100644 subprojects/d2sqlite3/.gitignore delete mode 100644 subprojects/d2sqlite3/dub.sdl delete mode 100644 subprojects/d2sqlite3/meson.build (limited to 'subprojects/d2sqlite3') diff --git a/subprojects/d2sqlite3/.gitignore b/subprojects/d2sqlite3/.gitignore deleted file mode 100644 index 8d7b4d4..0000000 --- a/subprojects/d2sqlite3/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -.dub -dub.selections.json -__test__* -d2sqlite3-test* -libd2sqlite3.a -TODO.txt -docs.json -docs -sqlite3.o -lib/*/*.lib diff --git a/subprojects/d2sqlite3/dub.sdl b/subprojects/d2sqlite3/dub.sdl deleted file mode 100644 index f2bd29f..0000000 --- a/subprojects/d2sqlite3/dub.sdl +++ /dev/null @@ -1,29 +0,0 @@ -name "d2sqlite3" -description "A thin wrapper around SQLite 3" -homepage "https://github.com/biozic/d2sqlite3" -authors "Nicolas Sicard" "Other contributors: see Github repo" -copyright "Copyright 2011-18 Nicolas Sicard" -license "BSL-1.0" -targetType "library" -configuration "with-lib" { - systemDependencies "SQLite version >= 3.8.7" - libs "sqlite3" - excludedSourceFiles "source/tests.d" -} -configuration "without-lib" { - excludedSourceFiles "source/tests.d" -} -configuration "all-included" { - libs "sqlite3" platform="windows" - copyFiles "lib/win32/sqlite3.dll" "lib/win32/sqlite3.lib" platform="windows-x86" - copyFiles "lib/win64/sqlite3.dll" "lib/win64/sqlite3.lib" platform="windows-x86_64" - preBuildCommands "make -C $PACKAGE_DIR -f sqlite3.mak" platform="posix" - sourceFiles "sqlite3.o" platform="posix" - libs "dl" platform="linux-gdc" - excludedSourceFiles "source/tests.d" -} -configuration "travis" { - preBuildCommands "make -C $PACKAGE_DIR -f sqlite3.mak" platform="posix" - sourceFiles "sqlite3.o" platform="posix" - versions "SqliteEnableColumnMetadata" "SqliteEnableUnlockNotify" -} diff --git a/subprojects/d2sqlite3/meson.build b/subprojects/d2sqlite3/meson.build deleted file mode 100644 index 1726952..0000000 --- a/subprojects/d2sqlite3/meson.build +++ /dev/null @@ -1,48 +0,0 @@ -project('d2sqlite3', 'd', - meson_version: '>=0.46', - license: 'BSL-1.0', - version: '0.18.3' -) - -project_soversion = '0' - -src_dir = include_directories('source/') -pkgc = import('pkgconfig') - -sqlite_dep = dependency('sqlite3') - -d2sqlite3_src = [ - 'source/d2sqlite3/database.d', - 'source/d2sqlite3/internal/memory.d', - 'source/d2sqlite3/internal/util.d', - 'source/d2sqlite3/library.d', - 'source/d2sqlite3/package.d', - 'source/d2sqlite3/results.d', - 'source/d2sqlite3/sqlite3.d', - 'source/d2sqlite3/statement.d', -] -install_subdir('source/d2sqlite3/', install_dir: 'include/d/d2sqlite3/') - -d2sqlite3_lib = library('d2sqlite3', - [d2sqlite3_src], - include_directories: [src_dir], - dependencies: [sqlite_dep], - install: true, - version: meson.project_version(), - soversion: project_soversion -) - -pkgc.generate(name: 'd2sqlite3', - libraries: d2sqlite3_lib, - subdirs: 'd/d2sqlite3/', - version: meson.project_version(), - requires: ['sqlite3'], - description: 'A small wrapper around SQLite for the D programming language.' -) - -# for use by others which embed this as subproject -d2sqlite3_dep = declare_dependency( - link_with: [d2sqlite3_lib], - dependencies: [sqlite_dep], - include_directories: [src_dir] -) -- cgit v1.2.3