Skip to content

Commit f182f4e

Browse files
rainersrainers
authored
Merge pull request #139 from rainers/master
Visual D 1.3.1
2 parents e67848f + 660d701 commit f182f4e

File tree

21 files changed

+306
-90
lines changed

21 files changed

+306
-90
lines changed

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: build visuald
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
# Path to the solution file relative to the root of the project.
7+
SOLUTION_FILE_PATH: src/visuald_vs10.vcxproj
8+
9+
# Configuration type to build.
10+
BUILD_CONFIGURATION: Release
11+
BUILD_PLATFORM: x64
12+
BUILD_PLATFORM_TOOLSET: v142
13+
14+
jobs:
15+
build:
16+
# windows-latest doesn't have .net framework 4.0
17+
runs-on: windows-2019
18+
19+
steps:
20+
- name: Checkout visuald
21+
uses: actions/checkout@v3
22+
with:
23+
path: visuald/trunk
24+
submodules: recursive
25+
# - name: Checkout cv2pdb
26+
# uses: actions/checkout@v3
27+
# with:
28+
# repository: rainers/cv2pdb
29+
# path: cv2pdb/trunk
30+
# - name: Checkout mago
31+
# uses: actions/checkout@v3
32+
# with:
33+
# repository: rainers/mago
34+
# path: mago
35+
- name: Prepare D compiler
36+
uses: dlang-community/setup-dlang@v1
37+
with:
38+
compiler: dmd-2.098.1
39+
- name: Add MSBuild to PATH
40+
uses: microsoft/[email protected]
41+
- name: Setup VS environment
42+
uses: seanmiddleditch/gha-setup-vsdevenv@v4
43+
- name: Download Visual D
44+
uses: supplypike/setup-bin@v1
45+
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
50+
- name: Register visuald
51+
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+
- name: Build visuald
55+
working-directory: visuald/trunk
56+
run: nmake d_modules
57+
- name: Upload binaries
58+
uses: actions/upload-artifact@v2
59+
if: failure()
60+
with:
61+
name: bin
62+
path: visuald/trunk/bin

‎CHANGES‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,15 @@ Version history
13301330
* bugzilla 22764: now searches the 32-bit registry hive for install paths of DMD and LDC
13311331
* bugzilla 23069: mago crashing when debugging VARIANT data type in VS 2022
13321332
* bugzilla 23043: project templates missing in VS 2022 until configuration manually updated
1333-
* semantic analysis: without a project loaded, a D file is now analized using the compile options
1333+
* semantic analysis: without a project loaded, a D file is now analyzed using the compile options
13341334
of "Compile and Run" with an import path derived from the module declaration.
13351335
* visualdproj: exit code printed for failed commands
13361336
* cv2pdb 0.52: improved DWARF support for non-contiguous functions, bug fixes
1337+
1338+
2022-10-09 version 1.3.1
1339+
* full installer now bundled with DMD 2.100.2 and LDC 1.30.0
1340+
* dmdserver: fixed memory leak
1341+
* fixed building against WinSDK 10.0.22621.0
1342+
* fixed projects no longer considered failing
1343+
* D files in VC projects failed to build in VS 2022 17.3 and 17.4, added separate versions of
1344+
dbuild.17.x.dll linked respective Microsoft.Build.CPPTasks.Common.dll

‎Makefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ dbuild17_1:
143143
dbuild17_2:
144144
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_2;Platform=AnyCPU /t:Rebuild
145145

146+
dbuild17_3:
147+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_3;Platform=AnyCPU /t:Rebuild
148+
149+
dbuild17_4:
150+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_4;Platform=AnyCPU /t:Rebuild
151+
152+
dbuild17_all: dbuild17 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4
153+
146154
mago:
147155
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
148156
cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
@@ -196,7 +204,9 @@ install_vs_no_vs2017: install_modules fake_dparser cv2pdb mago magogc dbuild12
196204

197205
install_vs_only_vs2017: install_modules dparser dparser_test cv2pdb_vs15 mago_vs15 magogc fake_dbuild12 fake_dbuild14 dbuild15 install_only
198206

