Skip to content

Commit 616b422

Browse files
authored
Merge pull request #107 from rainers/master
Visual D 0.49.0 beta 1
2 parents 8248519 + d12fc6b commit 616b422

Some content is hidden

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

42 files changed

+1606
-518
lines changed

CHANGES

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,3 +1071,30 @@ Version history
10711071
- fix missing line numbers for new versions of mspdb (e.g. 14.16.27012/VS 15.9)
10721072
* mago: variables captured from stack of outer function not displayed in locals
10731073

1074+
unreleased 0.49.0
1075+
* installation
1076+
- prepare for VS2019: detect installation, build against VS 2019 SDK, Win SDK 10.0.17763.0
1077+
* build system
1078+
- now parallel compilation supported by VC projects (thanks to Igor Cesi)
1079+
- bugzilla 19558: now saves all files with single file compile (and run/debug/disassemble)
1080+
- add support for recently added command line options -mixin
1081+
- new "Language" configuration page for -betterC, -dipNN and -transition=/-preview=/-revert= options
1082+
- visualdproj: remove support for D1 and ancient/removed options -nofloat and -property
1083+
- visualdproj: replaced -noboundscheck option with -boundscheck=...
1084+
- bugzilla 19558: save all files with compile and run/debug/disassemble
1085+
- fix reading options from vcxproj with compile and run/debug/disassemble
1086+
- bugzilla 19726: VC project using LDC now adds C runtime to linker dependencies
1087+
- bugzilla 19690: installer fails to register MSBuild extensions for Visual Studio Build Tools
1088+
* dparser
1089+
- catch up with recent language changes:
1090+
- contract expressions
1091+
- traits can appear everywhere a type can be declared
1092+
- allow @UDA for enumerator values
1093+
- parse __vector and __parameters in IsExpression, evaluate __vector
1094+
- fix parsing character literals with surrogate pairs
1095+
- fix tooltips showing storage classes as type constructors
1096+
* debugger
1097+
- bugzilla 18889: do not forward tooltip to debugger if hovering compile time identifier (type/enum)
1098+
* editor
1099+
- tweaked default colors to better work with dark mode (restart VS and Visual D twice after switch
1100+
between light and dark modes)

Makefile

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@
2424
# update the following variables to match the installation
2525
# paths on your system or pass on the command line to nmake
2626

27-
NSIS = $(PROGRAMFILES)\NSIS
27+
# nmake doesn't like $(ProgramFiles(x86)), so run this with x86 nmake
28+
PROGRAMFILESX86 = c:\Program Files (x86)
29+
30+
NSIS = $(PROGRAMFILESX86)\NSIS
2831
MSBUILD = msbuild
29-
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
32+
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
33+
!IF !EXIST($(MSBUILD15))
34+
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\msbuild"
35+
!ENDIF
3036
CONFIG = Release COFF32
3137

3238
##############################################################
@@ -61,8 +67,8 @@ dparser_test:
6167

6268
fake_dparser:
6369
if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer
64-
if exist "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" copy "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" bin\Release\DParserCOMServer
65-
if exist "$(PROGRAMFILES)\VisualD\dparser\dparser\D_Parser.dll" copy "$(PROGRAMFILES)\VisualD\dparser\dparser\D_Parser.dll" bin\Release\DParserCOMServer
70+
if exist "$(PROGRAMFILESX86)\VisualD\dparser\dparser\DParserCOMServer.exe" copy "$(PROGRAMFILESX86)\VisualD\dparser\dparser\DParserCOMServer.exe" bin\Release\DParserCOMServer
71+
if exist "$(PROGRAMFILESX86)\VisualD\dparser\dparser\D_Parser.dll" copy "$(PROGRAMFILESX86)\VisualD\dparser\dparser\D_Parser.dll" bin\Release\DParserCOMServer
6672
if not exist bin\Release\DParserCOMServer\DParserCOMServer.exe echo dummy >bin\Release\DParserCOMServer\DParserCOMServer.exe
6773
if not exist bin\Release\DParserCOMServer\D_Parser.dll echo dummy >bin\Release\DParserCOMServer\D_Parser.dll
6874

@@ -78,7 +84,7 @@ dbuild12:
7884

