Skip to content

Commit 8c8a69f

Browse files
rainersrainers
authored
Merge pull request #276 from rainers/master
Visual D 1.40-rc2
2 parents 733312b + 6e808ac commit 8c8a69f

File tree

15 files changed

+127
-33
lines changed

15 files changed

+127
-33
lines changed

‎CHANGES‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ Version history
13511351
- pass import paths from prerequisite projects to semantic analysis, too
13521352
* full installer now bundled with DMD 2.106.0 and LDC 1.35.0
13531353
* fixed issue 23734: avoid exception by std.file.isDir when clicking a project folder that doesn't exist
1354-
* added separate version of Microsoft.Build.CPPTasks.Common for VS 17.5 - 17.9
1354+
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.5 - 17.9
13551355
* updated dfmt library from upstream
13561356
* improved message when dmd crashes
13571357
* "add imports from dependent projects" is now evaluated recursively and passed to semantic analysis
@@ -1367,3 +1367,9 @@ Version history
13671367
* project template cache now removed if Visual D does not find itself in it. Workaround for
13681368
issue #256
13691369
* fixed some version inaccuracies in installation files
1370+
1371+
2024-07-29 version 1.4.0-rc2
1372+
* updated to frontend of DMD 2.110.0-beta1
1373+
* full installer now bundled with DMD 2.109.1 and LDC 1.39.0
1374+
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.10 - 17.11
1375+
* fixed detecting dmd update after 2.108

‎Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,13 @@ dbuild17_8:
167167
dbuild17_9:
168168
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_9;Platform=AnyCPU /t:Rebuild
169169

170-
dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 dbuild17_8 dbuild17_9
170+
dbuild17_10:
171+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_10;Platform=AnyCPU /t:Rebuild
172+
173+
dbuild17_11:
174+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_11;Platform=AnyCPU /t:Rebuild
175+
176+
dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 dbuild17_8 dbuild17_9 dbuild17_10 dbuild17_11
171177

172178
mago:
173179
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#define VERSION_MINOR 4
33
#define VERSION_REVISION 0
44
#define VERSION_BETA -rc
5-
#define VERSION_BUILD 1
5+
#define VERSION_BUILD 2

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,50 @@
335335
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
336336
<TargetVer>17.9</TargetVer>
337337
</PropertyGroup>
338+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_10|AnyCPU'">
339+
<OutputPath>bin\Release-v17_10\</OutputPath>
340+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
341+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
342+
<Optimize>true</Optimize>
343+
<DebugType>pdbonly</DebugType>
344+
<PlatformTarget>AnyCPU</PlatformTarget>
345+
<ErrorReport>prompt</ErrorReport>
346+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
347+
<TargetVer>17.10</TargetVer>
348+
</PropertyGroup>
349+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_10|AnyCPU'">
350+
<OutputPath>bin\Debug-v17_10\</OutputPath>
351+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
352+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
353+
<Optimize>false</Optimize>
354+
<DebugType>pdbonly</DebugType>
355+
<PlatformTarget>AnyCPU</PlatformTarget>
356+
<ErrorReport>prompt</ErrorReport>
357+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
358+
<TargetVer>17.10</TargetVer>
359+
</PropertyGroup>
360+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_11|AnyCPU'">
361+
<OutputPath>bin\Release-v17_11\</OutputPath>
362+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
363+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
364+
<Optimize>true</Optimize>
365+
<DebugType>pdbonly</DebugType>
366+
<PlatformTarget>AnyCPU</PlatformTarget>
367+
<ErrorReport>prompt</ErrorReport>
368+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
369+
<TargetVer>17.11</TargetVer>
370+
</PropertyGroup>
371+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_11|AnyCPU'">
372+
<OutputPath>bin\Debug-v17_11\</OutputPath>
373+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
374+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
375+
<Optimize>false</Optimize>
376+
<DebugType>pdbonly</DebugType>
377+
<PlatformTarget>AnyCPU</PlatformTarget>
378+
<ErrorReport>prompt</ErrorReport>
379+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
380+
<TargetVer>17.11</TargetVer>
381+
</PropertyGroup>
338382
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
339383
<DebugSymbols>true</DebugSymbols>
340384
<DebugType>full</DebugType>
@@ -378,7 +422,9 @@
378422
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
379423
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5.2</TargetFrameworkVersion>
380424
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
381-
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9' ">v4.7.2</TargetFrameworkVersion>
425+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
426+
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9'
427+
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11'">v4.7.2</TargetFrameworkVersion>
382428
<GeneratePkgDefFile>false</GeneratePkgDefFile>
383429
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
384430
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -609,7 +655,9 @@
609655
</Reference>
610656
</ItemGroup>
611657
<!-- VS2022 -->
612-
<ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3' or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9' ">
658+
<ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
659+
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8'
660+
or '$(TargetVer)' == '17.9' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11'">
613661
<Reference Include="Microsoft.Build">
614662
<HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
615663
</Reference>
@@ -687,6 +735,16 @@
687735
<HintPath>assemblies\v17_9\Microsoft.Build.CPPTasks.Common.dll</HintPath>
688736
</Reference>
689737
</ItemGroup>
738+
<ItemGroup Condition="'$(TargetVer)' == '17.10'">
739+
<Reference Include="Microsoft.Build.CPPTasks.Common">
740+
<HintPath>assemblies\v17_10\Microsoft.Build.CPPTasks.Common.dll</HintPath>
741+
</Reference>
742+
</ItemGroup>
743+
<ItemGroup Condition="'$(TargetVer)' == '17.11'">
744+
<Reference Include="Microsoft.Build.CPPTasks.Common">
745+
<HintPath>assemblies\v17_11\Microsoft.Build.CPPTasks.Common.dll</HintPath>
746+
</Reference>
747+
</ItemGroup>
690748
<ItemGroup>
691749
<EmbeddedResource Include="Strings.resx">
692750
<SubType>Designer</SubType>

