From d7e9bab5e85e02ca1f8ec61cf5ea9d82f5466d36 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 22 Aug 2014 15:30:00 -0700 Subject: [PATCH] Project cleanup --- build.bat | 32 ++++++------ libdparse | 2 +- makefile | 52 ++++++++++++------- sonar-project.properties | 5 ++ actypes.d => src/actypes.d | 0 autocomplete.d => src/autocomplete.d | 0 client.d => src/client.d | 0 constants.d => src/constants.d | 0 {conversion => src/conversion}/astconverter.d | 0 {conversion => src/conversion}/first.d | 6 +-- {conversion => src/conversion}/second.d | 0 {conversion => src/conversion}/third.d | 0 messages.d => src/messages.d | 0 modulecache.d => src/modulecache.d | 0 semantic.d => src/semantic.d | 0 server.d => src/server.d | 0 string_interning.d => src/string_interning.d | 0 stupidlog.d => src/stupidlog.d | 0 18 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 sonar-project.properties rename actypes.d => src/actypes.d (100%) rename autocomplete.d => src/autocomplete.d (100%) rename client.d => src/client.d (100%) rename constants.d => src/constants.d (100%) rename {conversion => src/conversion}/astconverter.d (100%) rename {conversion => src/conversion}/first.d (99%) rename {conversion => src/conversion}/second.d (100%) rename {conversion => src/conversion}/third.d (100%) rename messages.d => src/messages.d (100%) rename modulecache.d => src/modulecache.d (100%) rename semantic.d => src/semantic.d (100%) rename server.d => src/server.d (100%) rename string_interning.d => src/string_interning.d (100%) rename stupidlog.d => src/stupidlog.d (100%) diff --git a/build.bat b/build.bat index 7673be8..de50174 100644 --- a/build.bat +++ b/build.bat @@ -1,28 +1,28 @@ del /f containers\src\std\allocator.d dmd^ - client.d^ - messages.d^ - stupidlog.d^ + src\client.d^ + src\messages.d^ + src\stupidlog.d^ msgpack-d/src/msgpack.d^ -Imsgpack-d/src^ -release -inline -O -wi^ -ofdcd-client dmd^ - actypes.d^ - conversion/astconverter.d^ - conversion/first.d^ - conversion/second.d^ - conversion/third.d^ - autocomplete.d^ - constants.d^ - messages.d^ - modulecache.d^ - semantic.d^ - server.d^ - stupidlog.d^ - string_interning.d^ + src\actypes.d^ + src\conversion/astconverter.d^ + src\conversion/first.d^ + src\conversion/second.d^ + src\conversion/third.d^ + src\autocomplete.d^ + src\constants.d^ + src\messages.d^ + src\modulecache.d^ + src\semantic.d^ + src\server.d^ + src\stupidlog.d^ + src\string_interning.d^ libdparse/src/std/d/ast.d^ libdparse/src/std/d/entities.d^ libdparse/src/std/d/lexer.d^ diff --git a/libdparse b/libdparse index a91eb13..a9cbecb 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit a91eb13e38a8560b9dda025b1c8ea837018e8252 +Subproject commit a9cbecbba471a08aa61f8e7aa844b4d0aae73262 diff --git a/makefile b/makefile index aca9484..af76ae2 100644 --- a/makefile +++ b/makefile @@ -9,9 +9,17 @@ DMD = dmd GDC = gdc #LDC = ldc -CLIENT_SRC = client.d\ - messages.d\ - stupidlog.d\ +report: + dscanner --report src > dscanner-report.json + sonar-runner + +clean: + rm -rf bin + rm -f dscanner-report.json + +CLIENT_SRC = src/client.d\ + src/messages.d\ + src/stupidlog.d\ msgpack-d/src/msgpack.d DMD_CLIENT_FLAGS = -Imsgpack-d/src\ @@ -20,26 +28,26 @@ DMD_CLIENT_FLAGS = -Imsgpack-d/src\ -inline\ -O\ -wi\ - -ofdcd-client + -ofbin/dcd-client GDC_CLIENT_FLAGS = -Imsgpack-d/src\ -O3\ -frelease\ - -odcd-client + -obin/dcd-client -SERVER_SRC = actypes.d\ - conversion/astconverter.d\ - conversion/first.d\ - conversion/second.d\ - conversion/third.d\ - autocomplete.d\ - constants.d\ - messages.d\ - modulecache.d\ - semantic.d\ - server.d\ - stupidlog.d\ - string_interning.d\ +SERVER_SRC = src/actypes.d\ + src/conversion/astconverter.d\ + src/conversion/first.d\ + src/conversion/second.d\ + src/conversion/third.d\ + src/autocomplete.d\ + src/constants.d\ + src/messages.d\ + src/modulecache.d\ + src/semantic.d\ + src/server.d\ + src/stupidlog.d\ + src/string_interning.d\ libdparse/src/std/d/ast.d\ libdparse/src/std/d/entities.d\ libdparse/src/std/d/lexer.d\ @@ -65,27 +73,31 @@ DMD_SERVER_FLAGS = -Icontainers/src\ -O\ -release\ -inline\ - -ofdcd-server + -ofbin/dcd-server GDC_SERVER_FLAGS = -Imsgpack-d/src\ -Ilibdparse/src\ -O3\ -frelease\ - -odcd-server + -obin/dcd-server dmdclient: + mkdir -p bin rm -f containers/src/std/allocator.d ${DMD} ${CLIENT_SRC} ${DMD_CLIENT_FLAGS} dmdserver: + mkdir -p bin rm -f containers/src/std/allocator.d ${DMD} ${SERVER_SRC} ${DMD_SERVER_FLAGS} gdcclient: + mkdir -p bin rm -f containers/src/std/allocator.d ${GDC} ${CLIENT_SRC} ${GDC_CLIENT_FLAGS} gdcserver: + mkdir -p bin rm -f containers/src/std/allocator.d ${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS} diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..d609907 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,5 @@ +sonar.projectKey=dcd +sonar.projectName=DCD +sonar.projectVersion=1.0 +sonar.sourceEncoding=UTF-8 +sonar.sources=. diff --git a/actypes.d b/src/actypes.d similarity index 100% rename from actypes.d rename to src/actypes.d diff --git a/autocomplete.d b/src/autocomplete.d similarity index 100% rename from autocomplete.d rename to src/autocomplete.d diff --git a/client.d b/src/client.d similarity index 100% rename from client.d rename to src/client.d diff --git a/constants.d b/src/constants.d similarity index 100% rename from constants.d rename to src/constants.d diff --git a/conversion/astconverter.d b/src/conversion/astconverter.d similarity index 100% rename from conversion/astconverter.d rename to src/conversion/astconverter.d diff --git a/conversion/first.d b/src/conversion/first.d similarity index 99% rename from conversion/first.d rename to src/conversion/first.d index 1149a02..592e1eb 100644 --- a/conversion/first.d +++ b/src/conversion/first.d @@ -121,7 +121,7 @@ final class FirstPass : ASTVisitor CompletionKind.functionName, symbolFile, dec.name.index, dec.returnType); processParameters(symbol, dec.returnType, symbol.acSymbol.name, - dec.parameters, dec.comment); + dec.parameters); symbol.protection = protection; symbol.parent = currentSymbol; symbol.acSymbol.doc = internString(dec.comment); @@ -512,7 +512,7 @@ private: { SemanticSymbol* symbol = allocateSemanticSymbol("*constructor*", CompletionKind.functionName, symbolFile, location); - processParameters(symbol, null, "this", parameters, doc); + processParameters(symbol, null, "this", parameters); symbol.protection = protection; symbol.parent = currentSymbol; symbol.acSymbol.doc = internString(doc); @@ -543,7 +543,7 @@ private: } void processParameters(SemanticSymbol* symbol, const Type returnType, - string functionName, const Parameters parameters, string doc) + string functionName, const Parameters parameters) { if (parameters !is null) { diff --git a/conversion/second.d b/src/conversion/second.d similarity index 100% rename from conversion/second.d rename to src/conversion/second.d diff --git a/conversion/third.d b/src/conversion/third.d similarity index 100% rename from conversion/third.d rename to src/conversion/third.d diff --git a/messages.d b/src/messages.d similarity index 100% rename from messages.d rename to src/messages.d diff --git a/modulecache.d b/src/modulecache.d similarity index 100% rename from modulecache.d rename to src/modulecache.d diff --git a/semantic.d b/src/semantic.d similarity index 100% rename from semantic.d rename to src/semantic.d diff --git a/server.d b/src/server.d similarity index 100% rename from server.d rename to src/server.d diff --git a/string_interning.d b/src/string_interning.d similarity index 100% rename from string_interning.d rename to src/string_interning.d diff --git a/stupidlog.d b/src/stupidlog.d similarity index 100% rename from stupidlog.d rename to src/stupidlog.d