199-
install_modules: prerequisites visuald_vs visuald_vs_x64 vdserver dmdserver vdextension vdext15 visualdwizard dcxxfilt
207+
install_modules: d_modules vdextension vdext15 visualdwizard dcxxfilt
208+
209+
d_modules: prerequisites visuald_vs visuald_vs_x64 vdserver dmdserver
200210

201211
install_only:
202212
if not exist ..\downloads\nul md ..\downloads

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 1
22
#define VERSION_MINOR 3
3-
#define VERSION_REVISION 0
3+
#define VERSION_REVISION 1
44
#define VERSION_BETA
55
#define VERSION_BUILD 0

‎c2d/idl2d.d‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,22 @@ class idl2d
622622
case "RtlFlushNonVolatileMemoryRanges":
623623
return 1;
624624

625+
// SDK 10.0.22621.0
626+
case "WIN_NOEXCEPT":
627+
case "ReadLongPtrAcquire":
628+
case "ReadLongPtrNoFence":
629+
case "ReadLongPtrRaw":
630+
case "WriteLongPtrRelease":
631+
case "WriteLongPtrNoFence":
632+
case "WriteLongPtrRaw":
633+
case "ReadULongPtrAcquire":
634+
case "ReadULongPtrNoFence":
635+
case "ReadULongPtrRaw":
636+
case "WriteULongPtrRelease":
637+
case "WriteULongPtrNoFence":
638+
case "WriteULongPtrRaw":
639+
return 1;
640+
625641
default:
626642
break;
627643
}
@@ -1086,6 +1102,8 @@ version(all)
10861102
while(replaceTokenSequence(tokens, "$_not $_ident($_ident1)($expr)", "$_not cast($_ident1)($expr)", true) > 0) {}
10871103
replaceTokenSequence(tokens, "$_not $_ident($_ident1)cast", "$_not cast($_ident1)cast", true);
10881104
replaceTokenSequence(tokens, "$_not $_ident($_ident1*)$_not_semi;", "$_not cast($_ident1*)$_not_semi", true);
1105+
replaceTokenSequence(tokens, "$_not $_ident(const $_ident1*)$_not_semi;", "$_not cast(const $_ident1*)$_not_semi", true);
1106+
replaceTokenSequence(tokens, "$_not $_ident(volatile const $_ident1*)$_not_semi;", "$_not cast(volatile const $_ident1*)$_not_semi", true);
10891107
replaceTokenSequence(tokens, "$_not $_ident(struct $_ident1*)$_not_semi;", "$_not cast(struct $_ident1*)$_not_semi", true);
10901108
replaceTokenSequence(tokens, "$_not $_ident($_ident1 $_ident2*)", "$_not cast($_ident1 $_ident2*)", true);
10911109
replaceTokenSequence(tokens, "HRESULT cast", "HRESULT", true);
@@ -1270,6 +1288,11 @@ version(all)
12701288
replaceTokenSequence(tokens, "#ifndef TRUE\n#define TRUE$def\n#endif\n", "#define TRUE 1\n", false);
12711289
}
12721290