‎msbuild/dcompile.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379

380380
<Target Name="Versioned_ComputeLinkImportLibraryOutputsForClean"
381381
DependsOnTargets="ComputeLinkImportLibraryOutputsForClean"
382-
Condition="'$(DBuildVersion)' != '17.9'">
382+
Condition="'$(DBuildVersion)' != '17.9' and '$(DBuildVersion)' != '17.10' and '$(DBuildVersion)' != '17.11'">
383383
</Target>
384384

385385
<!-- changing attributes on link options must be applied to all object files (including C++), so we insert

‎msbuild/dcompile_defaults.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16 and $(MSBuildVersion_Major) != 17">$(MSBuildVersion_Major).0</DBuildVersion>
4848
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
4949
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
50-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 9">17.$(MSBuildVersion_Minor)</DBuildVersion>
51-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 9">17.9</DBuildVersion>
50+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 11">17.$(MSBuildVersion_Minor)</DBuildVersion>
51+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 11">17.11</DBuildVersion>
5252
</PropertyGroup>
5353

5454
<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.107.0"
32+
!define DMD_VERSION "2.109.1"
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.36.0"
37+
!define LDC_VERSION "1.39.0"
3838
!define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
3939

4040
; define VS2019 to include VS2019 support
@@ -344,6 +344,8 @@ Section "Visual Studio package" SecPackage
344344
${File} ..\msbuild\dbuild\obj\release-v17_7\ dbuild.17.7.dll
345345
${File} ..\msbuild\dbuild\obj\release-v17_8\ dbuild.17.8.dll
346346
${File} ..\msbuild\dbuild\obj\release-v17_9\ dbuild.17.9.dll
347+
${File} ..\msbuild\dbuild\obj\release-v17_10\ dbuild.17.10.dll
348+
${File} ..\msbuild\dbuild\obj\release-v17_11\ dbuild.17.11.dll
347349
!endif
348350
WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
349351
!endif

