Skip to content

Commit faf656d

Browse files
rainersrainers
authored
Merge pull request #324 from rainers/master
Updates for v1.5.0-rc1
2 parents 1a9f1cf + c55a427 commit faf656d

29 files changed

Lines changed: 1036 additions & 330 deletions

‎.github/workflows/build-and-test.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
BUILD_CONFIGURATION: Release
1111
BUILD_PLATFORM: x64
1212
BUILD_PLATFORM_TOOLSET: v142
13+
DMD_VER: 2.111.0
14+
VISUALD_VER: 1.4.1
1315

1416
jobs:
1517
build:
@@ -35,25 +37,25 @@ jobs:
3537
- name: Prepare D compiler
3638
uses: dlang-community/setup-dlang@v1
3739
with:
38-
compiler: dmd-2.098.1
40+
compiler: dmd-${{ env.DMD_VER }}
3941
- name: Add MSBuild to PATH
4042
uses: microsoft/setup-msbuild@v1.0.2
4143
- name: Setup VS environment
4244
uses: seanmiddleditch/gha-setup-vsdevenv@v4
4345
- name: Download Visual D
4446
uses: supplypike/setup-bin@v1
4547
with:
46-
uri: 'https://github.com/dlang/visuald/releases/download/v1.3.0/VisualD-v1.3.0.exe'
47-
name: 'VisualD-v1.3.0.exe'
48-
version: '1.3.0'
49-
command: ./VisualD-v1.3.0.exe /S
48+
uri: 'https://github.com/dlang/visuald/releases/download/v${{ env.VISUALD_VER }}/VisualD-v${{ env.VISUALD_VER }}.exe'
49+
name: 'VisualD-v${{ env.VISUALD_VER }}.exe'
50+
version: '${{ env.VISUALD_VER }}'
51+
command: ./VisualD-v${{ env.VISUALD_VER }}.exe /S
5052
- name: Register visuald
5153
run: |
52-
reg add "HKLM\SOFTWARE\DMD" /v "InstallationDir" /t REG_SZ /d "c:\hostedtoolcache\windows\dc\dmd-2.098.1\x64" /reg:32 /f
53-
reg add "HKLM\SOFTWARE\VisualD" /v "DMDInstallDir" /t REG_SZ /d "c:\hostedtoolcache\windows\dc\dmd-2.098.1\x64\dmd2" /reg:32 /f
54+
reg add "HKLM\SOFTWARE\DMD" /v "InstallationDir" /t REG_SZ /d "c:\hostedtoolcache\windows\dc\dmd-${{ env.DMD_VER }}\x64" /reg:32 /f
55+
reg add "HKLM\SOFTWARE\VisualD" /v "DMDInstallDir" /t REG_SZ /d "c:\hostedtoolcache\windows\dc\dmd-${{ env.DMD_VER }}\x64\dmd2" /reg:32 /f
5456
- name: Build visuald
5557
working-directory: visuald/trunk
56-
run: nmake d_modules
58+
run: nmake d_modules dmdserver_test
5759
- name: Upload binaries
5860
uses: actions/upload-artifact@v4
5961
if: failure()

‎CHANGES‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,3 +1474,18 @@ Version history
14741474
- fix always skipping debug statements
14751475
- fix some crashes in the frontend
14761476
* exclude \\.\C: from dependencies generated by LDC v1.40+
1477+
1478+
2026-04-xx version 1.5.0-rc1
1479+
* full installer now bundled with DMD 2.112.0 and LDC 1.41.0
1480+
* dmdserver:
1481+
- updated to dmd 2.112 (current master)
1482+
- dmdserver executable selected by installed dmd version (2.110, 2.111, 2.112)
1483+
* mago-mi executable added
1484+
* mago native debug engine now also works in VS2022 (mago concord extension for
1485+
VS engine still recommended)
1486+
* visuald projects: fixed library dependencies if different project configurations
1487+
used in a solution configuration
1488+
* dbuild: added support for VS 2026 18.1, 18.3 and 18.6
1489+
* dbuild: fixed building if source files are compiled with different settings
1490+
* improved msbuild integration with the "Fast Up To Date Check" of VS
1491+
* installer: can now also add mago as an extension for cppvsdbg in VSCode

‎Makefile‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ prerequisites:
5959
devenv /Project "build" /Build "$(CONFIG)|Win32" visuald_vs10.sln
6060

6161
visuald_vs:
62-
devenv /Project "visuald" /Build "$(CONFIG)|Win32" visuald_vs10.sln
62+
devenv /Project "VisualD" /Build "$(CONFIG)|Win32" visuald_vs10.sln
6363

