diff --git a/.gitignore b/.gitignore index 37f8b93..3ac2577 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,19 @@ # Windows binaries *.exe *.obj +*.lib +*.dll # *nix binaries dcd-client dcd-server *.o +*.a +*.so # Perf reports perf.data +perf.data.old # Valgrind reports callgrind.* @@ -20,3 +25,7 @@ githash.txt tests/tc*/actual*.txt stderr.txt stdout.txt + +# Dub files +.dub +dub.selections.json diff --git a/dub.json b/dub.json new file mode 100644 index 0000000..3d6cf52 --- /dev/null +++ b/dub.json @@ -0,0 +1,43 @@ +{ + "name": "dcd", + "description": "The D Completion Daemon is an auto-complete program for the D programming language", + "copyright": "Copyright © 2015, Brian Schott", + "authors": [ + "Brian Schott" + ], + "license": "GPL-3.0", + "dependencies": { + "dsymbol": "~>0.1.0", + "libdparse": "~>0.3.0", + "msgpack-d": "~>1.0.0-beta.2" + }, + "versions": ["built_with_dub"], + "configurations": [ + { + "name": "library", + "targetType": "library", + "excludedSourceFiles": [ + "src/client/*", + "src/server/server.d" + ] + }, + { + "name": "client", + "targetType": "executable", + "targetName": "dcd-client", + "mainSourceFile": "src/client/client.d", + "excludedSourceFiles": [ + "src/server/*" + ] + }, + { + "name": "server", + "targetType": "executable", + "targetName": "dcd-server", + "mainSourceFile": "src/server/server.d", + "excludedSourceFiles": [ + "src/client/*" + ] + } + ] +} diff --git a/src/client/client.d b/src/client/client.d index 4a7fe6a..b3d47be 100644 --- a/src/client/client.d +++ b/src/client/client.d @@ -70,6 +70,8 @@ int main(string[] args) { version (Windows) writeln(DCD_VERSION); + else version(built_with_dub) + writeln(DCD_VERSION); else write(DCD_VERSION, " ", GIT_HASH); return 0; diff --git a/src/common/dcd_version.d b/src/common/dcd_version.d index e90f5d7..16e051c 100644 --- a/src/common/dcd_version.d +++ b/src/common/dcd_version.d @@ -21,9 +21,10 @@ module common.dcd_version; /** * Human-readable version number */ -enum DCD_VERSION = "v0.7.3"; +enum DCD_VERSION = "v0.7.4"; version (Windows) {} +else version (built_with_dub) {} else { /** diff --git a/src/server/server.d b/src/server/server.d index f569e09..62e89be 100644 --- a/src/server/server.d +++ b/src/server/server.d @@ -82,6 +82,8 @@ int main(string[] args) { version (Windows) writeln(DCD_VERSION); + else version (built_with_dub) + writeln(DCD_VERSION); else write(DCD_VERSION, " ", GIT_HASH); return 0;