meson build

17 files changed, 329 insertions, 20 deletions

diff --git a/subprojects/D-YAML.wrap b/subprojects/D-YAML.wrap
new file mode 100644
index 0000000..8b3f503
--- /dev/null
+++ b/subprojects/D-YAML.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = dyaml
+url       = https://github.com/dlang-community/D-YAML.git
+revision  = head
diff --git a/subprojects/README b/subprojects/README
index 59f89e7..c4d9dcc 100644
--- a/subprojects/README
+++ b/subprojects/README
@@ -1,15 +1,22 @@
-d2sqlite3
-- dub
-  - https://code.dlang.org/packages/d2sqlite3
-- upstream
-  - https://github.com/biozic/d2sqlite3
-- mathias
-  - https://github.com/ximion/d2sqlite3.git
-
-imageformats
-- dub
-  - https://code.dlang.org/packages/imageformats
-- upstream
-  - https://github.com/lgvz/imageformats
-- mathias
-  - https://github.com/ximion/imageformats.git
+- 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.wrap b/subprojects/d2sqlite3.wrap
index 04ce778..78643b5 100644
--- a/subprojects/d2sqlite3.wrap
+++ b/subprojects/d2sqlite3.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory = d2sqlite3
-url       = https://github.com/ximion/d2sqlite3.git
+url       = https://github.com/biozic/d2sqlite3.git
 revision  = head
