Skip to content

Commit

Permalink
Merge pull request #3843 from MetaLang/stable
Browse files Browse the repository at this point in the history 
Fix Issue 15281 - Add std.experimental.allocator to the build script
  • Loading branch information
@MartinNowak
MartinNowak committed Nov 29, 2015
2 parents fc77dbb + a1a5966 commit d407ec7
Show file tree
Hide file tree
Showing 2 changed files with 258 additions and 7 deletions.
135 changes: 130 additions & 5 deletions win32.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ SRC_STD_DIGEST= std\digest\crc.d std\digest\sha.d std\digest\md.d \
std\digest\ripemd.d std\digest\digest.d std\digest\hmac.d

SRC_STD_CONTAINER= std\container\array.d std\container\binaryheap.d \
std\container\dlist.d std\container\rbtree.d std\container\slist.d \
std\container\util.d std\container\package.d
std\container\dlist.d std\container\rbtree.d std\container\slist.d \
std\container\util.d std\container\package.d

SRC_STD_4= std\uuid.d $(SRC_STD_DIGEST)

Expand All @@ -145,11 +145,33 @@ SRC_STD_LOGGER= std\experimental\logger\core.d std\experimental\logger\filelogge
std\experimental\logger\multilogger.d std\experimental\logger\nulllogger.d \
std\experimental\logger\package.d

SRC_STD_ALLOC_BB= std\experimental\allocator\building_blocks\affix_allocator.d \
std\experimental\allocator\building_blocks\allocator_list.d \
std\experimental\allocator\building_blocks\bitmapped_block.d \
std\experimental\allocator\building_blocks\bucketizer.d \
std\experimental\allocator\building_blocks\fallback_allocator.d \
std\experimental\allocator\building_blocks\free_list.d \
std\experimental\allocator\building_blocks\free_tree.d \
std\experimental\allocator\building_blocks\kernighan_ritchie.d \
std\experimental\allocator\building_blocks\null_allocator.d \
std\experimental\allocator\building_blocks\quantizer.d \
std\experimental\allocator\building_blocks\region.d \
std\experimental\allocator\building_blocks\scoped_allocator.d \
std\experimental\allocator\building_blocks\segregator.d \
std\experimental\allocator\building_blocks\stats_collector.d \
std\experimental\allocator\building_blocks\package.d

SRC_STD_ALLOC= std\experimental\allocator\common.d std\experimental\allocator\gc_allocator.d \
std\experimental\allocator\mallocator.d std\experimental\allocator\mmap_allocator.d \
std\experimental\allocator\showcase.d std\experimental\allocator\typed.d \
std\experimental\allocator\package.d \
$(SRC_STD_ALLOC_BB)

SRC_STD_6= std\variant.d \
std\syserror.d std\zlib.d \
std\stream.d std\socket.d std\socketstream.d \
std\conv.d std\zip.d std\cstream.d \
$(SRC_STD_CONTAINER) $(SRC_STD_LOGGER)
$(SRC_STD_CONTAINER) $(SRC_STD_LOGGER) $(SRC_STD_ALLOC)

SRC_STD_REST= std\stdint.d \
std\json.d \
Expand Down Expand Up @@ -225,7 +247,7 @@ SRC_STD_INTERNAL_WINDOWS= std\internal\windows\advapi32.d
SRC_ETC=

SRC_ETC_C= etc\c\zlib.d etc\c\curl.d etc\c\sqlite3.d \
etc\c\odbc\sql.d etc\c\odbc\sqlext.d etc\c\odbc\sqltypes.d etc\c\odbc\sqlucode.d
etc\c\odbc\sql.d etc\c\odbc\sqlext.d etc\c\odbc\sqltypes.d etc\c\odbc\sqlucode.d