6464
visuald_vs_x64:
65-
devenv /Project "visuald" /Build "$(CONFIG_X64)|x64" visuald_vs10.sln
65+
devenv /Project "VisualD" /Build "$(CONFIG_X64)|x64" visuald_vs10.sln
6666

6767
visuald_vs_arm64:
68-
devenv /Project "visuald" /Build "$(CONFIG_ARM64)|x64" visuald_vs10.sln
68+
devenv /Project "VisualD" /Build "$(CONFIG_ARM64)|x64" visuald_vs10.sln
6969

7070
visuald_test:
71-
devenv /Project "visuald" /Build "TestDebug|Win32" visuald_vs10.sln
71+
devenv /Project "VisualD" /Build "TestDebug|Win32" visuald_vs10.sln
7272
bin\TestDebug\VisualD\VisualD.exe
7373

7474
vdserver:
@@ -79,6 +79,7 @@ dmdserver:
7979

8080
dmdserver_test:
8181
devenv /Project "dmdserver" /Build "TestDebug|x64" visuald_vs10.sln
82+
bin\TestDebug\x64\dmdserver.exe
8283

8384
dparser:
8485
cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5.2 /p:DefineConstants=NET40 $(MSBUILD_REBUILD)
@@ -194,33 +195,46 @@ dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5
194195
dbuild18_0:
195196
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_0;Platform=AnyCPU $(MSBUILD_REBUILD)
196197

197-
dbuild18_all: dbuild18_0
198+
dbuild18_1:
199+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_1;Platform=AnyCPU $(MSBUILD_REBUILD)
200+
201+
dbuild18_3:
202+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_3;Platform=AnyCPU $(MSBUILD_REBUILD)
203+
204+
dbuild18_6:
205+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v18_6;Platform=AnyCPU $(MSBUILD_REBUILD)
206+
207+
dbuild18_all: dbuild18_0 dbuild18_1 dbuild18_3 dbuild18_6
198208

199209
mago:
200210
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
201211
cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
202212
cd ..\..\mago && devenv /Build "Release StaticDE|Win32" /Project "MagoNatCC" magodbg_2010.sln
203213

204214
mago_vs15:
205-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
206-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v141 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
207-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v141" /target:Expression\MagoNatCC MagoDbg_2010.sln
215+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /target:DebugEngine\MagoNatDE /verbosity:quiet MagoDbg_2010.sln
216+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v141 /target:DebugEngine\MagoRemote /verbosity:quiet MagoDbg_2010.sln
217+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v141" /target:Expression\MagoNatCC /verbosity:quiet MagoDbg_2010.sln
208218

209219
mago_vs16:
210-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
211-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v142 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
212-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
220+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /target:DebugEngine\MagoNatDE /verbosity:quiet MagoDbg_2010.sln
221+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v142 /target:DebugEngine\MagoRemote /verbosity:quiet MagoDbg_2010.sln
222+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\MagoNatCC /verbosity:quiet MagoDbg_2010.sln
213223

214224
mago_vs17:
215-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
216-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v143 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
217-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln
225+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /target:DebugEngine\MagoNatDE /verbosity:quiet MagoDbg_2010.sln
226+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v143 /target:DebugEngine\MagoNatDE /verbosity:quiet MagoDbg_2010.sln
227+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v143 /target:DebugEngine\MagoRemote /verbosity:quiet MagoDbg_2010.sln
228+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v143" /target:Expression\MagoNatCC /verbosity:quiet MagoDbg_2010.sln
218229

219230
magocc_x64:
220-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln
231+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v143" /target:Expression\MagoNatCC /verbosity:quiet MagoDbg_2010.sln
221232

222233
magocc_arm64:
223-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=ARM64;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln
234+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=ARM64;PlatformToolset=v143" /target:Expression\MagoNatCC /verbosity:quiet MagoDbg_2010.sln
235+
236+
mago_mi:
237+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v143" /target:MagoMI\mago-mi /verbosity:quiet MagoDbg_2010.sln
224238

225239
magogc:
226240
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoGC" magodbg_2010.sln
@@ -236,19 +250,19 @@ cv2pdb:
236250
cd ..\..\cv2pdb\trunk && devenv /Project "dumplines" /Build "Release|Win32" src\cv2pdb_vs12.sln
237251

