From 2c95e88e40ff3cf021eb9e2e0b7a87f68d5e1e37 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 6 Mar 2020 15:11:55 -0500 Subject: meson using dub - the good - works - project looks pretty clean - the bad - subprojects built externally - not suitable for debian packaging --- subprojects/README | 22 ----------------- subprojects/d2sqlite3.dub.sdl | 29 ---------------------- subprojects/d2sqlite3.meson.build | 48 ------------------------------------ subprojects/dyaml.wrap | 4 --- subprojects/imageformats.dub.sdl | 7 ------ subprojects/imageformats.meson.build | 40 ------------------------------ subprojects/tinyendian.wrap | 4 --- 7 files changed, 154 deletions(-) delete mode 100644 subprojects/README delete mode 100644 subprojects/d2sqlite3.dub.sdl delete mode 100644 subprojects/d2sqlite3.meson.build delete mode 100644 subprojects/dyaml.wrap delete mode 100644 subprojects/imageformats.dub.sdl delete mode 100644 subprojects/imageformats.meson.build delete mode 100644 subprojects/tinyendian.wrap (limited to 'subprojects') diff --git a/subprojects/README b/subprojects/README deleted file mode 100644 index c4d9dcc..0000000 --- a/subprojects/README +++ /dev/null @@ -1,22 +0,0 @@ -- d2sqlite3 - - dub - - https://code.dlang.org/packages/d2sqlite3 - - upstream - - https://github.com/biozic/d2sqlite3 -- dyaml - - dub - - https://code.dlang.org/packages/dyaml - - upstream - - https://github.com/dlang-community/D-YAML - - upstream git clone - - https://github.com/dlang-community/D-YAML.git -- imageformats - - dub - - https://code.dlang.org/packages/imageformats - - upstream git clone - - https://github.com/lgvz/imageformats -- tinyendian (dyaml dependency) - - dub - - http://code.dlang.org/packages/tinyendian - - upstream git clone - - https://github.com/dlang-community/tinyendian.git 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 1685738..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] -) diff --git a/subprojects/dyaml.wrap b/subprojects/dyaml.wrap deleted file mode 100644 index 8b3f503..0000000 --- a/subprojects/dyaml.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory = dyaml -url = https://github.com/dlang-community/D-YAML.git -revision = head diff --git a/subprojects/imageformats.dub.sdl b/subprojects/imageformats.dub.sdl deleted file mode 100644 index 2814286..0000000 --- a/subprojects/imageformats.dub.sdl +++ /dev/null @@ -1,7 +0,0 @@ -name "imageformats" -description "Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP." -authors "Tero Hänninen" -license "BSL-1.0" -targetName "imageformats" -sourcePaths "imageformats" -importPaths "." diff --git a/subprojects/imageformats.meson.build b/subprojects/imageformats.meson.build deleted file mode 100644 index 7c05434..0000000 --- a/subprojects/imageformats.meson.build +++ /dev/null @@ -1,40 +0,0 @@ -project('imageformats', 'd', - meson_version: '>=0.46', - license: 'BSL-1.0', - version: '7.0.2' -) - -project_soversion = '0' - -src_dir = include_directories('.') -pkgc = import('pkgconfig') - -imageformats_src = [ - 'imageformats/bmp.d', - 'imageformats/jpeg.d', - 'imageformats/package.d', - 'imageformats/png.d', - 'imageformats/tga.d' -] -install_subdir('imageformats/', install_dir: 'include/d/imageformats-d/') - -imageformats_lib = library('imageformats-d', - [imageformats_src], - include_directories: [src_dir], - install: true, - version: meson.project_version(), - soversion: project_soversion -) - -pkgc.generate(name: 'imageformats-d', - libraries: imageformats_lib, - subdirs: 'd/imageformats-d/', - version: meson.project_version(), - description: 'Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP.' -) - -# for use by others which embed this as subproject -imageformats_dep = declare_dependency( - link_with: [imageformats_lib], - include_directories: [src_dir] -) diff --git a/subprojects/tinyendian.wrap b/subprojects/tinyendian.wrap deleted file mode 100644 index 331a753..0000000 --- a/subprojects/tinyendian.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory = tinyendian -url = https://github.com/dlang-community/tinyendian.git -revision = head -- cgit v1.2.3