Merge pull request #619 from WebFreak001/upgrade-libdparse

use d-test-utils & bump libdparse to 0.15.x
merged-on-behalf-of: Jan Jurzitza <gh@webfreak.org>

.gitmodules

@@ -14,3 +14,6 @@
 [submodule "stdx-allocator"]
 	path = stdx-allocator
 	url = https://github.com/dlang-community/stdx-allocator
+[submodule "d-test-utils"]
+	path = d-test-utils
+	url = https://github.com/dlang-community/d-test-utils.git

.travis.sh

@@ -3,8 +3,16 @@
 set -e
 
 if [[ $BUILD == dub ]]; then
-    dub build --build=release --config=client
-    dub build --build=release --config=server
+    if [[ -n $LIBDPARSE_VERSION ]]; then
+        rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release --config=client
+        rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release --config=server
+    elif [[ -n $DSYMBOL_VERSION ]]; then
+        rdmd ./d-test-utils/test_with_package.d $DSYMBOL_VERSION dsymbol -- dub build --build=release --config=client
+        rdmd ./d-test-utils/test_with_package.d $DSYMBOL_VERSION dsymbol -- dub build --build=release --config=server
+    else
+        echo 'Cannot run test without LIBDPARSE_VERSION nor DSYMBOL_VERSION environment variable'
+        exit 1
+    fi
 elif [[ $DC == ldc2 ]]; then
     git submodule update --init --recursive
     make ldc -j2

.travis.yml

@@ -13,7 +13,10 @@ os:
 
 env:
   - BUILD=
-  - BUILD=dub
+  - BUILD=dub LIBDPARSE_VERSION=min
+  - BUILD=dub LIBDPARSE_VERSION=max
+  - BUILD=dub DSYMBOL_VERSION=min
+  - BUILD=dub DSYMBOL_VERSION=max
 
 branches:
   only:

d-test-utils

@@ -0,0 +1 @@
+Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff

dsymbol

@@ -1 +1 @@
-Subproject commit f4a481cdc23b58ce544c2e91a39d5c0d406b67ac
+Subproject commit 71168a8449958e1807a8ba22c8a4df15456bae83

dub.json

@@ -7,8 +7,8 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "dsymbol": "~>0.9.0",
-    "libdparse": "~>0.13.0",
+    "dsymbol": ">=0.11.0 <0.12.0",
+    "libdparse": ">=0.15.0 <0.16.0",
     ":common": "*",
     "stdx-allocator": "~>2.77.5",
     "emsi_containers": "~>0.8.0-alpha.15"

libdparse

@@ -1 +1 @@
-Subproject commit 5270739bcd1962418784c7760773e24d28b6009b
+Subproject commit f9a82848fe98a84f38a66df950514c3556e7fb2d

makefile

@@ -66,25 +66,8 @@ SERVER_SRC := \
 	$(shell find src/dcd/server -name "*.d")\
 	$(shell find ${DSYMBOL_DIR}/src -name "*.d")\
 	$(shell find ${STDXALLOC_DIR}/source -name "*.d")\
-	${DPARSE_DIR}/src/dparse/ast.d\
-	${DPARSE_DIR}/src/dparse/entities.d\
-	${DPARSE_DIR}/src/dparse/lexer.d\
-	${DPARSE_DIR}/src/dparse/parser.d\
-	${DPARSE_DIR}/src/dparse/formatter.d\
-	${DPARSE_DIR}/src/dparse/rollback_allocator.d\
-	${DPARSE_DIR}/src/dparse/stack_buffer.d\
-	${DPARSE_DIR}/src/std/experimental/lexer.d\
-	containers/src/containers/dynamicarray.d\
-	containers/src/containers/ttree.d\
-	containers/src/containers/unrolledlist.d\
-	containers/src/containers/openhashset.d\
-	containers/src/containers/hashset.d\
-	containers/src/containers/internal/hash.d\
-	containers/src/containers/internal/node.d\
-	containers/src/containers/internal/storage_type.d\
-	containers/src/containers/internal/element_type.d\
-	containers/src/containers/internal/backwards.d\
-	containers/src/containers/slist.d\
+	$(shell find ${DPARSE_DIR}/src -name "*.d")\
+	$(shell find containers/src -name "*.d")\
 	$(shell find msgpack-d/src/ -name "*.d")
 
 DMD_SERVER_FLAGS := -Icontainers/src\