SRC_TO_COMPILE_NOT_STD= \
$(SRC_STD_REGEX) \
Expand Down Expand Up @@ -382,6 +404,27 @@ DOCS= $(DOC)\object.html \
$(DOC)\std_experimental_logger_multilogger.html \
$(DOC)\std_experimental_logger_nulllogger.html \
$(DOC)\std_experimental_logger.html \
$(DOC)\std_experimental_allocator_building_blocks_affix_allocator.html \
$(DOC)\std_experimental_allocator_building_blocks_allocator_list.html \
$(DOC)\std_experimental_allocator_building_blocks_bitmapped_block.html \
$(DOC)\std_experimental_allocator_building_blocks_bucketizer.html \
$(DOC)\std_experimental_allocator_building_blocks_fallback_allocator.html \
$(DOC)\std_experimental_allocator_building_blocks_free_list.html \
$(DOC)\std_experimental_allocator_building_blocks_free_tree.html \
$(DOC)\std_experimental_allocator_building_blocks_kernighan_ritchie.html \
$(DOC)\std_experimental_allocator_building_blocks_null_allocator.html \
$(DOC)\std_experimental_allocator_building_blocks_quantizer.html \
$(DOC)\std_experimental_allocator_building_blocks_region.html \
$(DOC)\std_experimental_allocator_building_blocks_scoped_allocator.html \
$(DOC)\std_experimental_allocator_building_blocks_segregator.html \
$(DOC)\std_experimental_allocator_building_blocks_stats_collector.html \
$(DOC)\std_experimental_allocator_building_blocks.html \
$(DOC)\std_experimental_allocator_common.html \
$(DOC)\std_experimental_allocator_gc_allocator.html \
$(DOC)\std_experimental_allocator_mmap_allocator.html \
$(DOC)\std_experimental_allocator_showcase.html \
$(DOC)\std_experimental_allocator_typed.html \
$(DOC)\std_experimental_allocator.html \
$(DOC)\std_windows_charset.html \
$(DOC)\std_windows_registry.html \
$(DOC)\std_c_fenv.html \
Expand Down Expand Up @@ -827,6 +870,87 @@ $(DOC)\std_experimental_logger_nulllogger.html : $(STDDOC) std\experimental\logg
$(DOC)\std_experimental_logger.html : $(STDDOC) std\experimental\logger\package.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_logger.html $(STDDOC) std\experimental\logger\package.d

$(DOC)\std_experimental_allocator_building_blocks_affix_allocator.html : $(STDDOC) std\experimental\allocator\building_blocks\affix_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_affix_allocator.html \
$(STDDOC) std\experimental\allocator\building_blocks\affix_allocator.d

$(DOC)\std_experimental_allocator_building_blocks_allocator_list.html : $(STDDOC) std\experimental\allocator\building_blocks\allocator_list.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_allocator_list.html \
$(STDDOC) std\experimental\allocator\building_blocks\allocator_list.d

$(DOC)\std_experimental_allocator_building_blocks_bitmapped_block.html : $(STDDOC) std\experimental\allocator\building_blocks\bitmapped_block.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_bitmapped_block.html \
$(STDDOC) std\experimental\allocator\building_blocks\bitmapped_block.d

$(DOC)\std_experimental_allocator_building_blocks_bucketizer.html : $(STDDOC) std\experimental\allocator\building_blocks\bucketizer.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_bucketizer.html \
$(STDDOC) std\experimental\allocator\building_blocks\bucketizer.d

$(DOC)\std_experimental_allocator_building_blocks_fallback_allocator.html : $(STDDOC) std\experimental\allocator\building_blocks\fallback_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_fallback_allocator.html \
$(STDDOC) std\experimental\allocator\building_blocks\fallback_allocator.d

$(DOC)\std_experimental_allocator_building_blocks_free_list.html : $(STDDOC) std\experimental\allocator\building_blocks\free_list.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_free_list.html \
$(STDDOC) std\experimental\allocator\building_blocks\free_list.d

$(DOC)\std_experimental_allocator_building_blocks_free_tree.html : $(STDDOC) std\experimental\allocator\building_blocks\free_tree.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_free_tree.html \
$(STDDOC) std\experimental\allocator\building_blocks\free_tree.d

$(DOC)\std_experimental_allocator_building_blocks_kernighan_ritchie.html : $(STDDOC) std\experimental\allocator\building_blocks\kernighan_ritchie.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_kernighan_ritchie.html \
$(STDDOC) std\experimental\allocator\building_blocks\kernighan_ritchie.d

$(DOC)\std_experimental_allocator_building_blocks_null_allocator.html : $(STDDOC) std\experimental\allocator\building_blocks\null_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_null_allocator.html \
$(STDDOC) std\experimental\allocator\building_blocks\null_allocator.d

$(DOC)\std_experimental_allocator_building_blocks_quantizer.html : $(STDDOC) std\experimental\allocator\building_blocks\quantizer.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_quantizer.html \
$(STDDOC) std\experimental\allocator\building_blocks\quantizer.d

