From c0ed5273a96c185f23df40ecdb31000c1d1cb3c6 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Wed, 27 Jan 2016 00:57:34 -0800 Subject: [PATCH 1/5] Ignore gdb history --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 94dfdd5..3b06daa 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ stdout.txt # Dub files .dub dub.selections.json + +# GDB files +.gdb_history From 3b5c5bb9a2010ea56266327308f8c3cc339aca22 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Wed, 27 Jan 2016 00:58:01 -0800 Subject: [PATCH 2/5] Update dependencies to fix issue with doc display --- dsymbol | 2 +- dub.json | 4 ++-- libdparse | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dsymbol b/dsymbol index 0605a90..c7d57d5 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 0605a90a84ac287f879530420c7046cded566b74 +Subproject commit c7d57d5b2041af51efc6e7be7e58ae15abce7637 diff --git a/dub.json b/dub.json index 3d6cf52..9168776 100644 --- a/dub.json +++ b/dub.json @@ -7,8 +7,8 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.1.0", - "libdparse": "~>0.3.0", + "dsymbol": "~>0.1.1", + "libdparse": "~>0.4.2", "msgpack-d": "~>1.0.0-beta.2" }, "versions": ["built_with_dub"], diff --git a/libdparse b/libdparse index 4d87656..f6bc3e1 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 4d876562b4862a98bf1b6b6bf4fd07af96506a54 +Subproject commit f6bc3e17cc3c4ce72ea0e7b0491c09062e309a9b From 4021ad4be0f2c531ba6935558d866bdc6b834684 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 28 Jan 2016 02:38:17 -0800 Subject: [PATCH 3/5] Fix parser bug --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index 9168776..84f3a5e 100644 --- a/dub.json +++ b/dub.json @@ -8,7 +8,7 @@ "license": "GPL-3.0", "dependencies": { "dsymbol": "~>0.1.1", - "libdparse": "~>0.4.2", + "libdparse": "~>0.4.3", "msgpack-d": "~>1.0.0-beta.2" }, "versions": ["built_with_dub"], diff --git a/libdparse b/libdparse index f6bc3e1..60e4a81 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit f6bc3e17cc3c4ce72ea0e7b0491c09062e309a9b +Subproject commit 60e4a81429627f678e0ad96f4b46950ef6f35cb8 From 09f7ea947e7b4535ecb20e271df8a0a2f247e7fd Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 29 Jan 2016 02:01:52 -0800 Subject: [PATCH 4/5] Remove duplicate entry --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index be51429..7cd2510 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,3 @@ stdout.txt # Dub files .dub dub.selections.json - -# GDB files -.gdb_history From 9506faa205f0aed09d225e1eb34f504d68ad500d Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 29 Jan 2016 02:02:15 -0800 Subject: [PATCH 5/5] Update libdparse --- dub.json | 2 +- libdparse | 2 +- makefile | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dub.json b/dub.json index 84f3a5e..dccc483 100644 --- a/dub.json +++ b/dub.json @@ -8,7 +8,7 @@ "license": "GPL-3.0", "dependencies": { "dsymbol": "~>0.1.1", - "libdparse": "~>0.4.3", + "libdparse": "~>0.5.0", "msgpack-d": "~>1.0.0-beta.2" }, "versions": ["built_with_dub"], diff --git a/libdparse b/libdparse index 60e4a81..2ee9113 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 60e4a81429627f678e0ad96f4b46950ef6f35cb8 +Subproject commit 2ee91136abf935546de6bf581fd215b86d70e14e diff --git a/makefile b/makefile index af8f374..04e60c2 100644 --- a/makefile +++ b/makefile @@ -11,6 +11,8 @@ GDC := gdc LDC := ldc2 OBJ_DIR := objs +DPARSE_DIR := libdparse +DSYMBOL_DIR := dsymbol githash: git log -1 --format="%H" > githash.txt @@ -59,13 +61,13 @@ LDC_CLIENT_FLAGS := -Imsgpack-d/src\ SERVER_SRC := \ $(shell find src/common -name "*.d")\ $(shell find src/server -name "*.d")\ - $(shell find dsymbol/src -name "*.d")\ - libdparse/src/dparse/ast.d\ - libdparse/src/dparse/entities.d\ - libdparse/src/dparse/lexer.d\ - libdparse/src/dparse/parser.d\ - libdparse/src/dparse/formatter.d\ - libdparse/src/std/experimental/lexer.d\ + $(shell find ${DSYMBOL_DIR}/src -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/std/experimental/lexer.d\ $(shell find containers/experimental_allocator/src/std/experimental/allocator/ -name "*.d")\ containers/src/containers/dynamicarray.d\ containers/src/containers/ttree.d\ @@ -83,8 +85,8 @@ SERVER_OBJS = $(SERVER_SRC:%.d=$(OBJ_DIR)/%.o) DMD_SERVER_FLAGS := -Icontainers/src\ -Imsgpack-d/src\ - -Ilibdparse/src\ - -Idsymbol/src\ + -I${DPARSE_DIR}/src\ + -I${DSYMBOL_DIR}/src\ -Icontainers/experimental_allocator/src\ -J.\ -wi\ @@ -95,8 +97,8 @@ DMD_SERVER_FLAGS := -Icontainers/src\ DEBUG_SERVER_FLAGS := -Icontainers/src\ -Imsgpack-d/src\ - -Ilibdparse/src\ - -Idsymbol/src\ + -I${DPARSE_DIR}/src\ + -I${DSYMBOL_DIR}/src\ -Icontainers/experimental_allocator/src\ -wi\ -g\ @@ -105,8 +107,8 @@ DEBUG_SERVER_FLAGS := -Icontainers/src\ GDC_SERVER_FLAGS := -Icontainers/src\ -Imsgpack-d/src\ - -Ilibdparse/src\ - -Idsymbol/src\ + -I${DPARSE_DIR}/src\ + -I${DSYMBOL_DIR}/src\ -Icontainers/experimental_allocator/src\ -J.\ -O3\ @@ -115,8 +117,8 @@ GDC_SERVER_FLAGS := -Icontainers/src\ LDC_SERVER_FLAGS := -Icontainers/src\ -Imsgpack-d/src\ - -Ilibdparse/src\ - -Idsymbol/src\ + -I${DPARSE_DIR}/src\ + -I${DSYMBOL_DIR}/src\ -Icontainers/experimental_allocator/src\ -Isrc\ -J=.\