Skip to content

Commit 4dd4836

Browse files
rainersrainers
authored
Merge pull request #136 from rainers/master
Changes for Visual D 1.3.0rc1
2 parents 22ff993 + c669d6d commit 4dd4836

File tree

17 files changed

+354
-119
lines changed

17 files changed

+354
-119
lines changed

‎CHANGES‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,3 +1321,11 @@ Version history
13211321
- added support for DWARF5
13221322
* installer:
13231323
- full installer now bundled with DMD 2.098.1 and LDC 1.28.1
1324+
1325+
unreleased version 1.3.0
1326+
* dmdserver updated to frontend of DMD 2.099.1-beta
1327+
* full installer now bundled with DMD 2.099.1 and LDC 1.28.1
1328+
* bugzilla 22747: D files in VC projects failed to build, added separate versions of
1329+
Microsoft.Build.CPPTasks.Common for 17.0, 17.1 and 17.2.
1330+
* bugzilla 22764: now searches the 32-bit registry hive for install paths of DMD and LDC
1331+
* cv2pdb 0.51: added DWARF support for non-contiguous functions.

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,13 @@ dbuild16_1:
135135
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16_1;Platform=AnyCPU /t:Rebuild
136136

137137
dbuild17:
138-
# cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
139138
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17;Platform=AnyCPU /t:Rebuild
140139

140+
dbuild17_1:
141+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_1;Platform=AnyCPU /t:Rebuild
142+
143+
dbuild17_2:
144+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_2;Platform=AnyCPU /t:Rebuild
141145

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

‎VERSION‎

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

‎build/build.visualdproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ call $(InputPath) "$(OutDir)\tlb2idl.exe" "$(IntDir)\dte_idl.succ
15211521
if exist "$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat" call "$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat"
15221522
if exist "$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat" ( pushd . && call "$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat" && popd )
15231523
if errorlevel 1 goto reportError
1524-
$(DMDInstallDir)\windows\bin\dmd -g -map "$(IntDir)\$(InputName).map" "-of$(OutDir)\$(InputName).dll" "-od$(IntDir)" -defaultlib=user32.lib -L/ENTRY:_DllMain@12 $(InputPath)" outfile="$(OutDir)\$(InputName).dll" path="..\tools\filemonitor.d" tool="Custom" />
1524+
$(DMDInstallDir)\windows\bin\dmd -g -map "$(IntDir)\$(InputName).map" "-of$(OutDir)\$(InputName).dll" "-od$(IntDir)" -defaultlib=user32.lib -m32mscoff -L/SUBSYSTEM:CONSOLE -L/ENTRY:DllMain@12 $(InputPath) kernel32.lib user32.lib" outfile="$(OutDir)\$(InputName).dll" path="..\tools\filemonitor.d" tool="Custom" />
15251525
<File path="..\tools\largeadr.d" />
15261526
<File customcmd="dmd -map $(OutDir)\$(InputName).map -of$(IntDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d" perConfig="true" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" path="..\tools\mb2utf16.d" tool="Custom">
15271527
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
@@ -1614,6 +1614,6 @@ call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.succe
16141614
<File customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
16151615
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
16161616
if errorlevel 1 goto reportError
1617-
$(DMDInstallDir)\windows\bin\dmd -d -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; &quot;-od$(IntDir)&quot; $(InputPath) oleaut32.lib uuid.lib" outfile="$(OutDir)\$(InputName).exe" path="..\tools\tlb2idl.d" tool="Custom" />
1617+
$(DMDInstallDir)\windows\bin\dmd -d -m32mscoff -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; &quot;-od$(IntDir)&quot; $(InputPath) user32.lib oleaut32.lib uuid.lib" outfile="$(OutDir)\$(InputName).exe" path="..\tools\tlb2idl.d" tool="Custom" />
16181618
</Folder>
16191619
</DProject>

‎doc/Installation.dd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Ddoc
22

