500 changes: 0 additions & 500 deletions mak/MANIFEST
View file

This file was deleted.

10 changes: 4 additions & 6 deletions posix.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ DOCS:=$(subst \,/,$(DOCS))
include mak/IMPORTS
IMPORTS:=$(subst \,/,$(IMPORTS))

include mak/MANIFEST
MANIFEST:=$(subst \,/,$(MANIFEST))

include mak/SRCS
SRCS:=$(subst \,/,$(SRCS))

Expand Down Expand Up @@ -254,9 +251,10 @@ test/%/.run: test/%/Makefile
DRUNTIME=$(abspath $(DRUNTIME)) DRUNTIMESO=$(abspath $(DRUNTIMESO)) QUIET=$(QUIET) LINKDL=$(LINKDL)

#################### test for undesired white spaces ##########################
CWS_MANIFEST = $(shell git ls-tree --name-only -r HEAD)
CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(CWS_MANIFEST))
NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(CWS_MANIFEST))
MANIFEST = $(shell git ls-tree --name-only -r HEAD)

CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(MANIFEST))
GREP = grep

checkwhitespace:
Expand Down
5 changes: 3 additions & 2 deletions win32.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ target : import copydir copy $(DRUNTIME) $(GCSTUB)
$(mak\COPY)
$(mak\DOCS)
$(mak\IMPORTS)
$(mak\MANIFEST)
$(mak\SRCS)

# NOTE: trace.d and cover.d are not necessary for a successful build
Expand Down Expand Up @@ -1200,7 +1199,9 @@ zip: druntime.zip

druntime.zip:
del druntime.zip
zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj
git ls-tree --name-only -r HEAD >MANIFEST.tmp
zip32 -T -ur druntime @MANIFEST.tmp
del MANIFEST.tmp

install: druntime.zip
unzip -o druntime.zip -d \dmd2\src\druntime
Expand Down
5 changes: 3 additions & 2 deletions win64.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ target : import copydir copy $(DRUNTIME) $(GCSTUB)
$(mak\COPY)
$(mak\DOCS)
$(mak\IMPORTS)
$(mak\MANIFEST)
$(mak\SRCS)

# NOTE: trace.d and cover.d are not necessary for a successful build
Expand Down Expand Up @@ -1184,7 +1183,9 @@ zip: druntime.zip

druntime.zip: import
del druntime.zip
zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj
git ls-tree --name-only -r HEAD >MANIFEST.tmp
zip32 -T -ur druntime @MANIFEST.tmp
del MANIFEST.tmp

install: druntime.zip
unzip -o druntime.zip -d \dmd2\src\druntime
Expand Down