238252
cv2pdb_vs15:
239-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\cv2pdb.vcxproj
240-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dviewhelper\dviewhelper.vcxproj
241-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dumplines.vcxproj
253+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /verbosity:quiet src\cv2pdb.vcxproj
254+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /verbosity:quiet src\dviewhelper\dviewhelper.vcxproj
255+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /verbosity:quiet src\dumplines.vcxproj
242256

243257
cv2pdb_vs16:
244-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\cv2pdb.vcxproj
245-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dviewhelper\dviewhelper.vcxproj
246-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dumplines.vcxproj
258+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /verbosity:quiet src\cv2pdb.vcxproj
259+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /verbosity:quiet src\dviewhelper\dviewhelper.vcxproj
260+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /verbosity:quiet src\dumplines.vcxproj
247261

248262
cv2pdb_vs17:
249-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\cv2pdb.vcxproj
250-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\dviewhelper\dviewhelper.vcxproj
251-
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 src\dumplines.vcxproj
263+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /verbosity:quiet src\cv2pdb.vcxproj
264+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /verbosity:quiet src\dviewhelper\dviewhelper.vcxproj
265+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v143 /verbosity:quiet src\dumplines.vcxproj
252266

253267
dcxxfilt: $(DCXXFILT_EXE)
254268
$(DCXXFILT_EXE): tools\dcxxfilt.d
@@ -259,7 +273,7 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
259273
# create installer
260274

261275
install_release_modules: install_modules visuald_vs_arm64 fake_dparser cv2pdb_vs17 \
262-
mago_vs17 magocc_x64 magocc_arm64 magogc magogc_ldc \
276+
mago_vs17 magocc_x64 magocc_arm64 magogc magogc_ldc mago_mi \
263277
dbuild12 dbuild14 dbuild15
264278

265279
install_vs: install_release_modules install_only

‎VERSION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 1
22
#define VERSION_MINOR 5
33
#define VERSION_REVISION 0
4-
#define VERSION_BETA -beta
5-
#define VERSION_BUILD 2
4+
#define VERSION_BETA -rc
5+
#define VERSION_BUILD 1

‎appveyor.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ environment:
3030

3131
# cache relative to C:\projects\visuald
3232
cache:
33-
- C:\projects\cache\dmd2109_1.7z
33+
- C:\projects\cache\dmd2111_0.7z
3434
- C:\projects\cache\cd851.zip
35-
- C:\projects\cache\VisualD-v0.50.1.exe
35+
- C:\projects\cache\VisualD-v1.4.1.exe
3636
- C:\projects\cache\binutils-2.25.tar.gz
3737

3838
#matrix:
@@ -55,10 +55,10 @@ install:
5555
# Download & extract D compiler
5656
- ps: |
5757
If ($Env:D_COMPILER -eq 'dmd') {
58-
If (-not (Test-Path 'cache\dmd2109_1.7z')) {
59-
Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.109.1/dmd.2.109.1.windows.7z' -FileName 'cache\dmd2109_1.7z'
58+
If (-not (Test-Path 'cache\dmd2111_0.7z')) {
59+
Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.111.0/dmd.2.111.0.windows.7z' -FileName 'cache\dmd2111_0.7z'
6060
}
61-
7z x cache\dmd2109_1.7z > $null
61+
7z x cache\dmd2111_0.7z > $null
6262
Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
6363
} ElseIf ($Env:D_COMPILER -eq 'dmd-nightly') {
6464
Start-FileDownload 'http://nightlies.dlang.org/dmd-nightly/dmd.master.windows.7z' -FileName 'dmd2.7z'
@@ -79,10 +79,10 @@ install:
7979
copy c:\projects\dm\bin\coffimplib.exe c:\projects\dmd2\windows\bin
8080
# Download & install Visual D
8181
- ps: |
82-
If (-not (Test-Path 'cache\VisualD-v1.3.1.exe')) {
83-
Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v1.3.1/VisualD-v1.3.1.exe' -FileName 'cache\VisualD-v1.3.1.exe'
82+
If (-not (Test-Path 'cache\VisualD-v1.4.1.exe')) {
83+
Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v1.4.1/VisualD-v1.4.1.exe' -FileName 'cache\VisualD-v1.4.1.exe'
8484
}
85-
- cache\VisualD-v1.3.1.exe /S
85+
- cache\VisualD-v1.4.1.exe /S
8686
# configure DMD path
8787
- reg add "HKLM\SOFTWARE\DMD" /v InstallationFolder /t REG_SZ /d c:\projects /reg:32 /f
8888
# disable link dependencies monitoring, fails on AppVeyor server

0 commit comments

Comments
 (0)