Merge pull request #74 from rainers/master

Version 0.44.2

Author: rainers

CHANGES

@@ -856,3 +856,11 @@ Version history
 2017-03-13 Version 0.44.1
 
   * bugzilla 17252: Fixed bad character inserted into the executable search path default
+
+2017-02-04 Version 0.44.2
+
+  * fixed building private phobos with recent dmd
+  * fixed freeze during semantic analysis
+  * bugzilla 17254: close and reopen completion box if results added
+  * fix link to build log: replace spaces with %20
+  * added VC project integration for VS2017

Makefile

@@ -160,6 +160,10 @@ dbuild14:
 dbuild15:
 	cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
 
+fake_dbuild15:
+	if not exist msbuild\dbuild\obj\release-v15\nul md msbuild\dbuild\obj\release-v15
+	if not exist msbuild\dbuild\obj\release-v15\dbuild.15.0.dll echo dummy >msbuild\dbuild\obj\release-v15\dbuild.15.0.dll
+
 mago:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
 	cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
@@ -183,8 +187,12 @@ install: all cpp2d_exe idl2d_exe
 	cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi
 	"$(ZIP)" -j ..\downloads\visuald_pdb.zip bin\release\visuald.pdb bin\release\vdserver.pdb
 
-install_vs: prerequisites visuald_vs vdserver cv2pdb dparser vdextension mago dcxxfilt \
-	dbuild12 dbuild14 install_only
+install_vs: install_modules dbuild15 install_only
+
+install_vs_fake_dbuild15: install_modules fake_dbuild15 install_only
+
+install_modules: prerequisites visuald_vs vdserver cv2pdb dparser vdextension mago dcxxfilt \
+	dbuild12 dbuild14
 
 install_only:
 	if not exist ..\downloads\nul md ..\downloads

VERSION

@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      44
-#define VERSION_REVISION   1
+#define VERSION_REVISION   2
 #define VERSION_BETA       
 #define VERSION_BUILD      0

appveyor.yml

@@ -17,8 +17,10 @@ environment:
   matrix:
     - os: Visual Studio 2015
       VS: 14
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - os: Visual Studio 2013
       VS: 12
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 #matrix:
 #  allow_failures:
@@ -73,7 +75,8 @@ install:
   - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\ToolsOptionsPages\Projects\Visual D Settings" /v optlinkDeps /t REG_DWORD /d 0 /reg:32 /f
   # Set environment variables
   - set PATH=c:\projects\dm\bin;%PATH%
-  - call "c:\Program Files (x86)\Microsoft Visual Studio %VS%.0\VC\vcvarsall.bat" x86
+  - if not "%VS%" == "15" call "c:\Program Files (x86)\Microsoft Visual Studio %VS%.0\VC\vcvarsall.bat" x86
+  - if     "%VS%" == "15" call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
   # Print environment info
   - set
   - msbuild /version
@@ -113,11 +116,14 @@ build_script:
         7z x binutils-2.25.tar > $null
   - 'if "%VS%"=="12" echo #define snprintf _snprintf >binutils-2.25\config.h'
   - 'if "%VS%"=="14" echo // empty                   >binutils-2.25\config.h'
+  - 'if "%VS%"=="15" echo // empty                   >binutils-2.25\config.h'
   - set BINUTILS=c:\projects\binutils-2.25
   - set DMDINSTALLDIR=c:\projects\dmd2
   # build installer
   - cd visuald
-  - nmake install_vs
+  # debug dbuild15
+  - if     "%VS%"=="15" nmake dbuild15
+  - if not "%VS%"=="15" nmake install_vs_fake_dbuild15
 
 after_build:
   # publish as artifact

doc/StartPage.dd