1291+
if(currentModule == "memoryapi")
1292+
{
1293+
replaceTokenSequence(tokens, "typedef struct DECLSPEC_ALIGN($_num)", "align($_num) typedef struct", true);
1294+
}
1295+
12731296
if(currentModule == "winnt")
12741297
{
12751298
replaceTokenSequence(tokens, "#if defined(MIDL_PASS)\ntypedef struct $_ident {\n"
@@ -1299,6 +1322,13 @@ version(all)
12991322

13001323
replaceTokenSequence(tokens, "RtlZeroMemory($dest,$length)",
13011324
"import core.stdc.string: memset; memset($dest,0,$length)", true);
1325+
// win 10.0.22621.0: duplicate definition
1326+
replaceTokenSequence(tokens, "POWER_SETTING_ALTITUDE, *PPOWER_SETTING_ALTITUDE;",
1327+
"*PPOWER_SETTING_ALTITUDE;", true);
1328+
replaceTokenSequence(tokens, "FORCEINLINE BYTE ReadUCharAcquire $code WriteULong64Raw($args) { $code2 }",
1329+
"/+ $* +/", true);
1330+
replaceTokenSequence(tokens, "FORCEINLINE PVOID ReadPointerAcquire $code WritePointerRaw($args) { $code2 }",
1331+
"/+ $* +/", true);
13021332
}
13031333

13041334
if(currentModule == "commctrl")
@@ -1385,7 +1415,10 @@ version(all)
13851415
// type name and field name identical
13861416
replaceTokenSequence(tokens, "ImageMoniker ImageMoniker;", "ImageMoniker mImageMoniker;", true);
13871417
}
1388-
1418+
if(currentModule.startsWith("webprop"))
1419+
{
1420+
replaceTokenSequence(tokens, "importlib(\"Microsoft.VisualStudio.Interop.tlb\");", "/+ $* +/;", true);
1421+
}
13891422
// select unicode version of the API when defining without postfix A/W
13901423
replaceTokenSequence(tokens, "#ifdef UNICODE\nreturn $_identW(\n#else\nreturn $_identA(\n#endif\n",
13911424
" return $_identW(", false);
@@ -1573,6 +1606,8 @@ version(all)
15731606
enums[tok.text] = true;
15741607
break;
15751608
}
1609+
if(indexOf(tok.pretext, "\\\n") >= 0)
1610+
tok.pretext = replace(tok.pretext, "\\\n", "\n");
15761611
prevtext = tok.text;
15771612
++tokIt;
15781613
}
@@ -1653,6 +1688,10 @@ version(none) version(vsi)
16531688
replaceTokenSequence(tokens, "InterlockedCompareExchange($args __in LONG ExChange, __in LONG Comperand);", "$* +/", true);
16541689
replaceTokenSequence(tokens, "InterlockedOr(&Barrier, 0);", "InterlockedExchangeAdd(&Barrier, 0);", true); // InterlockedOr exist only as intrinsic
16551690
}
1691+
if (currentModule == "winerror")
1692+
{
1693+
replaceTokenSequence(tokens, "HRESULT HRESULT_FROM_SETUPAPI($args) { $code }", "/+ $* +/", true);
1694+
}
16561695
if(currentModule == "ocidl")
16571696
{
16581697
// move alias out of interface declaration, it causes circular definitions with dmd 2.065+
@@ -2134,6 +2173,8 @@ else
21342173
TokenIterator inAlias = tokens.end();
21352174
for(TokenIterator tokIt = tokens.begin(); !tokIt.atEnd(); ++tokIt)
21362175
{
2176+
bool isAssign(string txt) { return txt == "=" || txt == "&=" || txt == "|=" || txt == "+=" || txt == "-="; }
2177+
21372178
Token tok = *tokIt;
21382179
//tok.pretext = tok.pretext.replace("//D", "");
21392180
tok.text = translateToken(tok.text);
@@ -2150,8 +2191,9 @@ else
21502191
}
21512192
else if(tok.text == "[" && tokIt[1].text != "]")
21522193
{
2153-
if((tokIt.atBegin() || tokIt[-1].text != "{" || tokIt[-2].text != "=") &&
2194+
if((tokIt.atBegin() || tokIt[-1].text != "{" || !isAssign(tokIt[-2].text)) &&
21542195
(tokIt[1].type != Token.Number || tokIt[2].text != "]") &&
2196+
tokIt[1].text != "i" && // RtlConstantTimeEqualMemory
21552197
(tokIt[2].text != "]" || tokIt[3].text != ";"))
21562198
{
21572199
TokenIterator bit = tokIt;
@@ -2168,8 +2210,9 @@ else
21682210
{
21692211
TokenIterator openit = tokIt;
21702212
if(retreatToOpeningBracket(openit) &&
2171-
(openit.atBegin || (openit-1).atBegin || openit[-1].text != "{" || openit[-2].text != "="))
2213+
(openit.atBegin || (openit-1).atBegin || openit[-1].text != "{" || !isAssign(openit[-2].text)))
21722214
if((tokIt[-1].type != Token.Number || tokIt[-2].text != "[") &&
2215+
tokIt[-1].text != "i" && // RtlConstantTimeEqualMemory
21732216
(tokIt[-2].text != "[" || tokIt[1].text != ";"))
21742217
tok.text = "]+/";
21752218
}
@@ -2900,8 +2943,8 @@ unittest
29002943
string exptxt = "
29012944
int convert() { return " ~ "
29022945
hello; }
2903-
// #define noconvert(n,m) \\
2904-
// hallo1 |\\
2946+
// #define noconvert(n,m)
2947+
// hallo1 |
29052948
// hallo2
29062949
";
29072950
version(macro2template) exptxt = replace(exptxt, "int", "auto");

‎doc/VersionHistory.dd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ $(H2 2022-06-05 Version 1.3.0)
99
$(LI bugzilla 22764: now searches the 32-bit registry hive for install paths of DMD and LDC)
1010
$(LI bugzilla 23069: mago crashing when debugging VARIANT data type in VS 2022)
1111
$(LI bugzilla 23043: project templates missing in VS 2022 until configuration manually updated)
12-
$(LI semantic analysis: without a project loaded, a D file is now analized using the compile options)
13-
$(LI of "Compile and Run" with an import path derived from the module declaration.)
12+
$(LI semantic analysis: without a project loaded, a D file is now analyzed using the compile options
13+
of "Compile and Run" with an import path derived from the module declaration.)
1414
$(LI visualdproj: exit code printed for failed commands)
1515
$(LI cv2pdb 0.52: improved DWARF support for non-contiguous functions, bug fixes)
1616
)

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,50 @@
159159
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
160160
<TargetVer>17.2</TargetVer>
161161
</PropertyGroup>
162+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_3|AnyCPU'">
163+
<OutputPath>bin\Release-v17_3\</OutputPath>
164+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
165+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
166+
<Optimize>true</Optimize>
167+
<DebugType>pdbonly</DebugType>
168+
<PlatformTarget>AnyCPU</PlatformTarget>
169+
<ErrorReport>prompt</ErrorReport>
170+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
171+
<TargetVer>17.3</TargetVer>
172+
</PropertyGroup>
173+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_3|AnyCPU'">
174+
<OutputPath>bin\Debug-v17_3\</OutputPath>
175+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
176+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
177+
<Optimize>false</Optimize>
178+
<DebugType>pdbonly</DebugType>
179+
<PlatformTarget>AnyCPU</PlatformTarget>
180+
<ErrorReport>prompt</ErrorReport>
181+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
182+
<TargetVer>17.3</TargetVer>
183+
</PropertyGroup>
184+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_4|AnyCPU'">
185+
<OutputPath>bin\Release-v17_4\</OutputPath>
186+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
187+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
188+
<Optimize>true</Optimize>
189+
<DebugType>pdbonly</DebugType>
190+
<PlatformTarget>AnyCPU</PlatformTarget>
191+
<ErrorReport>prompt</ErrorReport>
192+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
193+
<TargetVer>17.4</TargetVer>
194+
</PropertyGroup>
195+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_4|AnyCPU'">
196+
<OutputPath>bin\Debug-v17_4\</OutputPath>
197+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
198+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
199+
<Optimize>false</Optimize>
200+
<DebugType>pdbonly</DebugType>
201+
<PlatformTarget>AnyCPU</PlatformTarget>
202+
<ErrorReport>prompt</ErrorReport>
203+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
204+
<TargetVer>17.4</TargetVer>
205+
</PropertyGroup>
162206
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
163207
<DebugSymbols>true</DebugSymbols>
164208
<DebugType>full</DebugType>
@@ -202,7 +246,7 @@
202246
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
203247
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5.2</TargetFrameworkVersion>
204248
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
205-
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' ">v4.7.2</TargetFrameworkVersion>
249+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' ">v4.7.2</TargetFrameworkVersion>
206250
<GeneratePkgDefFile>false</GeneratePkgDefFile>
207251
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
208252
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -433,7 +477,7 @@
433477
</Reference>
434478
</ItemGroup>
435479
<!-- VS2022 -->
436-
<ItemGroup Condition="'$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2'">
480+
<ItemGroup Condition="'$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4'">
437481
<Reference Include="Microsoft.Build">
438482
<HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
439483
</Reference>
@@ -471,6 +515,16 @@
471515
<HintPath>assemblies\v17_2\Microsoft.Build.CPPTasks.Common.dll</HintPath>
472516
</Reference>
473517
</ItemGroup>
518+
<ItemGroup Condition="'$(TargetVer)' == '17.3'">
519+
<Reference Include="Microsoft.Build.CPPTasks.Common">
520+
<HintPath>assemblies\v17_3\Microsoft.Build.CPPTasks.Common.dll</HintPath>
521+
</Reference>
522+
</ItemGroup>
523+
<ItemGroup Condition="'$(TargetVer)' == '17.4'">
524+
<Reference Include="Microsoft.Build.CPPTasks.Common">
525+
<HintPath>assemblies\v17_4\Microsoft.Build.CPPTasks.Common.dll</HintPath>
526+
</Reference>
527+
</ItemGroup>
474528
<ItemGroup>
475529
<EmbeddedResource Include="Strings.resx">
476530
<SubType>Designer</SubType>

‎msbuild/dcompile.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
Condition="'@(DCompile)' != '' and '$(DCompiler)' != 'None'"
137137
DependsOnTargets="_collectDFiles;_replacePackageName">
138138

139-
<VCMessage Condition="$(MSBDBuildVersion_Major) == '17'" Type="Message" Code="MSB8034" Importance="low" Arguments="CPPTaskPath;$(CPPTaskPath)"/>
139+
<VCMessage Condition="$(MSBuildVersion_Major) == '17'" Type="Message" Code="MSB8034" Importance="low" Arguments="CPPTaskPath;$(CPPTaskPath)"/>
140140

141141
<ItemGroup Condition="'@(dcompile_SelectedFiles)' != ''">
142142
<DCompile Remove="@(DCompile)" Condition="'%(Identity)' != '@(dcompile_SelectedFiles)'" />

‎msbuild/dcompile_defaults.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@
4949
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
5050
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) == 0">17.0</DBuildVersion>
5151
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) == 1">17.1</DBuildVersion>
52-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt; 1">17.2</DBuildVersion>
52+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) == 2">17.2</DBuildVersion>
53+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) == 3">17.3</DBuildVersion>
54+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt; 3">17.4</DBuildVersion>
5355
</PropertyGroup>
5456

