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

Commit f828e46

Browse files
MartinNowakMartinNowak
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents ec7b659 + ccee0ca commit f828e46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+4061
-2883
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
root = true
22

3-
[*.{c,h,d,di,dd}]
3+
[*.{c,cpp,h,d,di,dd}]
44
insert_final_newline = true
55
indent_style = space
66
indent_size = 4

‎CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ src/core/sys/linux/* @Burgos @redstar @MartinNowak
3535
src/core/sys/netbsd/* @nrTQgc @joakim-noah
3636
src/core/sys/dragonflybsd/* @dkgroot
3737
src/core/sys/openbsd/* @redstar
38-
src/core/sys/osx/* @jacob-carlborg @klickverbot @etcimon @MartinNowak
3938
src/core/sys/posix/* @CyberShadow @MartinNowak @joakim-noah @redstar
4039
src/core/sys/solaris/* @redstar
4140
src/core/sys/windows/* @CyberShadow

‎appveyor.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
2+
os: Visual Studio 2017
3+
4+
environment:
5+
matrix:
6+
- D_COMPILER: dmd
7+
D_VERSION: 2.079.1
8+
9+
skip_commits:
10+
# Avoid retesting the merged PR on `master` or `stable`
11+
message: /^Merge pull request/
12+
13+
cache:
14+
- C:\projects\cache\dmd-2.079.1.7z
15+
- C:\projects\cache\VisualD-v0.47.0.exe
16+
17+
artifacts:
18+
19+
init:
20+
- git config --global core.autocrlf input
21+
22+
build_script:
23+
- cd c:/projects/
24+
- if not exist cache\nul md cache
25+
26+
# Download & extract host D compiler
27+
- ps: |
28+
$cachefile = 'cache\dmd-' + $Env:D_VERSION + '.7z'
29+
If ($Env:D_COMPILER -eq 'dmd') {
30+
If (-not (Test-Path $cachefile)) {
31+
$downloadlink = 'http://downloads.dlang.org/releases/2.x/' + $Env:D_VERSION + '/dmd.' + $Env:D_VERSION + '.windows.7z'
32+
Start-FileDownload $downloadlink -FileName $cachefile
33+
}
34+
7z x $cachefile > $null
35+
} ElseIf ($Env:D_COMPILER -eq 'dmd-nightly') {
36+
Start-FileDownload 'http://nightlies.dlang.org/dmd-nightly/dmd.master.windows.7z' -FileName 'dmd2.7z'
37+
7z x dmd2.7z > $null
38+
}
39+
Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
40+
c:\projects\dmd2\windows\bin\dmd.exe --version
41+
- set PATH=%PATH%;c:\projects\dmd2\windows\bin
42+
43+
# Download & install Visual D
44+
- ps: |
45+
If (-not (Test-Path 'cache\VisualD-v0.47.0.exe')) {
46+
Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v0.47.0/VisualD-v0.47.0.exe' -FileName 'cache\VisualD-v0.47.0.exe'
47+
}
48+
- cache\VisualD-v0.47.0.exe /S
49+
# configure DMD path
50+
- reg add "HKLM\SOFTWARE\DMD" /v InstallationFolder /t REG_SZ /d c:\projects /reg:32 /f
51+
# disable link dependencies monitoring, fails on AppVeyor server
52+
- reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\ToolsOptionsPages\Projects\Visual D Settings" /v optlinkDeps /t REG_DWORD /d 0 /reg:32 /f
53+
54+
- git clone https://github.com/dlang/dmd.git dmd
55+
56+
# - call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
57+
- call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
58+
59+
- cd c:\projects\dmd\src
60+
- msbuild vcbuild\dmd.sln /p:Configuration=Release;Platform=x64
61+
- cd c:\projects\druntime
62+
- make -f win64.mak DMD=../dmd/generated/Windows/Release/x64/dmd CC=cl auto-tester-build auto-tester-test
63+
64+
test_script: true

‎changelog/array.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Added `core.stdcpp.array`.
2+
3+
Added `core.stdcpp.array`, which links against C++ `std::array`

‎changelog/crt_externs.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Add D header file $(REF_ALTTEXT `core.sys.darwin.crt_externs`, crt_externs, core, sys, darwin) for $(LINK2 https://opensource.apple.com/source/Libc/Libc-1244.30.3/include/crt_externs.h.auto.html, libc/crt_externs.h) on Darwin.
2+
3+
Add D header file $(REF_ALTTEXT `core.sys.darwin.crt_externs`, crt_externs, core, sys, darwin) for $(LINK2 https://opensource.apple.com/source/Libc/Libc-1244.30.3/include/crt_externs.h.auto.html, libc/crt_externs.h) on Darwin.

‎changelog/destroy_noinit.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Added `initialize` template argument to `object.destroy()`.
2+
3+
`object.destroy()` now receives an `initialize` argument to specify whether to re-initialize the object after destruction.

‎changelog/string_view.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Added `core.stdcpp.string_view`.
2+
3+
Added `core.stdcpp.string_view`, which links against C++ `std::string_view`

‎mak/COPY

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ COPY=\
2424
$(IMPDIR)\core\internal\spinlock.d \
2525
$(IMPDIR)\core\internal\string.d \
2626
$(IMPDIR)\core\internal\traits.d \
27+
$(IMPDIR)\core\internal\utf.d \
2728
\
2829
$(IMPDIR)\core\stdc\assert_.d \
2930
$(IMPDIR)\core\stdc\complex.d \
@@ -48,9 +49,14 @@ COPY=\
4849
$(IMPDIR)\core\stdc\wchar_.d \
4950
$(IMPDIR)\core\stdc\wctype.d \
5051
\
51-
$(IMPDIR)\core\stdcpp\typeinfo.d \
52+
$(IMPDIR)\core\stdcpp\array.d \
5253
$(IMPDIR)\core\stdcpp\exception.d \
54+
$(IMPDIR)\core\stdcpp\string_view.d \
55+
$(IMPDIR)\core\stdcpp\typeinfo.d \
56+
$(IMPDIR)\core\stdcpp\xutility.d \
5357
\
58+
$(IMPDIR)\core\sys\darwin\crt_externs.d \
59+
$(IMPDIR)\core\sys\darwin\dlfcn.d \
5460
$(IMPDIR)\core\sys\darwin\execinfo.d \
5561
$(IMPDIR)\core\sys\darwin\pthread.d \
5662
\
@@ -140,20 +146,6 @@ COPY=\
140146
\
141147
$(IMPDIR)\core\sys\openbsd\dlfcn.d \
142148
\
143-
$(IMPDIR)\core\sys\osx\execinfo.d \
144-
$(IMPDIR)\core\sys\osx\pthread.d \
145-
\
146-
$(IMPDIR)\core\sys\osx\mach\dyld.d \
147-
$(IMPDIR)\core\sys\osx\mach\getsect.d \
148-
$(IMPDIR)\core\sys\osx\mach\kern_return.d \
149-
$(IMPDIR)\core\sys\osx\mach\loader.d \
150-
$(IMPDIR)\core\sys\osx\mach\port.d \
151-
$(IMPDIR)\core\sys\osx\mach\semaphore.d \
152-
$(IMPDIR)\core\sys\osx\mach\thread_act.d \
153-
\
154-
$(IMPDIR)\core\sys\osx\sys\cdefs.d \
155-
$(IMPDIR)\core\sys\osx\sys\mman.d \
156-
\
157149
$(IMPDIR)\core\sys\posix\arpa\inet.d \
158150
$(IMPDIR)\core\sys\posix\aio.d \
159151
$(IMPDIR)\core\sys\posix\config.d \

‎mak/DOCS

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ DOCS=\
3838
$(DOCDIR)\core_stdc_wchar_.html \
3939
$(DOCDIR)\core_stdc_wctype.html \
4040
\
41+
$(DOCDIR)\core_stdcpp_array.html \
42+
$(DOCDIR)\core_stdcpp_string_view.html \
4143
$(DOCDIR)\core_stdcpp_exception.html \
4244
$(DOCDIR)\core_stdcpp_typeinfo.html \
4345
\
@@ -49,6 +51,19 @@ DOCS=\
4951
$(DOCDIR)\core_sync_rwmutex.html \
5052
$(DOCDIR)\core_sync_semaphore.html \
5153
\
54+
$(DOCDIR)\core_sys_darwin_crt_externs.html \
55+
$(DOCDIR)\core_sys_darwin_dlfcn.html \
56+
$(DOCDIR)\core_sys_darwin_execinfo.html \
57+
$(DOCDIR)\core_sys_darwin_pthread.html \
58+
$(DOCDIR)\core_sys_darwin_mach_dyld.html \
59+
$(DOCDIR)\core_sys_darwin_mach_getsect.html \
60+
$(DOCDIR)\core_sys_darwin_mach_kern_return.html \
61+
$(DOCDIR)\core_sys_darwin_mach_loader.html \
62+
$(DOCDIR)\core_sys_darwin_mach_port.html \
63+
$(DOCDIR)\core_sys_darwin_mach_semaphore.html \
64+
$(DOCDIR)\core_sys_darwin_mach_thread_act.html \
65+
$(DOCDIR)\core_sys_darwin_netinet_in_.html \
66+
\
5267
$(DOCDIR)\rt_aaA.html \
5368
$(DOCDIR)\rt_aApply.html \
5469
$(DOCDIR)\rt_aApplyR.html \
@@ -142,4 +157,3 @@ DOCS=\
142157
$(DOCDIR)\rt_util_container_treap.html \
143158
$(DOCDIR)\rt_util_random.html \
144159
$(DOCDIR)\rt_util_typeinfo.html \
145-
$(DOCDIR)\rt_util_utf.html \

‎mak/SRCS

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ SRCS=\
2424
src\core\internal\spinlock.d \
2525
src\core\internal\string.d \
2626
src\core\internal\traits.d \
27+
src\core\internal\utf.d \
2728
\
2829
src\core\stdc\assert_.d \
2930
src\core\stdc\complex.d \
@@ -46,6 +47,10 @@ SRCS=\
4647
src\core\stdc\time.d \
4748
src\core\stdc\wchar_.d \
4849
\
50+
src\core\stdcpp\array.d \
51+
src\core\stdcpp\string_view.d \
52+
src\core\stdcpp\xutility.d \
53+
\
4954
src\core\sync\barrier.d \
5055
src\core\sync\condition.d \
5156
src\core\sync\config.d \
@@ -54,6 +59,17 @@ SRCS=\
5459
src\core\sync\rwmutex.d \
5560
src\core\sync\semaphore.d \
5661
\
62+
src\core\sys\darwin\crt_externs.d \
63+
src\core\sys\darwin\dlfcn.d \
64+
src\core\sys\darwin\execinfo.d \
65+
src\core\sys\darwin\pthread.d \
66+
src\core\sys\darwin\mach\dyld.d \
67+
src\core\sys\darwin\mach\getsect.d \
68+
src\core\sys\darwin\mach\kern_return.d \
69+
src\core\sys\darwin\mach\loader.d \
70+
src\core\sys\darwin\mach\port.d \
71+
src\core\sys\darwin\mach\semaphore.d \
72+
src\core\sys\darwin\mach\thread_act.d \
5773
src\core\sys\darwin\netinet\in_.d \
5874
\
5975
src\core\sys\freebsd\dlfcn.d \
@@ -352,7 +368,6 @@ SRCS=\
352368
src\rt\util\array.d \
353369
src\rt\util\random.d \
354370
src\rt\util\typeinfo.d \
355-
src\rt\util\utf.d \
356371
src\rt\util\container\array.d \
357372
src\rt\util\container\common.d \
358373
src\rt\util\container\hashtab.d \

0 commit comments

Comments
 (0)