@@ -54,6 +54,14 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
+2017-04-02 Version 0.44.1,0.44.2
+ $(UL
+  $(LI added VC project integration for VS2017)
+  $(LI fixed building private phobos with recent dmd)
+  $(LI fixed freeze during semantic analysis)
+  $(LI Fixed bad character inserted into the executable search path default)
+ )
+
 2017-03-12 Version 0.44
 $(UL
   $(LI $(VDLINK vcxproject, integration) with msbuild and Visual C/C++ projects)

doc/VersionHistory.dd

@@ -1,5 +1,14 @@
 Ddoc
 
+$(H2 2017-04-02 Version 0.44.2)
+ $(UL
+  $(LI fixed building private phobos with recent dmd)
+  $(LI fixed freeze during semantic analysis)
+  $(LI bugzilla 17254: close and reopen completion box if results added)
+  $(LI fix link to build log: replace spaces with %20)
+  $(LI added VC project integration for VS2017)
+ )
+
 $(H2 2017-03-12 Version 0.44.1)
  $(UL
   $(LI bugzilla 17252: Fixed bad character inserted into the executable search path default)

doc/visuald.ddoc

@@ -1,4 +1,4 @@
-VERSION = 0.44.1
+VERSION = 0.44.2
 ROOT_DIR = http://www.dlang.org/
 ROOT = http://www.dlang.org
 BODYCLASS = visuald

msbuild/dbuild/CompileD.cs

@@ -369,7 +369,7 @@ private void ConstructCommandTLog(ITaskItem[] upToDateSources, DependencyFilter
             if (upToDateSources != null)
             {
                 string cmdLine = GenerateCommandLineCommands(VCToolTask.CommandLineFormat.ForTracking
-#if TOOLS_V14
+#if TOOLS_V14 || TOOLS_V15
                     , EscapeFormat.Default
 #endif
                     );
@@ -389,12 +389,12 @@ private void ConstructCommandTLog(ITaskItem[] upToDateSources, DependencyFilter
         string CommandLine;
 
         protected override string GenerateCommandLineCommands(VCToolTask.CommandLineFormat format
-#if TOOLS_V14
+#if TOOLS_V14 || TOOLS_V15
                                                               , VCToolTask.EscapeFormat escapeFormat
 #endif
         ) {
             string str = base.GenerateResponseFileCommands(format
-#if TOOLS_V14
+#if TOOLS_V14 || TOOLS_V15
                 , escapeFormat
 #endif
                 );

msbuild/dbuild/dbuild.csproj

@@ -169,41 +169,41 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'Release-v15' or '$(Configuration)' == 'Debug-v15' ">
     <Reference Include="Microsoft.Build">
-      <HintPath>$(VS2017Path)MSBuild\15.0\Bin\Microsoft.Build.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\Microsoft.Build.dll</HintPath>
     </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>$(VS2017Path)Common7\IDE\PrivateAssemblies\envdte.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PrivateAssemblies\envdte.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.CPPTasks.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Build.CPPTasks.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(VS2017Path)Common7\IDE\VC\VCTargets\Microsoft.Build.CPPTasks.Common.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\Microsoft.Build.CPPTasks.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build.Framework">
-      <HintPath>$(VS2017Path)MSBuild\15.0\Bin\Microsoft.Build.Framework.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\Microsoft.Build.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(VS2017Path)MSBuild\15.0\Bin\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\Microsoft.Build.Tasks.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build.Utilities.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(VS2017Path)MSBuild\15.0\Bin\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\Microsoft.Build.Utilities.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.VisualStudio.Project.VisualC.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(VS2017Path)Common7\IDE\CommonExtensions\Microsoft\VC\Project\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\VC\Project\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.VCProject, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="Microsoft.VisualStudio.VCProject, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>$(VS2017Path)Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>$(VS2017Path)Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <HintPath>c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

msbuild/dcompile.targets

@@ -172,18 +172,22 @@
 
   <Target Name="DCompilePatchLinkInput" Condition="'@(DCompile)' != ''">
 
+    <!--<Message Text="DCompilePatchLinkInput: PlatformToolsetVersion = $(PlatformToolsetVersion)" Importance="high" /> -->
+      
     <ItemGroup Condition="'$(DCompiler)' == 'DMD'">
       <Link>
         <AdditionalLibraryDirectories Condition="'$(Platform)' == 'Win32'">$(DMDInstallDir)\windows\lib32mscoff;%(Link.AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         <AdditionalLibraryDirectories Condition="'$(Platform)' == 'x64'">$(DMDInstallDir)\windows\lib64;%(Link.AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         <AdditionalDependencies Condition="'$(PlatformToolsetVersion)' == '140'">legacy_stdio_definitions.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
+        <AdditionalDependencies Condition="'$(PlatformToolsetVersion)' == '141'">legacy_stdio_definitions.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
       </Link>
     </ItemGroup>
     <ItemGroup Condition="'$(DCompiler)' == 'LDC'">
       <Link>
         <AdditionalLibraryDirectories Condition="'$(Platform)' == 'Win32'">$(LDCInstallDir)\lib32;%(Link.AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         <AdditionalLibraryDirectories Condition="'$(Platform)' == 'x64'">$(LDCInstallDir)\lib;%(Link.AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         <AdditionalDependencies Condition="'$(PlatformToolsetVersion)' == '140'">legacy_stdio_definitions.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
+        <AdditionalDependencies Condition="'$(PlatformToolsetVersion)' == '141'">legacy_stdio_definitions.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
       </Link>
     </ItemGroup>