5557
<PropertyGroup Condition="'$(DBuildVersion)' == ''">

‎nsis/visuald.nsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
; define DMD source path to include dmd installation
3131
; !define DMD
32-
!define DMD_VERSION "2.100.0"
32+
!define DMD_VERSION "2.100.2"
3333
!define DMD_SRC c:\d\dmd-${DMD_VERSION}
3434

3535
; define LDC to include ldc installation
3636
; !define LDC
37-
!define LDC_VERSION "1.29.0"
37+
!define LDC_VERSION "1.30.0"
3838
!define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
3939

4040
; define VS2019 to include VS2019 support
@@ -332,6 +332,8 @@ Section "Visual Studio package" SecPackage
332332
${File} ..\msbuild\dbuild\obj\release-v17\ dbuild.17.0.dll
333333
${File} ..\msbuild\dbuild\obj\release-v17_1\ dbuild.17.1.dll
334334
${File} ..\msbuild\dbuild\obj\release-v17_2\ dbuild.17.2.dll
335+
${File} ..\msbuild\dbuild\obj\release-v17_3\ dbuild.17.3.dll
336+
${File} ..\msbuild\dbuild\obj\release-v17_4\ dbuild.17.4.dll
335337
!endif
336338
WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
337339
!endif

0 commit comments

Comments
 (0)