Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,8 @@ unreleased Version 0.50.0
- added enable -mixin option to autogenerate files according to the compilation model
- "New item" now also allows adding D module
- new option for -extern-std=c++xx
- new option for -lowmem
- D-Compiler option missing if no english VS language pack installed
* visualdproj:
- Error List: classify warnings and deprecations according to the respective options
* bugzilla 19930: visualdproj: fix building projects with "&|<>" in directory names
Expand All @@ -1145,3 +1147,7 @@ unreleased Version 0.50.0
- regression: use of registers in expression was lost at some point
- show class and message for exceptions that the debugger breaks on
- fix conditional breakpoints "not supported"
- support multiple "live ranges" when LDC uses registers for locals
- fix evaluating locals in registers
* slightly change identification of break point locations
* fixed "go to definition" eventually not jumping to correct line after opening document
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 50
#define VERSION_REVISION 0
#define VERSION_BETA -beta
#define VERSION_BUILD 3
#define VERSION_BETA -rc
#define VERSION_BUILD 1
198 changes: 186 additions & 12 deletions build/build.visualdproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<useIn>0</useIn>
<useOut>0</useOut>
<useArrayBounds>0</useArrayBounds>
<noboundscheck>0</noboundscheck>
<boundscheck>0</boundscheck>
<useSwitchError>0</useSwitchError>
<useUnitTests>0</useUnitTests>
<useInline>0</useInline>
Expand All @@ -45,10 +45,22 @@
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<betterC>0</betterC>
<dip25>0</dip25>
<dip1000>0</dip1000>
<dip1008>0</dip1008>
<transition_field>0</transition_field>
<revert_import>0</revert_import>
<preview_dtorfields>0</preview_dtorfields>
<transition_checkimports>0</transition_checkimports>
<transition_complex>0</transition_complex>
<preview_intpromote>0</preview_intpromote>
<preview_fixAliasThis>0</preview_fixAliasThis>
<preview_markdown>0</preview_markdown>
<transition_vmarkdown>0</transition_vmarkdown>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<cccmd>$(CC) -c</cccmd>
Expand Down Expand Up @@ -86,10 +98,11 @@
<runargs />
<runCv2pdb>1</runCv2pdb>
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
<cv2pdbPre2043>0</cv2pdbPre2043>
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
<cv2pdbEnumType>0</cv2pdbEnumType>
<cv2pdbOptions />
<enableMixin>0</enableMixin>
<mixinPath>$(IntDir)\$(SafeProjectName).mixin</mixinPath>
<objfiles />
<linkswitches />
<libfiles />
Expand All @@ -105,7 +118,8 @@
<privatePhobos>0</privatePhobos>
<additionalOptions />
<preBuildCommand />
<postBuildCommand>echo Success &gt;$(TargetPath)</postBuildCommand>
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
</Config>
<Config platform="Win32" name="Release">
Expand Down Expand Up @@ -140,7 +154,7 @@
<useIn>0</useIn>
<useOut>0</useOut>
<useArrayBounds>0</useArrayBounds>
<noboundscheck>0</noboundscheck>
<boundscheck>0</boundscheck>
<useSwitchError>0</useSwitchError>
<useUnitTests>0</useUnitTests>
<useInline>0</useInline>
Expand All @@ -153,10 +167,22 @@
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<betterC>0</betterC>
<dip25>0</dip25>
<dip1000>0</dip1000>
<dip1008>0</dip1008>
<transition_field>0</transition_field>
<revert_import>0</revert_import>
<preview_dtorfields>0</preview_dtorfields>
<transition_checkimports>0</transition_checkimports>
<transition_complex>0</transition_complex>
<preview_intpromote>0</preview_intpromote>
<preview_fixAliasThis>0</preview_fixAliasThis>
<preview_markdown>0</preview_markdown>
<transition_vmarkdown>0</transition_vmarkdown>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<cccmd>$(CC) -c</cccmd>
Expand Down Expand Up @@ -194,10 +220,11 @@
<runargs />
<runCv2pdb>0</runCv2pdb>
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
<cv2pdbPre2043>0</cv2pdbPre2043>
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
<cv2pdbEnumType>0</cv2pdbEnumType>
<cv2pdbOptions />
<enableMixin>0</enableMixin>
<mixinPath>$(IntDir)\$(SafeProjectName).mixin</mixinPath>
<objfiles />
<linkswitches />
<libfiles />
Expand All @@ -213,8 +240,8 @@
<privatePhobos>0</privatePhobos>
<additionalOptions />
<preBuildCommand />
<postBuildCommand>echo Success &gt;$(TargetPath)
echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
</Config>
<Config platform="Win32" name="Release COFF32">
Expand Down Expand Up @@ -249,7 +276,7 @@ echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
<useIn>0</useIn>
<useOut>0</useOut>
<useArrayBounds>0</useArrayBounds>
<noboundscheck>0</noboundscheck>
<boundscheck>0</boundscheck>
<useSwitchError>0</useSwitchError>
<useUnitTests>0</useUnitTests>
<useInline>0</useInline>
Expand All @@ -262,10 +289,22 @@ echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<betterC>0</betterC>
<dip25>0</dip25>
<dip1000>0</dip1000>
<dip1008>0</dip1008>
<transition_field>0</transition_field>
<revert_import>0</revert_import>
<preview_dtorfields>0</preview_dtorfields>
<transition_checkimports>0</transition_checkimports>
<transition_complex>0</transition_complex>
<preview_intpromote>0</preview_intpromote>
<preview_fixAliasThis>0</preview_fixAliasThis>
<preview_markdown>0</preview_markdown>
<transition_vmarkdown>0</transition_vmarkdown>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<cccmd>$(CC) -c</cccmd>
Expand Down Expand Up @@ -303,10 +342,11 @@ echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
<runargs />
<runCv2pdb>0</runCv2pdb>
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
<cv2pdbPre2043>0</cv2pdbPre2043>
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
<cv2pdbEnumType>0</cv2pdbEnumType>
<cv2pdbOptions />
<enableMixin>0</enableMixin>
<mixinPath>$(IntDir)\$(SafeProjectName).mixin</mixinPath>
<objfiles />
<linkswitches />
<libfiles />
Expand All @@ -323,6 +363,128 @@ echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
<additionalOptions />
<preBuildCommand />
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
</Config>
<Config platform="Win32" name="Debug COFF32">
<obj>0</obj>
<link>0</link>
<lib>1</lib>
<subsystem>0</subsystem>
<multiobj>0</multiobj>
<singleFileCompilation>3</singleFileCompilation>
<oneobj>0</oneobj>
<mscoff>0</mscoff>
<trace>0</trace>
<quiet>0</quiet>
<verbose>0</verbose>
<vtls>0</vtls>
<vgc>0</vgc>
<symdebug>1</symdebug>
<symdebugref>1</symdebugref>
<optimize>0</optimize>
<cpu>0</cpu>
<isX86_64>0</isX86_64>
<isLinux>0</isLinux>
<isOSX>0</isOSX>
<isWindows>0</isWindows>
<isFreeBSD>0</isFreeBSD>
<isSolaris>0</isSolaris>
<scheduler>0</scheduler>
<useDeprecated>0</useDeprecated>
<errDeprecated>0</errDeprecated>
<useAssert>0</useAssert>
<useInvariants>0</useInvariants>
<useIn>0</useIn>
<useOut>0</useOut>
<useArrayBounds>0</useArrayBounds>
<boundscheck>0</boundscheck>
<useSwitchError>0</useSwitchError>
<useUnitTests>0</useUnitTests>
<useInline>0</useInline>
<release>0</release>
<preservePaths>0</preservePaths>
<warnings>0</warnings>
<infowarnings>0</infowarnings>
<checkProperty>0</checkProperty>
<genStackFrame>0</genStackFrame>
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<betterC>0</betterC>
<dip25>0</dip25>
<dip1000>0</dip1000>
<dip1008>0</dip1008>
<transition_field>0</transition_field>
<revert_import>0</revert_import>
<preview_dtorfields>0</preview_dtorfields>
<transition_checkimports>0</transition_checkimports>
<transition_complex>0</transition_complex>
<preview_intpromote>0</preview_intpromote>
<preview_fixAliasThis>0</preview_fixAliasThis>
<preview_markdown>0</preview_markdown>
<transition_vmarkdown>0</transition_vmarkdown>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<cccmd>$(CC) -c</cccmd>
<ccTransOpt>1</ccTransOpt>
<addDepImp>0</addDepImp>
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
<imppath />
<fileImppath />
<outdir>..\bin\$(ConfigurationName)</outdir>
<objdir>$(OutDir)\$(ProjectName)</objdir>
<objname />
<libname />
<doDocComments>0</doDocComments>
<docdir />
<docname />
<modules_ddoc />
<ddocfiles />
<doHdrGeneration>0</doHdrGeneration>
<hdrdir />
<hdrname />
<doXGeneration>1</doXGeneration>
<xfilename>$(IntDir)\$(TargetName).json</xfilename>
<debuglevel>0</debuglevel>
<debugids />
<versionlevel>0</versionlevel>
<versionids />
<dump_source>0</dump_source>
<mapverbosity>0</mapverbosity>
<createImplib>0</createImplib>
<debuglib>0</debuglib>
<defaultlibname />
<debuglibname />
<moduleDepsFile />
<run>0</run>
<runargs />
<runCv2pdb>1</runCv2pdb>
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
<cv2pdbEnumType>0</cv2pdbEnumType>
<cv2pdbOptions />
<enableMixin>0</enableMixin>
<mixinPath>$(IntDir)\$(SafeProjectName).mixin</mixinPath>
<objfiles />
<linkswitches />
<libfiles />
<libpaths />
<deffile />
<resfile />
<exefile>$(IntDir)\$(ProjectName).sdk</exefile>
<pdbfile>$(IntDir)\$(SafeProjectName).pdb</pdbfile>
<impfile>$(IntDir)\$(SafeProjectName).lib</impfile>
<mapfile>$(IntDir)\$(SafeProjectName).map</mapfile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<privatePhobos>0</privatePhobos>
<additionalOptions />
<preBuildCommand />
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
</Config>
Expand All @@ -348,6 +510,11 @@ dmd -g -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputNam
if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
if errorlevel 1 goto reportError
dmd -m32mscoff -g -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib -L/SUBSYSTEM:CONSOLE,5.01" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Debug COFF32|Win32" />
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
if errorlevel 1 goto reportError
dmd -m32mscoff -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib -L/SUBSYSTEM:CONSOLE,5.01" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Release COFF32|Win32" />
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
dmd -map $(OutDir)\$(InputName).map -of$(IntDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Release|Win32" />
Expand All @@ -360,6 +527,13 @@ dmd -g -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputNam
if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
if errorlevel 1 goto reportError
dmd -g -m32mscoff -version=pipeLink -map &quot;$(IntDir)\pipelink.map&quot; &quot;-of$(OutDir)\pipelink.exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib oleaut32.lib ole32.lib -L/SUBSYSTEM:CONSOLE,5.01
if errorlevel 1 goto reportError
dmd -g -m32mscoff -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib oleaut32.lib ole32.lib -L/SUBSYSTEM:CONSOLE,5.01" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Debug COFF32|Win32" />
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
if errorlevel 1 goto reportError
dmd -m32mscoff -version=pipeLink -map &quot;$(IntDir)\pipelink.map&quot; &quot;-of$(OutDir)\pipelink.exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib oleaut32.lib ole32.lib -L/SUBSYSTEM:CONSOLE,5.01
if errorlevel 1 goto reportError
dmd -m32mscoff -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib oleaut32.lib ole32.lib -L/SUBSYSTEM:CONSOLE,5.01" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Release COFF32|Win32" />
Expand Down
2 changes: 1 addition & 1 deletion build/sdk.bat
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ echo "%VSI2D%" --vsi="%VSISDKINC:\=/%" --win="%WINSDKINC:\=/%" --dte="%DTE_IDL_P
if errorlevel 1 exit /B 1

echo Translation successful!
echo Visual Studio now prompts to reload the vsi project, but cannot do so because the build is still running.
echo Visual Studio might now prompt to reload the vsi project, but cannot do so because the build is still running.
echo Please reload the solution manually.
echo Success > "%OUT%"
exit /B 0
4 changes: 3 additions & 1 deletion c2d/idl2d.d
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,9 @@ version(remove_pp) {} else
ins ~= " </Folder>\n";
ins ~= " </Folder>\n";
ins ~= "</DProject>\n";
std.file.write(projfile, txt[0 .. pos + pos2 + 1] ~ ins);
string xml = txt[0 .. pos + pos2 + 1] ~ ins;
if (xml != txt)
std.file.write(projfile, xml);
}

void setCurrentFile(string file)
Expand Down
8 changes: 4 additions & 4 deletions nsis/visuald.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

; define DMD source path to include dmd installation
; !define DMD
!define DMD_VERSION "2.086.0"
!define DMD_SRC c:\l\d\dmd${DMD_VERSION}\dmd2
!define DMD_VERSION "2.086.1"
!define DMD_SRC c:\d\dmd-${DMD_VERSION}

; define LDC to include ldc installation
; !define LDC
!define LDC_VERSION "1.15.0"
!define LDC_SRC c:\l\d\ldc-${LDC_VERSION}
!define LDC_VERSION "1.16.0"
!define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib

; define VS2019 to include VS2019 support
; !define VS2019
Expand Down
Loading