7985
fake_dbuild12:
8086
if not exist msbuild\dbuild\obj\release\nul md msbuild\dbuild\obj\release
81-
if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.12.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.12.0.dll" msbuild\dbuild\obj\release
87+
if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.12.0.dll" copy "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.12.0.dll" msbuild\dbuild\obj\release
8288
if not exist msbuild\dbuild\obj\release\dbuild.12.0.dll echo dummy >msbuild\dbuild\obj\release\dbuild.12.0.dll
8389

8490
dbuild14:
@@ -87,26 +93,35 @@ dbuild14:
8793

8894
fake_dbuild14:
8995
if not exist msbuild\dbuild\obj\release-v14\nul md msbuild\dbuild\obj\release-v14
90-
if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.14.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.14.0.dll" msbuild\dbuild\obj\release-v14
96+
if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.14.0.dll" copy "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.14.0.dll" msbuild\dbuild\obj\release-v14
9197
if not exist msbuild\dbuild\obj\release-v14\dbuild.14.0.dll echo dummy >msbuild\dbuild\obj\release-v14\dbuild.14.0.dll
9298

9399
dbuild15:
94100
cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
95101

96102
fake_dbuild15:
97103
if not exist msbuild\dbuild\obj\release-v15\nul md msbuild\dbuild\obj\release-v15
98-
if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.15.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.15.0.dll" msbuild\dbuild\obj\release-v15
104+
if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.15.0.dll" copy "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.15.0.dll" msbuild\dbuild\obj\release-v15
99105
if not exist msbuild\dbuild\obj\release-v15\dbuild.15.0.dll echo dummy >msbuild\dbuild\obj\release-v15\dbuild.15.0.dll
100106

107+
dbuild16:
108+
cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
109+
110+
101111
mago:
102112
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
103113
cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
104114
cd ..\..\mago && devenv /Build "Release StaticDE|Win32" /Project "MagoNatCC" magodbg_2010.sln
105115

106116
mago_vs15:
107-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v140 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
108-
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v140 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
109-
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v140" /target:Expression\MagoNatCC MagoDbg_2010.sln
117+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
118+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v141 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
119+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v141" /target:Expression\MagoNatCC MagoDbg_2010.sln
120+
121+
mago_vs16:
122+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
123+
cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v142 /target:DebugEngine\MagoRemote MagoDbg_2010.sln
124+
cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
110125

111126
cv2pdb:
112127
cd ..\..\cv2pdb\trunk && devenv /Project "cv2pdb" /Build "Release|Win32" src\cv2pdb_vs12.sln
@@ -118,6 +133,11 @@ cv2pdb_vs15:
118133
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dviewhelper\dviewhelper.vcxproj
119134
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dumplines.vcxproj
120135

136+
cv2pdb_vs16:
137+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\cv2pdb.vcxproj
138+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dviewhelper\dviewhelper.vcxproj
139+
cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v142 src\dumplines.vcxproj
140+
121141
dcxxfilt: $(DCXXFILT_EXE)
122142
$(DCXXFILT_EXE): tools\dcxxfilt.d
123143
# no space after Release, it will be part of environment variable
@@ -126,7 +146,7 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
126146
##################################
127147
# create installer
128148

129-
install_release_modules: install_modules dparser dparser_test cv2pdb mago dbuild12 dbuild14 dbuild15
149+
install_release_modules: install_modules dparser dparser_test cv2pdb_vs16 mago_vs16 dbuild12 dbuild14 dbuild15
130150

131151
install_vs: install_release_modules install_only
132152

@@ -138,4 +158,4 @@ install_modules: prerequisites visuald_vs vdserver vdextension visualdwizard dcx
138158

139159
install_only:
140160
if not exist ..\downloads\nul md ..\downloads
141-
cd nsis && "$(NSIS)\makensis" /V1 "/DCONFIG=$(CONFIG)" visuald.nsi
161+
cd nsis && "$(NSIS)\makensis" /V1 "/DCONFIG=$(CONFIG)" $(NSIS_ARGS) visuald.nsi

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<img src="/doc/images/vd_logo.png?format=raw" width="72">
2-
Visual D
3-
============================================================
1+
<img src="/doc/images/vd_logo.png?format=raw" width="72"> Visual D
2+
==================================================================
43

54
This is the README file for Visual D, a
65
Visual Studio package providing both project management and language services

VERSION

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

0 commit comments

Comments
 (0)