$(DOC)\std_experimental_allocator_building_blocks_region.html : $(STDDOC) std\experimental\allocator\building_blocks\region.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_region.html \
$(STDDOC) std\experimental\allocator\building_blocks\region.d

$(DOC)\std_experimental_allocator_building_blocks_scoped_allocator.html : $(STDDOC) std\experimental\allocator\building_blocks\scoped_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_scoped_allocator.html \
$(STDDOC) std\experimental\allocator\building_blocks\scoped_allocator.d

$(DOC)\std_experimental_allocator_building_blocks_segregator.html : $(STDDOC) std\experimental\allocator\building_blocks\segregator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_segregator.html \
$(STDDOC) std\experimental\allocator\building_blocks\segregator.d

$(DOC)\std_experimental_allocator_building_blocks_stats_collector.html : $(STDDOC) std\experimental\allocator\building_blocks\stats_collector.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks_stats_collector.html \
$(STDDOC) std\experimental\allocator\building_blocks\stats_collector.d

$(DOC)\std_experimental_allocator_building_blocks.html : $(STDDOC) std\experimental\allocator\building_blocks\package.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_building_blocks.html \
$(STDDOC) std\experimental\allocator\building_blocks\package.d

$(DOC)\std_experimental_allocator_common.html : $(STDDOC) std\experimental\allocator\common.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_common.html $(STDDOC) std\experimental\allocator\common.d

$(DOC)\std_experimental_allocator_gc_allocator.html : $(STDDOC) std\experimental\allocator\gc_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_gc_allocator.html $(STDDOC) std\experimental\allocator\gc_allocator.d

$(DOC)\std_experimental_allocator_mallocator.html : $(STDDOC) std\experimental\allocator\mallocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_mallocator.html $(STDDOC) std\experimental\allocator\mallocator.d

$(DOC)\std_experimental_allocator_mmap_allocator.html : $(STDDOC) std\experimental\allocator\mmap_allocator.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_mmap_allocator.html $(STDDOC) std\experimental\allocator\mmap_allocator.d

$(DOC)\std_experimental_allocator_showcase.html : $(STDDOC) std\experimental\allocator\showcase.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_showcase.html $(STDDOC) std\experimental\allocator\showcase.d

$(DOC)\std_experimental_allocator_typed.html : $(STDDOC) std\experimental\allocator\typed.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator_typed.html $(STDDOC) std\experimental\allocator\typed.d

$(DOC)\std_experimental_allocator.html : $(STDDOC) std\experimental\allocator\package.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_experimental_allocator.html $(STDDOC) std\experimental\allocator\package.d

$(DOC)\std_digest_crc.html : $(STDDOC) std\digest\crc.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_digest_crc.html $(STDDOC) std\digest\crc.d

Expand Down Expand Up @@ -916,7 +1040,7 @@ zip : win32.mak win64.mak posix.mak osmodel.mak $(STDDOC) $(SRC) \
$(SRC_ETC) $(SRC_ETC_C) $(SRC_ZLIB) $(SRC_STD_NET) $(SRC_STD_DIGEST) $(SRC_STD_CONTAINER) \
$(SRC_STD_INTERNAL) $(SRC_STD_INTERNAL_DIGEST) $(SRC_STD_INTERNAL_MATH) \
$(SRC_STD_INTERNAL_WINDOWS) $(SRC_STD_REGEX) $(SRC_STD_RANGE) $(SRC_STD_ALGO) \
$(SRC_STD_LOGGER)
$(SRC_STD_LOGGER) $(SRC_STD_ALLOC)
del phobos.zip
zip32 -u phobos win32.mak win64.mak posix.mak osmodel.mak $(STDDOC)
zip32 -u phobos $(SRC)
Expand All @@ -935,6 +1059,7 @@ zip : win32.mak win64.mak posix.mak osmodel.mak $(STDDOC) $(SRC) \
zip32 -u phobos $(SRC_ZLIB)
zip32 -u phobos $(SRC_STD_NET)
zip32 -u phobos $(SRC_STD_LOGGER)
zip32 -u phobos $(SRC_STD_ALLOC)
zip32 -u phobos $(SRC_STD_DIGEST)
zip32 -u phobos $(SRC_STD_CONTAINER)
zip32 -u phobos $(SRC_STD_REGEX)
Expand Down
Loading

0 comments on commit d407ec7

Please sign in to comment.