3-
$(P Visual D works with all Visual Studio versions from 2008 to 2019. Please make sure to
3+
$(P Visual D works with all Visual Studio versions from 2008 to 2022. Please make sure to
44
have the $(B C++ development tools) aswell as a $(B Windows SDK) included in the Visual Studio installation.)
55

66
$(P The click-through-installer will guide you through the installation process. The installer lets you select the
77
Visual Studio Version for which you want Visual D to be installed. It will always install
88
for all users, not only for a single user.)
99

1010
$(P To compile your application, you must have $(LINK2 http://www.digitalmars.com/d/download.html, DMD),
11-
$(LINK2 https://github.com/D-Programming-GDC/GDC, GDC) or $(LINK2 https://github.com/ldc-developers/ldc, LDC)
11+
$(LINK2 https://github.com/ldc-developers/ldc, LDC) or $(LINK2 https://github.com/D-Programming-GDC/GDC, GDC)
1212
installed.)
1313

1414
$(H2 Using DMD)

‎doc/StartPage.dd‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Ddoc
33
$(TABLE_NOBORDER
44
$(TD $(IMG images/vd_logo.png))
55
$(TD
6-
$(P Visual D is a Visual Studio package providing both project management and language services.
7-
It works with Visual Studio 2008 - 2019 including Visual Studio Community as well as the free Visual Studio Shells.
8-
See the $(LINK2 Installation.html, Installation) instructions, especially if not using a commercial or community edition of Visual Studio.)
6+
$(P Visual D is a Visual Studio package providing project management, language services and debugger integration.
7+
It works with Visual Studio 2008 - 2022 including Professional and Community versions.
8+
See the $(LINK2 Installation.html, Installation) instructions, especially if using older versions
9+
of Visual Studio.)
910

1011
$(P Visual D aims at providing seamless integration of the D programming language into Visual Studio.)
1112
))
@@ -24,7 +25,7 @@ $(TABLE_NOBORDER
2425
<div align="right">
2526
$(LINK2 https://github.com/dlang/visuald/releases/download/v$(VERSION)/VisualD-v$(VERSION)-dmd-$(DMD_VERSION)-ldc2-$(LDC_VERSION).exe, $(IMG images/download_with_dmdldc2.png))
2627
</div>
27-
<div align="right"><small>download size approx 80 MB</small></div>
28+
<div align="right"><small>download size approx 88 MB</small></div>
2829
</span>
2930
))
3031
$(TR
@@ -34,7 +35,7 @@ $(TABLE_NOBORDER
3435
<div align="right">
3536
$(LINK2 https://github.com/dlang/visuald/releases/download/v$(VERSION)/VisualD-v$(VERSION).exe, $(IMG images/download_extension2.png))
3637
</div>
37-
<div align="right"><small>download size approx 4 MB</small></div>
38+
<div align="right"><small>download size approx 6 MB</small></div>
3839
))
3940
$(TR
4041
$(TD Cutting edge prereleases if you want to try the most recent improvements to Visual D:)

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,50 @@
115115
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
116116
<TargetVer>17.0</TargetVer>
117117
</PropertyGroup>
118+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_1|AnyCPU'">
119+
<OutputPath>bin\Release-v17_1\</OutputPath>
120+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
121+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
122+
<Optimize>true</Optimize>
123+
<DebugType>pdbonly</DebugType>
124+
<PlatformTarget>AnyCPU</PlatformTarget>
125+
<ErrorReport>prompt</ErrorReport>
126+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
127+
<TargetVer>17.1</TargetVer>
128+
</PropertyGroup>
129+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_1|AnyCPU'">
130+
<OutputPath>bin\Debug-v17_1\</OutputPath>
131+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
132+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
133+
<Optimize>false</Optimize>
134+
<DebugType>pdbonly</DebugType>
135+
<PlatformTarget>AnyCPU</PlatformTarget>
136+
<ErrorReport>prompt</ErrorReport>
137+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
138+
<TargetVer>17.1</TargetVer>
139+
</PropertyGroup>
140+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_2|AnyCPU'">
141+
<OutputPath>bin\Release-v17_2\</OutputPath>
142+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
143+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
144+
<Optimize>true</Optimize>
145+
<DebugType>pdbonly</DebugType>
146+
<PlatformTarget>AnyCPU</PlatformTarget>
147+
<ErrorReport>prompt</ErrorReport>
148+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
149+
<TargetVer>17.2</TargetVer>
150+
</PropertyGroup>
151+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_2|AnyCPU'">
152+
<OutputPath>bin\Debug-v17_2\</OutputPath>
153+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
154+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
155+
<Optimize>false</Optimize>
156+
<DebugType>pdbonly</DebugType>
157+
<PlatformTarget>AnyCPU</PlatformTarget>
158+
<ErrorReport>prompt</ErrorReport>
159+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
160+
<TargetVer>17.2</TargetVer>
161+
</PropertyGroup>
118162
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
119163
<DebugSymbols>true</DebugSymbols>
120164
<DebugType>full</DebugType>
@@ -158,7 +202,7 @@
158202
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
159203
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5.2</TargetFrameworkVersion>
160204
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
161-
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' ">v4.7.2</TargetFrameworkVersion>
205+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' ">v4.7.2</TargetFrameworkVersion>
162206
<GeneratePkgDefFile>false</GeneratePkgDefFile>
163207
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
164208
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -389,7 +433,7 @@
389433
</Reference>
390434
</ItemGroup>
391435
<!-- VS2022 -->
392-
<ItemGroup Condition="'$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1'">
436+
<ItemGroup Condition="'$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2'">
393437
<Reference Include="Microsoft.Build">
394438
<HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
395439
</Reference>
@@ -411,10 +455,22 @@
411455
<Reference Include="Microsoft.VisualStudio.VCProjectEngine">
412456
<HintPath>assemblies\v17\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
413457
</Reference>
458+
</ItemGroup>
459+
<ItemGroup Condition="'$(TargetVer)' == '17.0'">
414460
<Reference Include="Microsoft.Build.CPPTasks.Common">
415461
<HintPath>assemblies\v17\Microsoft.Build.CPPTasks.Common.dll</HintPath>
416462
</Reference>
417463
</ItemGroup>
464+
<ItemGroup Condition="'$(TargetVer)' == '17.1'">
465+
<Reference Include="Microsoft.Build.CPPTasks.Common">
466+
<HintPath>assemblies\v17_1\Microsoft.Build.CPPTasks.Common.dll</HintPath>
467+
</Reference>
468+
</ItemGroup>
469+
<ItemGroup Condition="'$(TargetVer)' == '17.2'">
470+
<Reference Include="Microsoft.Build.CPPTasks.Common">
471+
<HintPath>assemblies\v17_2\Microsoft.Build.CPPTasks.Common.dll</HintPath>
472+
</Reference>
473+
</ItemGroup>
418474
<ItemGroup>
419475
<EmbeddedResource Include="Strings.resx">
420476
<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="$(DBuildVersion) == '17.0'" Type="Message" Code="MSB8034" Importance="low" Arguments="CPPTaskPath;$(CPPTaskPath)"/>
139+
<VCMessage Condition="$(MSBDBuildVersion_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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@
4444
<MSBuildVersion_Major>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0])</MSBuildVersion_Major>
4545
<MSBuildVersion_Minor>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1])</MSBuildVersion_Minor>
4646
<MSBuildVersion_Build>$([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2])</MSBuildVersion_Build>
47-
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16">$(MSBuildVersion_Major).0</DBuildVersion>
47+
<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) == 0">17.0</DBuildVersion>
51+
<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>
5053
</PropertyGroup>
5154

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

‎nsis/visuald.nsi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

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

3535
; define LDC to include ldc installation
@@ -330,6 +330,8 @@ Section "Visual Studio package" SecPackage
330330
!endif
331331
!ifdef VS2022
332332
${File} ..\msbuild\dbuild\obj\release-v17\ dbuild.17.0.dll
333+
${File} ..\msbuild\dbuild\obj\release-v17_1\ dbuild.17.1.dll
334+
${File} ..\msbuild\dbuild\obj\release-v17_2\ dbuild.17.2.dll
333335
!endif
334336
WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
335337
!endif

0 commit comments

Comments
 (0)