From 77d6b1baf6062600d5c94869dddbe46391d75930 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 22 Aug 2014 15:41:48 -0700 Subject: [PATCH] Project reorganzation --- build.bat | 4 ++-- makefile | 24 +++++++++++-------- {analysis => src/analysis}/asm_style.d | 0 {analysis => src/analysis}/base.d | 0 .../analysis}/builtin_property_names.d | 0 {analysis => src/analysis}/config.d | 0 {analysis => src/analysis}/constructors.d | 0 {analysis => src/analysis}/del.d | 0 .../analysis}/duplicate_attribute.d | 0 {analysis => src/analysis}/enumarrayliteral.d | 0 {analysis => src/analysis}/fish.d | 0 {analysis => src/analysis}/helpers.d | 0 {analysis => src/analysis}/ifelsesame.d | 0 .../analysis}/length_subtraction.d | 0 {analysis => src/analysis}/linespan.d | 0 {analysis => src/analysis}/logic_precedence.d | 0 {analysis => src/analysis}/numbers.d | 0 {analysis => src/analysis}/objectconst.d | 0 .../analysis}/opequals_without_tohash.d | 0 {analysis => src/analysis}/package.d | 0 {analysis => src/analysis}/pokemon.d | 0 {analysis => src/analysis}/range.d | 0 {analysis => src/analysis}/run.d | 0 {analysis => src/analysis}/style.d | 0 {analysis => src/analysis}/unused.d | 0 astprinter.d => src/astprinter.d | 0 ctags.d => src/ctags.d | 0 highlighter.d => src/highlighter.d | 0 imports.d => src/imports.d | 0 main.d => src/main.d | 0 outliner.d => src/outliner.d | 0 stats.d => src/stats.d | 0 symbol_finder.d => src/symbol_finder.d | 0 33 files changed, 16 insertions(+), 12 deletions(-) rename {analysis => src/analysis}/asm_style.d (100%) rename {analysis => src/analysis}/base.d (100%) rename {analysis => src/analysis}/builtin_property_names.d (100%) rename {analysis => src/analysis}/config.d (100%) rename {analysis => src/analysis}/constructors.d (100%) rename {analysis => src/analysis}/del.d (100%) rename {analysis => src/analysis}/duplicate_attribute.d (100%) rename {analysis => src/analysis}/enumarrayliteral.d (100%) rename {analysis => src/analysis}/fish.d (100%) rename {analysis => src/analysis}/helpers.d (100%) rename {analysis => src/analysis}/ifelsesame.d (100%) rename {analysis => src/analysis}/length_subtraction.d (100%) rename {analysis => src/analysis}/linespan.d (100%) rename {analysis => src/analysis}/logic_precedence.d (100%) rename {analysis => src/analysis}/numbers.d (100%) rename {analysis => src/analysis}/objectconst.d (100%) rename {analysis => src/analysis}/opequals_without_tohash.d (100%) rename {analysis => src/analysis}/package.d (100%) rename {analysis => src/analysis}/pokemon.d (100%) rename {analysis => src/analysis}/range.d (100%) rename {analysis => src/analysis}/run.d (100%) rename {analysis => src/analysis}/style.d (100%) rename {analysis => src/analysis}/unused.d (100%) rename astprinter.d => src/astprinter.d (100%) rename ctags.d => src/ctags.d (100%) rename highlighter.d => src/highlighter.d (100%) rename imports.d => src/imports.d (100%) rename main.d => src/main.d (100%) rename outliner.d => src/outliner.d (100%) rename stats.d => src/stats.d (100%) rename symbol_finder.d => src/symbol_finder.d (100%) diff --git a/build.bat b/build.bat index c618228..4be2da5 100644 --- a/build.bat +++ b/build.bat @@ -8,10 +8,10 @@ set STDD= set ANALYSIS= set INIFILED= -for %%x in (*.d) do set CORE=!CORE! %%x +for %%x in (src\*.d) do set CORE=!CORE! %%x +for %%x in (src\analysis/*.d) do set ANALYSIS=!ANALYSIS! analysis/%%x for %%x in (libdparse/src/std/*.d) do set STD=!STD! libdparse/src/std/%%x for %%x in (libdparse/src/std/d/*.d) do set STDD=!STDD! libdparse/src/std/d/%%x -for %%x in (analysis/*.d) do set ANALYSIS=!ANALYSIS! analysis/%%x for %%x in (inifiled/source/*.d) do set INIFILED=!INIFILED! inifiled/source/%%x @echo on diff --git a/makefile b/makefile index 3c33e0b..eb2398d 100644 --- a/makefile +++ b/makefile @@ -3,17 +3,17 @@ DMD = dmd GDC = gdc LDC = ldc -SRC = main.d\ - stats.d\ - imports.d\ - highlighter.d\ - ctags.d\ - astprinter.d\ - outliner.d\ - symbol_finder.d\ +SRC = src/main.d\ + src/stats.d\ + src/imports.d\ + src/highlighter.d\ + src/ctags.d\ + src/astprinter.d\ + src/outliner.d\ + src/symbol_finder.d\ + src/analysis/*.d\ libdparse/src/std/*.d\ libdparse/src/std/d/*.d\ - analysis/*.d\ inifiled/source/*.d INCLUDE_PATHS = -Ilibdparse/src VERSIONS = @@ -25,6 +25,7 @@ debug: ${DMD} -ofdsc ${VERSIONS} ${DEBUG_VERSIONS} ${INCLUDE_PATHS} ${SRC} dmdbuild: + mkdir -p bin ${DMD} -O -release -inline -ofdscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} gdcbuild: @@ -37,5 +38,8 @@ test: @./test.sh clean: - rm -f dscanner *.o + rm -rf bin +report: all + dscanner --report src > dscanner-report.json + sonar-runner diff --git a/analysis/asm_style.d b/src/analysis/asm_style.d similarity index 100% rename from analysis/asm_style.d rename to src/analysis/asm_style.d diff --git a/analysis/base.d b/src/analysis/base.d similarity index 100% rename from analysis/base.d rename to src/analysis/base.d diff --git a/analysis/builtin_property_names.d b/src/analysis/builtin_property_names.d similarity index 100% rename from analysis/builtin_property_names.d rename to src/analysis/builtin_property_names.d diff --git a/analysis/config.d b/src/analysis/config.d similarity index 100% rename from analysis/config.d rename to src/analysis/config.d diff --git a/analysis/constructors.d b/src/analysis/constructors.d similarity index 100% rename from analysis/constructors.d rename to src/analysis/constructors.d diff --git a/analysis/del.d b/src/analysis/del.d similarity index 100% rename from analysis/del.d rename to src/analysis/del.d diff --git a/analysis/duplicate_attribute.d b/src/analysis/duplicate_attribute.d similarity index 100% rename from analysis/duplicate_attribute.d rename to src/analysis/duplicate_attribute.d diff --git a/analysis/enumarrayliteral.d b/src/analysis/enumarrayliteral.d similarity index 100% rename from analysis/enumarrayliteral.d rename to src/analysis/enumarrayliteral.d diff --git a/analysis/fish.d b/src/analysis/fish.d similarity index 100% rename from analysis/fish.d rename to src/analysis/fish.d diff --git a/analysis/helpers.d b/src/analysis/helpers.d similarity index 100% rename from analysis/helpers.d rename to src/analysis/helpers.d diff --git a/analysis/ifelsesame.d b/src/analysis/ifelsesame.d similarity index 100% rename from analysis/ifelsesame.d rename to src/analysis/ifelsesame.d diff --git a/analysis/length_subtraction.d b/src/analysis/length_subtraction.d similarity index 100% rename from analysis/length_subtraction.d rename to src/analysis/length_subtraction.d diff --git a/analysis/linespan.d b/src/analysis/linespan.d similarity index 100% rename from analysis/linespan.d rename to src/analysis/linespan.d diff --git a/analysis/logic_precedence.d b/src/analysis/logic_precedence.d similarity index 100% rename from analysis/logic_precedence.d rename to src/analysis/logic_precedence.d diff --git a/analysis/numbers.d b/src/analysis/numbers.d similarity index 100% rename from analysis/numbers.d rename to src/analysis/numbers.d diff --git a/analysis/objectconst.d b/src/analysis/objectconst.d similarity index 100% rename from analysis/objectconst.d rename to src/analysis/objectconst.d diff --git a/analysis/opequals_without_tohash.d b/src/analysis/opequals_without_tohash.d similarity index 100% rename from analysis/opequals_without_tohash.d rename to src/analysis/opequals_without_tohash.d diff --git a/analysis/package.d b/src/analysis/package.d similarity index 100% rename from analysis/package.d rename to src/analysis/package.d diff --git a/analysis/pokemon.d b/src/analysis/pokemon.d similarity index 100% rename from analysis/pokemon.d rename to src/analysis/pokemon.d diff --git a/analysis/range.d b/src/analysis/range.d similarity index 100% rename from analysis/range.d rename to src/analysis/range.d diff --git a/analysis/run.d b/src/analysis/run.d similarity index 100% rename from analysis/run.d rename to src/analysis/run.d diff --git a/analysis/style.d b/src/analysis/style.d similarity index 100% rename from analysis/style.d rename to src/analysis/style.d diff --git a/analysis/unused.d b/src/analysis/unused.d similarity index 100% rename from analysis/unused.d rename to src/analysis/unused.d diff --git a/astprinter.d b/src/astprinter.d similarity index 100% rename from astprinter.d rename to src/astprinter.d diff --git a/ctags.d b/src/ctags.d similarity index 100% rename from ctags.d rename to src/ctags.d diff --git a/highlighter.d b/src/highlighter.d similarity index 100% rename from highlighter.d rename to src/highlighter.d diff --git a/imports.d b/src/imports.d similarity index 100% rename from imports.d rename to src/imports.d diff --git a/main.d b/src/main.d similarity index 100% rename from main.d rename to src/main.d diff --git a/outliner.d b/src/outliner.d similarity index 100% rename from outliner.d rename to src/outliner.d diff --git a/stats.d b/src/stats.d similarity index 100% rename from stats.d rename to src/stats.d diff --git a/symbol_finder.d b/src/symbol_finder.d similarity index 100% rename from symbol_finder.d rename to src/symbol_finder.d