Skip to content

Commit f622232

Browse files
committed
dparser: UFCS and mixin analysis are now opt-in
support string import dependencies fixed passing quoted library paths to linker fixed default library path for x64 (contained spaces, but were not quoted, added default for 8.1 SDK)
1 parent b98ee65 commit f622232

26 files changed

+357
-168
lines changed

CHANGES

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,3 +588,18 @@ Version history
588588
- added commands "Collapse unittests" and "Collapse disabled" to the outlining menu
589589
- dviewhelper.dll from cv2pdb now avoids being unloaded after debugger expression evaluation using visualizers
590590
* changed license to Boost
591+
592+
unreleased Version 0.3.38
593+
594+
* updated to cv2pdb 0.28
595+
- support mspdb120.dll from VS 2013
596+
- bugzilla 11537: improved search for appropriate mspdb*.dll if multiple version of VS installed
597+
* updated to mago 0.9
598+
- bugzilla 11547: remove error message when stopping debugging
599+
- bugzilla 11437: debug info rejected if records don't have "recommended" order
600+
* updated dparser to 08f760b6181d1e40a29f3e03a7eafcd40bf4dc34
601+
- added options to enable/disable mixin analysis and UFCS expansions
602+
* added support for string import dependencies (needs dmd 2.065)
603+
* fixed default library path for x64 (contained spaces, but were not quoted,
604+
added default for 8.1 SDK)
605+
* fixed passing quoted library paths to linker

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
DMD2 = dmd
1717
# DMD2 = m:\s\d\rainers\windows\bin\dmd.exe
1818
# DMD2 = c:\l\dmd2beta\windows\bin\dmd.exe
19+
DMD2_ = $(DMD2:/=\)
1920
COFFIMPLIB = c:\l\dmc\bin\coffimplib.exe
2021

2122
# avoid trailing '\', it ruins the command line
@@ -52,7 +53,7 @@ VSI_LIB = $(BINDIR)\vsi.lib
5253
VISUALD = $(BINDIR)\visuald.dll
5354
FMT = OMF
5455

55-
PASS_ENV = "DMD2=$(DMD2)" "WINSDK=$(WINSDK)" "COFFIMPLIB=$(COFFIMPLIB)" FMT=$(FMT)
56+
PASS_ENV = "DMD2=$(DMD2_)" "WINSDK=$(WINSDK)" "COFFIMPLIB=$(COFFIMPLIB)" FMT=$(FMT)
5657

5758
all: dte_idl vsi2d package vdserver_exe $(PIPEDMD_EXE) $(FILEMON_DLL)
5859

@@ -79,16 +80,16 @@ sdk\vsi\idl\dte90.idl : $(TLB2IDL_EXE) "$(MSENV)\dte90.olb"
7980
$(TLB2IDL_EXE) "$(MSENV)\dte90.olb" $@ "$(IVIEWER)"
8081

8182
$(TLB2IDL_EXE) : tools\tlb2idl.d
82-
$(DMD2) -map $@.map -of$@ tools\tlb2idl.d oleaut32.lib uuid.lib snn.lib kernel32.lib
83+
$(DMD2_) -map $@.map -of$@ tools\tlb2idl.d oleaut32.lib uuid.lib snn.lib kernel32.lib
8384

8485
$(PIPEDMD_EXE) : tools\pipedmd.d
85-
$(DMD2) -map $@.map -of$@ tools\pipedmd.d
86+
$(DMD2_) -map $@.map -of$@ tools\pipedmd.d
8687

8788
$(FILEMON_DLL) : tools\filemonitor.d
88-
$(DMD2) -map $@.map -of$@ -defaultlib=user32.lib -L/ENTRY:_DllMain@12 tools\filemonitor.d
89+
$(DMD2_) -map $@.map -of$@ -defaultlib=user32.lib -L/ENTRY:_DllMain@12 tools\filemonitor.d
8990

9091
$(LARGEADR_EXE) : tools\largeadr.d
91-
$(DMD2) -of$@ tools\largeadr.d
92+
$(DMD2_) -of$@ tools\largeadr.d
9293

9394
##################################
9495
# generate VSI d files from h and idl
@@ -104,7 +105,7 @@ vsi_dirs:
104105
if not exist sdk\win32\nul md sdk\win32
105106

106107
$(VSI2D_EXE) : $(VSI2D_SRC)
107-
$(DMD2) -d -map $@.map -of$@ -version=vsi $(VSI2D_SRC)
108+
$(DMD2_) -d -map $@.map -of$@ -version=vsi $(VSI2D_SRC)
108109