diff --git a/subprojects/d2sqlite3/.gitignore b/subprojects/d2sqlite3/.gitignore
new file mode 100644
index 0000000..8d7b4d4
--- /dev/null
+++ b/subprojects/d2sqlite3/.gitignore
@@ -0,0 +1,10 @@
+.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
new file mode 100644
index 0000000..f2bd29f
--- /dev/null
+++ b/subprojects/d2sqlite3/dub.sdl
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..1726952
--- /dev/null
+++ b/subprojects/d2sqlite3/meson.build
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 0000000..8b3f503
--- /dev/null
+++ b/subprojects/dyaml.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = dyaml
+url       = https://github.com/dlang-community/D-YAML.git
+revision  = head
diff --git a/subprojects/dyaml/dub.json b/subprojects/dyaml/dub.json
new file mode 100644
index 0000000..07ee17e
--- /dev/null
+++ b/subprojects/dyaml/dub.json
@@ -0,0 +1,25 @@
+{
+    "name": "dyaml",
+    "description": "YAML parser and emitter",
+    "authors": [
+        "Ferdinand Majerech",
+        "Cameron \"Herringway\" Ross"
+    ],
+    "license": "BSL-1.0",
+    "dependencies": {
+        "tinyendian" :  "~>0.2.0"
+    },
+    "homepage": "https://github.com/dlang-community/D-YAML",
+    "copyright": "Copyright © 2011-2018, Ferdinand Majerech",
+    "subPackages": [
+        "examples/constructor",
+        "examples/getting_started",
+        "examples/representer",
+        "examples/resolver",
+        "examples/tojson",
+        "examples/yaml_bench",
+        "examples/yaml_gen",
+        "examples/yaml_stats",
+        "testsuite"
+    ]
+}
diff --git a/subprojects/dyaml/meson.build b/subprojects/dyaml/meson.build
new file mode 100644
index 0000000..68d17c7
--- /dev/null
+++ b/subprojects/dyaml/meson.build
@@ -0,0 +1,70 @@
+project('D-YAML', 'd',
+    meson_version: '>=0.40.0',
+    subproject_dir: 'contrib',
+    version: '0.8.0'
+)
+
+project_soversion    = '0'
+
+src_dir = include_directories('source/')
+pkgc = import('pkgconfig')
+
+dyaml_src = [
+    'source/dyaml/composer.d',
+    'source/dyaml/constructor.d',
+    'source/dyaml/dumper.d',
+    'source/dyaml/emitter.d',
+    'source/dyaml/encoding.d',
+    'source/dyaml/escapes.d',
+    'source/dyaml/event.d',
+    'source/dyaml/exception.d',
+    'source/dyaml/linebreak.d',
+    'source/dyaml/loader.d',
+    'source/dyaml/node.d',
+    'source/dyaml/package.d',
+    'source/dyaml/parser.d',
+    'source/dyaml/queue.d',
+    'source/dyaml/reader.d',
+    'source/dyaml/representer.d',
+    'source/dyaml/resolver.d',
+    'source/dyaml/scanner.d',
+    'source/dyaml/serializer.d',
+    'source/dyaml/style.d',
+    'source/dyaml/tagdirective.d',
+    'source/dyaml/test/common.d',
+    'source/dyaml/test/compare.d',
+    'source/dyaml/test/constructor.d',
+    'source/dyaml/test/emitter.d',
+    'source/dyaml/test/errors.d',
+    'source/dyaml/test/inputoutput.d',
+    'source/dyaml/test/reader.d',
+    'source/dyaml/test/representer.d',
+    'source/dyaml/test/resolver.d',
+    'source/dyaml/test/tokens.d',
+    'source/dyaml/token.d'
+]
+install_subdir('source/dyaml', install_dir: 'include/d/yaml/')
+
+tinyendian_dep = dependency('tinyendian', version: '>=0.2.0', fallback: ['tinyendian', 'tinyendian_dep'])
+
+dyaml_lib = library('dyaml',
+        [dyaml_src],
+        include_directories: [src_dir],
+        dependencies: [tinyendian_dep],
+        install: true,
+        version: meson.project_version(),
+        soversion: project_soversion
+)
+pkgc.generate(name: 'dyaml',
+              libraries: dyaml_lib,
+              subdirs: 'd/yaml/',
+              version: meson.project_version(),
+              description: 'YAML parser and emitter for the D programming language.'
+)
+
+# Make D-YAML easy to use as subproject
+dyaml_dep = declare_dependency(
+    link_with: dyaml_lib,
+    include_directories: [src_dir],
+    dependencies: [tinyendian_dep]
+)
diff --git a/subprojects/imageformats-d.wrap b/subprojects/imageformats-d.wrap
deleted file mode 100644
index a5a9877..0000000
--- a/subprojects/imageformats-d.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory = imageformats-d
-url       = https://github.com/ximion/imageformats.git
-revision  = head
diff --git a/subprojects/imageformats.wrap b/subprojects/imageformats.wrap
new file mode 100644
index 0000000..09f342c
--- /dev/null
+++ b/subprojects/imageformats.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = imageformats
+url       = https://github.com/lgvz/imageformats.git
+revision  = head
diff --git a/subprojects/imageformats/dub.sdl b/subprojects/imageformats/dub.sdl
new file mode 100644
index 0000000..2814286
--- /dev/null
+++ b/subprojects/imageformats/dub.sdl
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000..584e2af
--- /dev/null
+++ b/subprojects/imageformats/meson.build
@@ -0,0 +1,40 @@
+project('imageformats', 'd',
+    meson_version: '>=0.46',
+    license: 'BSL-1.0',
+    version: '7.0.0'
+)
+
+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
new file mode 100644
index 0000000..331a753
--- /dev/null
+++ b/subprojects/tinyendian.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = tinyendian
+url       = https://github.com/dlang-community/tinyendian.git
+revision  = head
diff --git a/subprojects/tinyendian/.gitignore b/subprojects/tinyendian/.gitignore
new file mode 100644
index 0000000..0ed3f58
--- /dev/null
+++ b/subprojects/tinyendian/.gitignore
@@ -0,0 +1,4 @@
+.dub
+*.o
+*.a
+*.lib
diff --git a/subprojects/tinyendian/dub.json b/subprojects/tinyendian/dub.json
new file mode 100644
index 0000000..6313cdd
--- /dev/null
+++ b/subprojects/tinyendian/dub.json
@@ -0,0 +1,16 @@
+{
+    "name": "tinyendian",
+    "description": "Lightweight endianness handling library",
+    "authors": [ "Ferdinand Majerech" ],
+    "importPaths": ["source"],
+    "license": "Boost 1.0",
+    "homepage": "https://github.com/kiith-sa/tinyendian",
+    "copyright": "Copyright © 2014, Ferdinand Majerech",
+
+    "buildTypes":
+    {
+        "debug": { "buildOptions": ["debugMode", "debugInfoC"] },
+        "release": { "buildOptions": ["releaseMode", "optimize", "inline", "noBoundsCheck"] },
+        "profile": { "buildOptions": ["releaseMode", "optimize", "noBoundsCheck", "debugInfoC"] },
+    },
+}
diff --git a/subprojects/tinyendian/meson.build b/subprojects/tinyendian/meson.build
new file mode 100644
index 0000000..f666958
--- /dev/null
+++ b/subprojects/tinyendian/meson.build
@@ -0,0 +1,41 @@
+# -*- mode: python; -*-
+
+project(
+    'tinyendian',
+    'd',
+    meson_version: '>=0.41',
+    version: '0.2.0',
+    default_options: ['buildtype=release'],
+)
+
+src_dir = include_directories('source/')
+pkgc = import('pkgconfig')
+
+tinyendian_src = [
+    'source/tinyendian.d'
+]
+
+install_headers(tinyendian_src, subdir: 'd/')
+
+tinyendian_lib = library(
+    meson.project_name(),
+    [tinyendian_src],
+    include_directories: [src_dir],
+    version: meson.project_version(),
+    pic: true,
+    install: true,
+)
+
+pkgc.generate(
+    name: meson.project_name(),
+    libraries: tinyendian_lib,
+    subdirs: 'd/',
+    version: meson.project_version(),
+    description: 'Lightweight endianness library for D.'
+)
+
+# Make Tinyendian easy to use as subproject
+tinyendian_dep = declare_dependency(
+    link_with: tinyendian_lib,
+    include_directories: [src_dir]
+)