From e027318501c3f2aa897f2cd7adeff4aa26d70297 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Fri, 18 Oct 2019 18:30:23 -0400
Subject: [PATCH] make dub test work better

---
 dub.json   | 15 +++++++++++----
 terminal.d |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dub.json b/dub.json
index dde4b93..b5d2bd5 100644
--- a/dub.json
+++ b/dub.json
@@ -62,12 +62,14 @@
 		{
 			"name": "nanovega",
 			"description": "Vector graphics library",
-			"targetType": "sourceLibrary",
+			"targetType": "library",
+			"dflags": ["-mv=arsd.nanovega=nanovega.d"],
 			"dependencies": {
 				"arsd-official:simpledisplay":"*",
 				"arsd-official:image_files":"*",
 				"arsd-official:ttf":"*"
 			},
+			"importPaths": ["."],
 			"libs-posix": ["freetype", "fontconfig"],
 			"sourceFiles": ["nanovega.d", "blendish.d", "svg.d"]
 		},
@@ -75,6 +77,7 @@
 			"name": "email",
 			"description": "Email helper library, both sending MIME messages and parsing incoming mbox/maildir messages",
 			"targetType": "library",
+			"importPaths": ["."],
 			"dependencies": {"arsd-official:htmltotext":"*"},
 			"dflags": ["-mv=arsd.email=email.d"],
 			"sourceFiles": ["email.d"]
@@ -82,6 +85,7 @@
 		{
 			"name": "image_files",
 			"description": "Image file format support - PNG read/write, JPEG, TGA, BMP, PCX, TGA, DDS read.",
+			"importPaths": ["."],
 			"targetType": "sourceLibrary",
 			"dependencies": {"arsd-official:color_base":"*"},
 			"sourceFiles": ["image.d", "png.d", "bmp.d", "jpeg.d", "targa.d", "pcx.d", "dds.d"]
@@ -89,6 +93,7 @@
 		{
 			"name": "htmltotext",
 			"description": "HTML to plain text conversion",
+			"importPaths": ["."],
 			"targetType": "library",
 			"dependencies": {"arsd-official:dom":"*", "arsd-official:color_base":"*"},
 			"dflags": ["-mv=arsd.htmltotext=htmltotext.d"],
@@ -206,7 +211,7 @@
 		{
 			"name": "jsvar",
 			"description": "Javascript-like object in D, capable of json read/write/manipulation.",
-			"targetType": "sourceLibrary",
+			"targetType": "library",
 			"importPaths": ["."],
 			"dflags": ["-mv=arsd.jsvar=jsvar.d"],
 			"sourceFiles": ["jsvar.d"]
@@ -214,7 +219,7 @@
 		{
 			"name": "script",
 			"description": "Small Javascript-like script interpreter with easy D API",
-			"targetType": "sourceLibrary",
+			"targetType": "library",
 			"dependencies": {"arsd-official:jsvar":"*"},
 			"importPaths": ["."],
 			"dflags": ["-mv=arsd.script=script.d"],
@@ -231,7 +236,9 @@
 		{
 			"name": "ttf",
 			"description": "port of stb_ttf to D",
-			"targetType": "sourceLibrary",
+			"importPaths": ["."],
+			"targetType": "library",
+			"dflags": ["-mv=arsd.ttf=ttf.d"],
 			"sourceFiles": ["ttf.d"]
 		},
 		{
diff --git a/terminal.d b/terminal.d
index ce3e310..05e6256 100644
--- a/terminal.d
+++ b/terminal.d
@@ -69,7 +69,7 @@ module arsd.terminal;
 
 	The user will be able to type a line and navigate around it with cursor keys and even the mouse on some systems, as well as perform editing as they expect (e.g. the backspace and delete keys work normally) until they press enter.  Then, the final line will be returned to your program, which the example will simply print back to the user.
 +/
-unittest {
+version(demos) unittest {
 	import arsd.terminal;
 
 	void main() {
@@ -87,7 +87,7 @@ unittest {
 	This example demonstrates color output, using [Terminal.color]
 	and the output functions like [Terminal.writeln].
 +/
-unittest {
+version(demos) unittest {
 	import arsd.terminal;
 
 	void main() {
@@ -107,7 +107,7 @@ unittest {
 	This shows how to get one single character press using
 	the [RealTimeConsoleInput] structure.
 +/
-unittest {
+version(demos) unittest {
 	import arsd.terminal;
 
 	void main() {