‎sdk/vsi.visualdproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,6 +2225,8 @@
22252225
<File path="vsi\msdbg16a.d" />
22262226
<File path="vsi\msdbg170.d" />
22272227
<File path="vsi\msdbg171.d" />
2228+
<File path="vsi\msdbg1710.d" />
2229+
<File path="vsi\msdbg1711.d" />
22282230
<File path="vsi\msdbg172.d" />
22292231
<File path="vsi\msdbg173.d" />
22302232
<File path="vsi\msdbg174.d" />
@@ -2305,6 +2307,7 @@
23052307
<File path="vsi\vsshell167.d" />
23062308
<File path="vsi\vsshell169.d" />
23072309
<File path="vsi\vsshell171.d" />
2310+
<File path="vsi\vsshell1710.d" />
23082311
<File path="vsi\vsshell172.d" />
23092312
<File path="vsi\vsshell174.d" />
23102313
<File path="vsi\vsshell175.d" />

‎vdc/dmdserver/dmd‎

Submodule dmd updated 817 files

‎vdc/dmdserver/dmdinit.d‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
module vdc.dmdserver.dmdinit;
1010

1111
import dmd.arraytypes;
12+
import dmd.astenums;
1213
import dmd.builtin;
1314
import dmd.cond;
1415
import dmd.compiler;
@@ -45,7 +46,10 @@ alias EscapeInfer = RootObject[int];
4546
enum string[2][] dmdStatics =
4647
[
4748
["_D3dmd5clone12buildXtoHashFCQBa7dstruct17StructDeclarationPSQCg6dscope5ScopeZ8tftohashCQDh5mtype12TypeFunction", "TypeFunction"],
48-
["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
49+
// < 2.110
50+
// ["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
51+
// 2.110
52+
["_D3dmd7dstruct15search_toStringFCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
4953
// 2.103
5054
["_D3dmd7dmodule6Module11loadStdMathFZ8std_mathCQBsQBrQBm", "Module"],
5155
["_D3dmd7dmodule6Module14loadCoreAtomicFZ11core_atomicCQBzQByQBt", "Module"],
@@ -62,9 +66,13 @@ enum string[2][] dmdStatics =
6266
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt7globals3LocPSQCk6dscope5ScopeZ11visitAArrayMFCQDrQCp10TypeAArrayZ5fhashCQEr4func15FuncDeclaration", "FuncDeclaration"],
6367
// ["_D3dmd5lexer13TimeStampInfo8initdoneb", "bool"],
6468
// 2.103
65-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
66-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
67-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
69+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
70+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
71+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
72+
// 2.110
73+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
74+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
75+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
6876

6977
["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ11visitAArrayMFCQFcQEi10TypeAArrayZ8fd_aaLenCQGf4func15FuncDeclaration", "FuncDeclaration"],
7078
["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ8noMemberMFQEdQDsQDdCQFh10identifier10IdentifieriZ4nesti", "int"],
@@ -288,7 +296,7 @@ void dmdSetupParams(const ref Options opts)
288296
global.params.ddoc.files = Strings();
289297
// Default to -m32 for 32 bit dmd, -m64 for 64 bit dmd
290298
target.isX86_64 = opts.x64;
291-
target.omfobj = !opts.msvcrt;
299+
//target.omfobj = !opts.msvcrt;
292300
target.cpu = CPU.baseline;
293301
target.isLP64 = opts.x64;
294302

@@ -337,7 +345,7 @@ void dmdSetupParams(const ref Options opts)
337345
foreach(v; opts.versionIds)
338346
versionids.push(toStringz(v));
339347

340-
global.versionids = new Identifiers();
348+
global.versionids.setDim(0);
341349
// Add in command line versions
342350
foreach (charz; *versionids)
343351
{
@@ -360,18 +368,18 @@ void dmdSetupParams(const ref Options opts)
360368
foreach(d; opts.debugIds)
361369
debugids.push(toStringz(d));
362370

363-
global.debugids = new Identifiers();
371+
global.debugids.setDim(0);
364372
foreach (charz; *debugids)
365373
{
366374
global.debugids.push(new Identifier(charz));
367375
DebugCondition.addGlobalIdent(charz[0 .. strlen(charz)]);
368376
}
369377

370-
global.path = new Strings();
378+
global.path.setDim(0);
371379
foreach(i; opts.importDirs)
372380
global.path.push(toStringz(i));
373381

374-
global.filePath = new Strings();
382+
global.filePath.setDim(0);
375383
foreach(i; opts.stringImportDirs)
376384
global.filePath.push(toStringz(i));
377385
}

0 commit comments

Comments
 (0)