forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from wilzbach/phobos-inifiled 

[Phobos] Update inifiled
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
This commit is contained in:
The Dlang Bot 2017-06-30 03:14:40 +02:00 committed by GitHub
parent 40d75610a2 50d5eeafc2
commit 620ffaffe9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inifiled

@ -1 +1 @@
Subproject commit e4f63f126ddddb3e496574fec0f76b24e61b1d51 Subproject commit 35f8d2d914560f8c73cf5e6b80b8e0f47f498d64

17
makefile
View File

@ -5,14 +5,15 @@ DMD := $(DC)
GDC := gdc GDC := gdc
LDC := ldc2 LDC := ldc2
OBJ_DIR := obj OBJ_DIR := obj
SRC := \ LIB_SRC := \
$(shell find containers/src -name "*.d")\ $(shell find containers/src -name "*.d")\
$(shell find dsymbol/src -name "*.d")\ $(shell find dsymbol/src -name "*.d")\
$(shell find inifiled/source/ -name "*.d")\ $(shell find inifiled/source/ -name "*.d")\
$(shell find libdparse/src/std/experimental/ -name "*.d")\ $(shell find libdparse/src/std/experimental/ -name "*.d")\
$(shell find libdparse/src/dparse/ -name "*.d")\ $(shell find libdparse/src/dparse/ -name "*.d")\
$(shell find libddoc/src -name "*.d")\ $(shell find libddoc/src -name "*.d")
$(shell find src/ -name "*.d") PROJECT_SRC := $(shell find src/ -name "*.d")
SRC := $(LIB_SRC) $(PROJECT_SRC)
INCLUDE_PATHS = \ INCLUDE_PATHS = \
-Iinifiled/source -Isrc\ -Iinifiled/source -Isrc\
-Ilibdparse/src\ -Ilibdparse/src\
@ -21,7 +22,7 @@ INCLUDE_PATHS = \
VERSIONS = VERSIONS =
DEBUG_VERSIONS = -version=dparse_verbose DEBUG_VERSIONS = -version=dparse_verbose
DMD_FLAGS = -w -inline -release -O -J. -od${OBJ_DIR} -version=StdLoggerDisableWarning DMD_FLAGS = -w -inline -release -O -J. -od${OBJ_DIR} -version=StdLoggerDisableWarning
DMD_TEST_FLAGS = -w -g -unittest -J. DMD_TEST_FLAGS = -w -g -J. -version=StdLoggerDisableWarning
all: dmdbuild all: dmdbuild
ldc: ldcbuild ldc: ldcbuild
@ -46,8 +47,12 @@ ldcbuild: githash
mkdir -p bin mkdir -p bin
${LDC} -O5 -release -oq -of=bin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J. ${LDC} -O5 -release -oq -of=bin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J.
test: githash # compile the dependencies separately, s.t. their unittests don't get executed
${DC} -w -g -J. -unittest ${INCLUDE_PATHS} ${SRC} -ofbin/dscanner-unittest -version=StdLoggerDisableWarning bin/dscanner-unittest-lib.a: ${LIB_SRC}
${DC} ${DMD_TEST_FLAGS} -c ${INCLUDE_PATHS} ${LIB_SRC} -of$@
test: bin/dscanner-unittest-lib.a githash
${DC} ${DMD_TEST_FLAGS} -unittest ${INCLUDE_PATHS} bin/dscanner-unittest-lib.a ${PROJECT_SRC} -ofbin/dscanner-unittest
./bin/dscanner-unittest ./bin/dscanner-unittest
rm -f bin/dscanner-unittest rm -f bin/dscanner-unittest