Skip to content

Commit 8781675

Browse files
rainersrainers
authored
Merge pull request #117 from rainers/master
Visual D 0.50.1-beta1
2 parents e74bd92 + f4b1e2a commit 8781675

19 files changed

+1153
-195
lines changed

‎CHANGES‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,3 +1153,14 @@ Version history
11531153
* slightly change identification of break point locations
11541154
* fixed "go to definition" eventually not jumping to correct line after opening document
11551155
* scale dialogs according to current text font size, i.e. adapt to DPI scaling
1156+
1157+
unreleased Version 0.50.1
1158+
* msbuild: fix parallel build in VS 2019 16.1
1159+
* msbuild: fix building right after full installation
1160+
* bugzilla 20003: project properties: show "Better C" in option text
1161+
* bugzilla 20004: add button to reset all global settings to their default
1162+
* bugzilla 20005: try to detect VC through ISetupConfiguration, too
1163+
* mago: improve function call in watch window
1164+
- implement virtual functions, fix calling delegates and function pointers
1165+
- display of delegate type
1166+
- support arbitrary return types

‎Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@
2828
PROGRAMFILESX86 = c:\Program Files (x86)
2929

3030
NSIS = $(PROGRAMFILESX86)\NSIS
31+
!IF !EXIST("$(NSIS)")
32+
NSIS = c:\p\NSIS-3.04
33+
!ENDIF
3134
MSBUILD = msbuild
3235
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
3336
!IF !EXIST($(MSBUILD15))
37+
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild"
38+
!ENDIF
39+
!IF !EXIST($(MSBUILD15))
3440
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\msbuild"
3541
!ENDIF
3642
CONFIG = Release COFF32
@@ -59,7 +65,7 @@ vdserver:
5965
devenv /Project "vdserver" /Build "$(CONFIG)|Win32" visuald_vs10.sln
6066

6167
dparser:
62-
cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5 /p:DefineConstants=NET40 /t:Rebuild
68+
cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5.2 /p:DefineConstants=NET40 /t:Rebuild
6369
editbin /STACK:0x800000 bin\Release\DParserCOMServer\DParserCOMServer.exe
6470

6571
dparser_test:

‎VERSION‎

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

‎build/build.visualdproj‎

