Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
fix Issue 14750 - druntime/test/coverage was added to druntime, but n…
Browse files Browse the repository at this point in the history
…ot to the MANIFEST - zip file broken again
  • Loading branch information
WalterBright committed Jul 12, 2015
1 parent db22b14 commit 28e3bb1
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 6 deletions.
35 changes: 34 additions & 1 deletion mak/MANIFEST
Expand Up @@ -291,4 +291,37 @@ MANIFEST=\
src\rt\typeinfo\ti_void.d \
src\rt\typeinfo\ti_wchar.d \
\
src\etc\linux\memoryerror.d
src\etc\linux\memoryerror.d \
\
test\coverage\Makefile \
test\coverage\src-basic.lst.exp \
test\coverage\src-merge.lst.exp \
test\coverage\src-merge_true.lst.exp \
test\coverage\src\basic.d \
test\coverage\src\merge.d \
test\coverage\src\merge_true.d \
test\exceptions\Makefile \
test\exceptions\src\stderr_msg.d \
test\exceptions\src\unittest_assert.d \
test\init_fini\Makefile \
test\init_fini\src\runtime_args.d \
test\init_fini\src\thread_join.d \
test\shared\Makefile \
test\shared\src\finalize.d \
test\shared\src\host.c \
test\shared\src\lib.d \
test\shared\src\lib_13414.d \
test\shared\src\liblinkdep.d \
test\shared\src\libloaddep.d \
test\shared\src\link.d \
test\shared\src\linkD.c \
test\shared\src\linkDR.c \
test\shared\src\link_linkdep.d \
test\shared\src\link_loaddep.d \
test\shared\src\load.d \
test\shared\src\loadDR.c \
test\shared\src\load_13414.d \
test\shared\src\load_linkdep.d \
test\shared\src\load_loaddep.d \
test\shared\src\plugin.d

8 changes: 6 additions & 2 deletions posix.mak
Expand Up @@ -207,7 +207,7 @@ test/%/.run: test/%/Makefile
DRUNTIME=$(abspath $(DRUNTIME)) DRUNTIMESO=$(abspath $(DRUNTIMESO)) QUIET=$(QUIET) LINKDL=$(LINKDL)

#################### test for undesired white spaces ##########################
CWS_MAKEFILES = $(filter mak/% %.mak,$(MANIFEST))
CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES),$(MANIFEST))
GREP = grep

Expand All @@ -222,9 +222,13 @@ detab:
detab $(MANIFEST)
tolf $(MANIFEST)


gitzip:
git archive --format=zip HEAD > druntime.zip

zip: druntime.zip

druntime.zip: $(MANIFEST) $(IMPORTS)
druntime.zip: $(MANIFEST)
rm -rf $@
zip $@ $^

Expand Down
4 changes: 2 additions & 2 deletions win32.mak
Expand Up @@ -655,9 +655,9 @@ unittest : $(SRCS) $(DRUNTIME)

zip: druntime.zip

druntime.zip: import
druntime.zip:
del druntime.zip
zip32 -T -ur druntime $(MANIFEST) $(IMPDIR) src\rt\minit.obj
zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj

install: druntime.zip
unzip -o druntime.zip -d \dmd2\src\druntime
Expand Down
2 changes: 1 addition & 1 deletion win64.mak
Expand Up @@ -681,7 +681,7 @@ zip: druntime.zip

druntime.zip: import
del druntime.zip
zip32 -T -ur druntime $(MANIFEST) $(IMPDIR) src\rt\minit.obj
zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj

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

0 comments on commit 28e3bb1

Please sign in to comment.