109110
sdk\vsi_sources: $(VSI2D_EXE)
110111
$(VSI2D_EXE) -vsi="$(VSISDK)" -win="$(WINSDK)\Include" -dte="$(DTE_IDL_PATH)" -sdk=sdk
@@ -138,6 +139,9 @@ dparser:
138139
mago:
139140
cd ..\..\mago && devenv /Build "Release|Win32" magodbg.sln
140141

142+
cv2pdb:
143+
cd ..\..\cv2pdb\trunk && devenv /Build "Release|Win32" src\cv2pdb.sln
144+
141145
##################################
142146
# create installer
143147

VERSION

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#define VERSION_MAJOR 0
22
#define VERSION_MINOR 3
3-
#define VERSION_REVISION 37
3+
#define VERSION_REVISION 38
4+
#define VERSION_BETA -beta
5+
#define VERSION_BUILD 1

doc/StartPage.dd

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,19 @@ $(H2 News)
5252
$(LINK2 VersionHistory.html, Full version history and complete details...)
5353
$(BR)
5454

55+
2013-11-02 Version 0.3.37
56+
$(UL
57+
$(LI Installer now supports VS 2013, updated to cv2pdb 0.27, mago 0.8, fixes x64 deubgger in VS 2012 Shell)
58+
$(LI improvements to "Compile and Run")
59+
$(LI improvements to syntax/coverage highlighting)
60+
$(LI DParser engine now used by default, updated to recent version)
61+
$(LI single file options now available per project configuration)
62+
$(LI added global option to display the reason for building a target)
63+
$(LI added different options for executable and library search paths to be used for Win32/x64)
64+
$(LI link dependencies can now also be monitored for the 32-bit MS linker)
65+
$(LI added commands "Collapse unittests" and "Collapse disabled" to the outlining menu)
66+
)
67+
5568
2013-05-10 $(LINK2 News36.html, Version 0.3.36)
5669
$(UL
5770
$(LI updated to new features of the language and tooling as of dmd 2.062)
@@ -63,28 +76,12 @@ $(UL
6376
$(LI added option "Colorize coverage from .LST file" to highlight lines from code coverage output)
6477
)
6578

66-
2012-12-03 Version 0.3.35
67-
$(UL
68-
$(LI a number of bugfixes and improvements to the build system, e.g.
69-
$(UL
70-
$(LI new linker option to disable using global and standard library search paths)
71-
$(LI added preliminary support for upcoming dmd win64 compiler)
72-
$(LI added console application project template with configurations for DMD and GDC for Win32 and x86)
73-
)
74-
)
75-
$(LI added build project to build Visual D from VS itself without the need to modify makefiles)
76-
$(LI goto definition now uses semantic analysis to find declaration)
77-
$(LI semantic analysis now enabled by default (removed experimental status))
78-
$(LI now installed as an "extension" to VS 2010 and VS 2012)
79-
$(LI fixed spurious crashes due to bug in precise garbage collection)
80-
)
81-
8279
$(LINK2 VersionHistory.html, more...)
8380

8481
$(H2 Download)
8582

86-
$(P The latest installer can be downloaded
87-
$(LINK2 http:/www.dsource.org/projects/visuald/browser/downloads/VisualD-v0.3.36.exe?format=raw&FixForIE=.exe, here).
83+
$(P The latest installer can also be downloaded
84+
$(LINK2 http:/www.dsource.org/projects/visuald/browser/downloads/VisualD-v0.3.37.exe?format=raw&FixForIE=.exe, here).
8885
You can find older versions and some additional files in
8986
the $(LINK2 http:/www.dsource.org/projects/visuald/browser/downloads/, download directory).)
9087

doc/VersionHistory.dd

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,74 @@
11
Ddoc
22

3+
2013-11-02 Version 0.3.37
4+
$(UL
5+
$(LI installer:
6+
$(UL
7+
$(LI fixed regression: VS 2010/2012 extension pkgdef files almost empty)
8+
$(LI now has workaround for x64 debugger of Visual Studio 2012 Shell )
9+
$(LI installs cv2pdb 0.27 which fixes a crash when converting DWARF from GDC 4.8)
10+
$(LI installs mago 0.8 with pdb and embedded breakpoints support )
11+
$(LI installer now picks up dmd2 folder from DMD installation)
12+
$(LI added support for VS 2013 to installer, removed VS.NET 2003)
13+
))
14+
$(LI "Compile and Run":
15+
$(UL
16+
$(LI no longer adds "--main" automatically)
17+
$(LI removed some other implicite command line options that confused rdmd)
18+
$(LI fixed quotes in --eval arguments)
19+
$(LI didn't save file if it is not part of a project in the solution)
20+
))
21+
$(LI syntax/coverage highlighting
22+
$(UL
23+
$(LI editor always started with coverage highlighting enabled)
24+
$(LI Colorize coverage:
25+
$(UL
26+
$(LI disabled if lst file older than source file or deleted)
27+
$(LI tweaked line number translation)
28+
$(LI now searches for coverage generated files in last execution folders)
29+
$(LI added new command "Delete Coverage Files")
30+
))
31+
$(LI after changing the "Colored types" the current editor did not update immediately)
32+
$(LI user type colorizer settings were forgotten after editing options)
33+
$(LI keywords can now also be colored by adding them to the "Colored types")
34+
))
35+
$(LI DParser
36+
$(UL
37+
$(LI updated to $(LINK2 https://github.com/aBothe/D_Parser/commit/72f1bc54f2426954f463f03b215e044174fc1468, recent version))
38+
$(LI enabled mixin analysis)
39+
$(LI pass deprecation flag to engine)
40+
$(LI DParser engine now used by default if installed)
41+
))
42+
$(LI vdserver
43+
$(UL
44+
$(LI add __FUNCTION__, __PRETTY_FUNCTION__ and __MODULE__ as keywords and primary expression)
45+
$(LI add __parameters as specification in is-expression)
46+
))
47+
$(LI build system
48+
$(UL
49+
$(LI fixed building with -op and source files on different drive than project)
50+
$(LI added file options per configuration)
51+
$(LI fixed invoking bad command when no files to compile, but additional arguments set)
52+
$(LI added global option to display the reason for building a target)
53+
$(LI fixed custom build rules executed twice sometimes)
54+
$(LI fixed sc.ini evaluation, added support for sections [Environment32] and [Environment64] )
55+
$(LI link dependencies can now also be monitored for the 32-bit MS linker)
56+
$(LI added VCINSTALLDIR to the list of available macros)
57+
$(LI added different options for executable and library search paths to be used for Win32/x64)
58+
$(LI x64: linker settings from sc.ini can be overwritten )
59+
$(LI x64: linker no longer invoked through dmd)
60+
))
61+
$(LI miscellaneous
62+
$(UL
63+
$(LI added command "Open Folder in Windows Explorer" to project and folder context menu)
64+
$(LI goto definition now falls back to JSON information if semantic analysis yields no result)
65+
$(LI improved indentation after opening parenthesis to follow next token)
66+
$(LI added commands "Collapse unittests" and "Collapse disabled" to the outlining menu)
67+
$(LI dviewhelper.dll from cv2pdb now avoids being unloaded after debugger expression evaluation using visualizers)
68+
))
69+
$(LI changed license to Boost)
70+
)
71+
372
2013-05-10 $(DDLINK News36,Version 0.3.36)
473
$(UL
574
$(LI added debug settings to new DMD/GDC project template )

nsis/visuald.nsi

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,21 @@
2828
!searchparse /file ../version "#define VERSION_MAJOR " VERSION_MAJOR
2929
!searchparse /file ../version "#define VERSION_MINOR " VERSION_MINOR
3030
!searchparse /file ../version "#define VERSION_REVISION " VERSION_REVISION
31+
!searchparse /file ../version "#define VERSION_BETA " VERSION_BETA
32+
!searchparse /file ../version "#define VERSION_BUILD " VERSION_BUILD
3133

3234
!searchreplace VERSION_MAJOR ${VERSION_MAJOR} " " ""
3335
!searchreplace VERSION_MINOR ${VERSION_MINOR} " " ""
3436
!searchreplace VERSION_REVISION ${VERSION_REVISION} " " ""
37+
!searchreplace VERSION_BETA ${VERSION_BETA} " " ""
38+
!searchreplace VERSION_BUILD ${VERSION_BUILD} " " ""
39+
40+
!if "${VERSION_BUILD}" == "0"
41+
!define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}"
42+
!else
43+
!define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_BETA}${VERSION_BUILD}"
44+
!endif
3545

36-
!define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}"
3746
!echo "VERSION = ${VERSION}"
3847
!define AUTHOR "Rainer Schuetze"
3948
!define APPNAME "VisualD"

0 commit comments

Comments
 (0)