Lines changed: 133 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,128 @@ echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
485485
<additionalOptions />
486486
<preBuildCommand />
487487
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
488+
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
489+
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
490+
</Config>
491+
<Config platform="Win32" name="TestDebug">
492+
<obj>0</obj>
493+
<link>0</link>
494+
<lib>1</lib>
495+
<subsystem>0</subsystem>
496+
<multiobj>0</multiobj>
497+
<singleFileCompilation>3</singleFileCompilation>
498+
<oneobj>0</oneobj>
499+
<mscoff>0</mscoff>
500+
<trace>0</trace>
501+
<quiet>0</quiet>
502+
<verbose>0</verbose>
503+
<vtls>0</vtls>
504+
<vgc>0</vgc>
505+
<symdebug>1</symdebug>
506+
<symdebugref>1</symdebugref>
507+
<optimize>0</optimize>
508+
<cpu>0</cpu>
509+
<isX86_64>0</isX86_64>
510+
<isLinux>0</isLinux>
511+
<isOSX>0</isOSX>
512+
<isWindows>0</isWindows>
513+
<isFreeBSD>0</isFreeBSD>
514+
<isSolaris>0</isSolaris>
515+
<scheduler>0</scheduler>
516+
<useDeprecated>0</useDeprecated>
517+
<errDeprecated>0</errDeprecated>
518+
<useAssert>0</useAssert>
519+
<useInvariants>0</useInvariants>
520+
<useIn>0</useIn>
521+
<useOut>0</useOut>
522+
<useArrayBounds>0</useArrayBounds>
523+
<boundscheck>0</boundscheck>
524+
<useSwitchError>0</useSwitchError>
525+
<useUnitTests>0</useUnitTests>
526+
<useInline>0</useInline>
527+
<release>0</release>
528+
<preservePaths>0</preservePaths>
529+
<warnings>0</warnings>
530+
<infowarnings>0</infowarnings>
531+
<checkProperty>0</checkProperty>
532+
<genStackFrame>0</genStackFrame>
533+
<pic>0</pic>
534+
<cov>0</cov>
535+
<nofloat>0</nofloat>
536+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
537+
<allinst>0</allinst>
538+
<stackStomp>0</stackStomp>
539+
<betterC>0</betterC>
540+
<dip25>0</dip25>
541+
<dip1000>0</dip1000>
542+
<dip1008>0</dip1008>
543+
<transition_field>0</transition_field>
544+
<revert_import>0</revert_import>
545+
<preview_dtorfields>0</preview_dtorfields>
546+
<transition_checkimports>0</transition_checkimports>
547+
<transition_complex>0</transition_complex>
548+
<preview_intpromote>0</preview_intpromote>
549+
<preview_fixAliasThis>0</preview_fixAliasThis>
550+
<preview_markdown>0</preview_markdown>
551+
<transition_vmarkdown>0</transition_vmarkdown>
552+
<compiler>0</compiler>
553+
<otherDMD>0</otherDMD>
554+
<cccmd>$(CC) -c</cccmd>
555+
<ccTransOpt>1</ccTransOpt>
556+
<addDepImp>0</addDepImp>
557+
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
558+
<imppath />
559+
<fileImppath />
560+
<outdir>..\bin\$(ConfigurationName)</outdir>
561+
<objdir>$(OutDir)\$(ProjectName)</objdir>
562+
<objname />
563+
<libname />
564+
<doDocComments>0</doDocComments>
565+
<docdir />
566+
<docname />
567+
<modules_ddoc />
568+
<ddocfiles />
569+
<doHdrGeneration>0</doHdrGeneration>
570+
<hdrdir />
571+
<hdrname />
572+
<doXGeneration>1</doXGeneration>
573+
<xfilename>$(IntDir)\$(TargetName).json</xfilename>
574+
<debuglevel>0</debuglevel>
575+
<debugids />
576+
<versionlevel>0</versionlevel>
577+
<versionids />
578+
<dump_source>0</dump_source>
579+
<mapverbosity>0</mapverbosity>
580+
<createImplib>0</createImplib>
581+
<debuglib>0</debuglib>
582+
<defaultlibname />
583+
<debuglibname />
584+
<moduleDepsFile />
585+
<run>0</run>
586+
<runargs />
587+
<runCv2pdb>1</runCv2pdb>
588+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
589+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
590+
<cv2pdbEnumType>0</cv2pdbEnumType>
591+
<cv2pdbOptions />
592+
<enableMixin>0</enableMixin>
593+
<mixinPath>$(IntDir)\$(SafeProjectName).mixin</mixinPath>
594+
<objfiles />
595+
<linkswitches />
596+
<libfiles />
597+
<libpaths />
598+
<deffile />
599+
<resfile />
600+
<exefile>$(IntDir)\$(ProjectName).sdk</exefile>
601+
<pdbfile>$(IntDir)\$(SafeProjectName).pdb</pdbfile>
602+
<impfile>$(IntDir)\$(SafeProjectName).lib</impfile>
603+
<mapfile>$(IntDir)\$(SafeProjectName).map</mapfile>
604+
<useStdLibPath>1</useStdLibPath>
605+
<cRuntime>2</cRuntime>
606+
<privatePhobos>0</privatePhobos>
607+
<additionalOptions />
608+
<preBuildCommand />
609+
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
488610
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
489611
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
490612
</Config>
@@ -523,6 +645,7 @@ dmd -map $(OutDir)\$(InputName).map -of$(IntDir)\$(InputName).exe $(InputPath) .
523645
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
524646
dmd -g -map &quot;$(IntDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; &quot;-od$(IntDir)&quot; $(InputPath) ..\tools\nostacktrace.d oleaut32.lib ole32.lib
525647
&quot;$(VisualDInstallDir)\cv2pdb\cv2pdb.exe&quot; &quot;$(OutDir)\$(InputName).exe&quot;" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Debug|Win32" />
648+
<Config tool="Custom" customcmd="dmd -map $(IntDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d ole32.lib oleaut32.lib" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="TestDebug|Win32" />
526649
<Config tool="Custom" customcmd="echo Compiling $(InputPath)...
527650
if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
528651
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
@@ -547,7 +670,16 @@ call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk.success&qu
547670
<File customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
548671
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
549672
if errorlevel 1 goto reportError
550-
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" path="sdk_libs.bat" tool="Custom" />
673+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" perConfig="true" outfile="$(IntDir)\sdk_libs.success" path="sdk_libs.bat" tool="Custom">
674+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
675+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
676+
if errorlevel 1 goto reportError
677+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Debug COFF32|Win32" />
678+
<Config tool="None" customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
679+
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
680+
if errorlevel 1 goto reportError
681+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(IntDir)\sdk_libs.success&quot;" outfile="$(IntDir)\sdk_libs.success" name="Release COFF32|Win32" />
682+
</File>
551683
<File customcmd="if exist &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot; call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
552684
if exist &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; ( pushd . &amp;&amp; call &quot;$(VCINSTALLDIR)\Auxiliary\Build\vcvars32.bat&quot; &amp;&amp; popd )
553685
if errorlevel 1 goto reportError

0 commit comments

Comments
 (0)