Merge pull request #101 from rainers/master

Changes for Visual D 0.48.0-beta1

Author: rainers

.gitignore

@@ -12,3 +12,4 @@ vdextensions/obj
 /msbuild/dbuild/obj
 /msbuild/dbuild/bin
 /msbuild/dbuild/.vs
+/test

CHANGES

@@ -842,17 +842,17 @@ Version history
   * language service
     - dparser: semantic analysis no longer times out after 500ms, but cancels previous requests
     - dparser: improved performance by adding name lookup cache
-    - Improvements to completion lists:
+    - Improvements to completion lists:
       - completion box no longer pops up if caret has been moved elsewhere
-      - new option to disable exact start match (searches case insensitive sub string)
-      - free functions show different icon than member functions
-      - aliases show other icon than variables
-      - new sorting modes "by type" using classification by the semantic engine,
-        "by declaration", effectively using scopes as discovered by the semantic engine
-      - without any match, still keep the completion box open with recent items
-      - less flashing when updating the results
-      - code snippets now added to possible expansions
-
+      - new option to disable exact start match (searches case insensitive sub string)
+      - free functions show different icon than member functions
+      - aliases show other icon than variables
+      - new sorting modes "by type" using classification by the semantic engine,
+        "by declaration", effectively using scopes as discovered by the semantic engine
+      - without any match, still keep the completion box open with recent items
+      - less flashing when updating the results
+      - code snippets now added to possible expansions
+
 2017-03-13 Version 0.44.1
 
   * bugzilla 17252: Fixed bad character inserted into the executable search path default
@@ -985,3 +985,49 @@ Version history
     - can now show the dynamic type of an interface
   * miscellaneous
     - Issue 18622: removed outdated information regarding link definition when generated by Visual D DLL project.
+
+unreleased Version 0.48.0
+
+  * installation
+    - fixed uninstallation for VS2017
+    - installation for VS2013+ now uses PackageManifest format instead of Vsix
+    - VS2017: loading the Visual D package could crash with some VS installation "ids""
+    - avoid initial error message regarding altered assemblies with same version
+    - fix installation of the D icon for the solution explorer in VS2017
+    - installer hides options for VS2005-VS2012 if not installed
+  * new project wizard
+    - restore project templates for VS2008, new project wizard doesn't work there'
+    - mixed D/C++ VC project: optionally adding main in C++, setup precompiled headers
+    - new VCProject: now uses $(LatestTargetPlatformVersion) as WindowsTargetPlatformVersion to
+      avoid defaulting to Windows SDK 8.1
+  * settings
+    - fix default library path if UCRT has different version than SDK
+    - VS2017: D compiler installation paths and "demangle link errors" are now saved 
+	  to "HKCR\Softwre\Visual D" to be picked up by msbuild
+    - show detected compiler version below installation path
+	- removed option "parse source for syntax errors", now always on
+	- removed option "expansions from text buffer", now always off
+	- removed option "use semantic analysis for goto definition", now always on
+	- removed option "override linker settings from sc.ini", always on as linker no 
+	  longer set in sc.ini since dmd 2.079
+	- removed option "additional linker options", it was invisible anyway
+	- rearrange settings to better show their scope
+  * dparser
+    - semantic analysis did not work if "parse source for syntax errors" was disabled
+    - no semantic info for a package if any file in the package has fatal parser error
+    - now has semantic support for static foreach (thanks to Alexander Bothe)
+    - fixed "Find references"
+  * mago
+    - added option to show base class fields as direct fields
+    - allow suffix 'h' for hex numbers for better interoperablility with VS disassembly
+    - concord: can now show return values of functions stepped over (not slices or delegates 
+      on x64 or small non-POD-structs)
+    - concord: fix crash when showing children in data tooltip (mostly occured in VS2017)
+    - concord: allow dragging addresses to the disassembly window
+    - engine: Fix the way the debugger steps over instructions with REP prefix.
+  * cv2pdb
+    - can now detect VS2017 via Setup-COM-API
+	- some DWARF fixes
+  * when pasting code to D source file newlines are adapted to surrounding code
+  * fixed "Compile and Run" on selection
+  * fix help via F1 for dmd 2.072+

Makefile

@@ -25,7 +25,8 @@
 # paths on your system or pass on the command line to nmake
 
 NSIS    = $(PROGRAMFILES)\NSIS
-MSBUILD = c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe 
+MSBUILD = msbuild
+MSBUILD15 = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild" 
 CONFIG  = Release COFF32
 
 ##############################################################
@@ -48,7 +49,14 @@ vdserver:
 	devenv /Project "vdserver"  /Build "$(CONFIG)|Win32" visuald_vs10.sln
 
 dparser:
-	cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
+	cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5 /p:DefineConstants=NET40 /t:Rebuild
+
+fake_dparser:
+	if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer
+	if exist "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" copy "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" bin\Release\DParserCOMServer
+	if exist "$(PROGRAMFILES)\VisualD\dparser\dparser\D_Parser.dll" copy "$(PROGRAMFILES)\VisualD\dparser\dparser\D_Parser.dll" bin\Release\DParserCOMServer
+	if not exist bin\Release\DParserCOMServer\DParserCOMServer.exe echo dummy >bin\Release\DParserCOMServer\DParserCOMServer.exe
+	if not exist bin\Release\DParserCOMServer\D_Parser.dll echo dummy >bin\Release\DParserCOMServer\D_Parser.dll
 
 vdextension:
 	cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=x86 /t:Rebuild
@@ -60,10 +68,20 @@ dbuild12:
 	cd msbuild\dbuild && devenv /Build "Release|AnyCPU" /Project "dbuild" dbuild.sln
 #	cd msbuild\dbuild && $(MSBUILD) dbuild.sln /p:Configuration=Release;Platform="Any CPU" /t:Rebuild
 
+fake_dbuild12:
+	if not exist msbuild\dbuild\obj\release\nul md msbuild\dbuild\obj\release
+	if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.12.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.12.0.dll" msbuild\dbuild\obj\release
+	if not exist msbuild\dbuild\obj\release\dbuild.12.0.dll echo dummy >msbuild\dbuild\obj\release\dbuild.12.0.dll
+
 dbuild14:
 	cd msbuild\dbuild && devenv /Build "Release-v14|AnyCPU" /Project "dbuild" dbuild.sln
 #	cd msbuild\dbuild && $(MSBUILD) dbuild.sln /p:Configuration=Release;Platform="Any CPU" /t:Rebuild
 
+fake_dbuild14:
+	if not exist msbuild\dbuild\obj\release-v14\nul md msbuild\dbuild\obj\release-v14
+	if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.14.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.14.0.dll" msbuild\dbuild\obj\release-v14
+	if not exist msbuild\dbuild\obj\release-v14\dbuild.14.0.dll echo dummy >msbuild\dbuild\obj\release-v14\dbuild.14.0.dll
+
 dbuild15:
 	cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
 
@@ -77,11 +95,21 @@ mago:
 	cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
 	cd ..\..\mago && devenv /Build "Release StaticDE|Win32" /Project "MagoNatCC" magodbg_2010.sln
 
+mago_vs15:
+	cd ..\..\mago && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v140            /target:DebugEngine\MagoNatDE MagoDbg_2010.sln
+	cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v140              /target:DebugEngine\MagoRemote MagoDbg_2010.sln
+	cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v140" /target:Expression\MagoNatCC MagoDbg_2010.sln
+
 cv2pdb:
 	cd ..\..\cv2pdb\trunk && devenv /Project "cv2pdb"      /Build "Release|Win32" src\cv2pdb_vs12.sln
 	cd ..\..\cv2pdb\trunk && devenv /Project "dviewhelper" /Build "Release|Win32" src\cv2pdb_vs12.sln
 	cd ..\..\cv2pdb\trunk && devenv /Project "dumplines"   /Build "Release|Win32" src\cv2pdb_vs12.sln
 
+cv2pdb_vs15:
+	cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\cv2pdb.vcxproj
+	cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dviewhelper\dviewhelper.vcxproj
+	cd ..\..\cv2pdb\trunk && msbuild /p:Configuration=Release;Platform=Win32;PlatformToolset=v141 src\dumplines.vcxproj
+
 dcxxfilt: $(DCXXFILT_EXE)
 $(DCXXFILT_EXE): tools\dcxxfilt.d
 # no space after Release, it will be part of environment variable
@@ -90,12 +118,13 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
 ##################################
 # create installer
 
-install_vs: install_modules dbuild15 install_only
+install_vs: install_modules dparser cv2pdb mago dbuild12 dbuild14 dbuild15 install_only
+
+install_vs_no_vs2017:   install_modules fake_dparser cv2pdb mago dbuild12 dbuild14 fake_dbuild15 install_only
 
-install_vs_fake_dbuild15: install_modules fake_dbuild15 install_only
+install_vs_only_vs2017: install_modules dparser cv2pdb_vs15 mago_vs15 fake_dbuild12 fake_dbuild14 dbuild15 install_only
 
-install_modules: prerequisites visuald_vs vdserver cv2pdb dparser vdextension visualdwizard mago dcxxfilt \
-	dbuild12 dbuild14
+install_modules: prerequisites visuald_vs vdserver vdextension visualdwizard dcxxfilt
 
 install_only:
 	if not exist ..\downloads\nul md ..\downloads

VERSION

@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
-#define VERSION_MINOR      47
+#define VERSION_MINOR      48
 #define VERSION_REVISION   0
-#define VERSION_BETA       
-#define VERSION_BUILD      0
+#define VERSION_BETA       -beta
+#define VERSION_BUILD      1

appveyor.yml

@@ -15,6 +15,9 @@ skip_tags: true
 
 environment:
   matrix:
+    - os: Visual Studio 2017
+      VS: 15
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - os: Visual Studio 2015
       VS: 14
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
@@ -26,7 +29,8 @@ environment:
 cache:
   - C:\projects\cache\dmd2080_0.7z
   - C:\projects\cache\cd851.zip
-  - C:\projects\cache\VisualD-v0.45.1-rc2.exe
+  - C:\projects\cache\VisualD-v0.47.0.exe
+  - C:\projects\cache\binutils-2.25.tar.gz
 
 #matrix:
 #  allow_failures:
@@ -73,13 +77,12 @@ install:
         copy c:\projects\dm\bin\coffimplib.exe c:\projects\dmd2\windows\bin
   # Download & install Visual D
   - ps: |
-        If (-not (Test-Path 'cache\VisualD-v0.45.1-rc2.exe')) {
-            Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v0.45.1-rc2/VisualD-v0.45.1-rc2.exe' -FileName 'cache\VisualD-v0.45.1-rc2.exe'
+        If (-not (Test-Path 'cache\VisualD-v0.47.0.exe')) {
+            Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v0.47.0/VisualD-v0.47.0.exe' -FileName 'cache\VisualD-v0.47.0.exe'
         }
-  - cache\VisualD-v0.45.1-rc2.exe /S
+  - cache\VisualD-v0.47.0.exe /S
   # configure DMD path
-  - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\12.0\ToolsOptionsPages\Projects\Visual D Settings" /v DMDInstallDir /t REG_SZ /d c:\projects\dmd2 /reg:32 /f
-  - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\ToolsOptionsPages\Projects\Visual D Settings" /v DMDInstallDir /t REG_SZ /d c:\projects\dmd2 /reg:32 /f
+  - reg add "HKLM\SOFTWARE\DMD" /v InstallationFolder /t REG_SZ /d c:\projects /reg:32 /f
   # disable link dependencies monitoring, fails on AppVeyor server
   - 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
@@ -111,17 +114,17 @@ build_script:
   # Clone mago/cv2pdb (need to be two levels up)
   - cd ..
   - git clone https://github.com/rainers/mago.git mago
-  - set VS_SDK_PATH=%VSSDK120Install%
-  - copy mago\PropSheets\Template_MagoDbg_properties.props mago\PropSheets\MagoDbg_properties.props
   - md cv2pdb
   - cd cv2pdb
   - git clone https://github.com/rainers/cv2pdb.git trunk
   - cd ..
   # Download & extract binutils
   - cd projects
   - ps: |
-        Start-FileDownload 'http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.gz' -FileName 'binutils-2.25.tar.gz'
-        7z x binutils-2.25.tar.gz > $null
+        If (-not (Test-Path 'cache\binutils-2.25.tar.gz')) {
+            Start-FileDownload 'http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.gz' -FileName 'cache\binutils-2.25.tar.gz'
+        }
+        7z x cache\binutils-2.25.tar.gz > $null
         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'
@@ -131,11 +134,8 @@ build_script:
   # build installer
   - cd visuald
   # can build dbuild15 only with VS2017
-  - if     "%VS%"=="15" nmake install_vs
-  - if not "%VS%"=="15" nmake install_vs_fake_dbuild15
-  # build mago-mi.exe for others to download as artifact
-  - cd c:\mago
-  - devenv /Build "Release StaticDE|Win32" /Project "mago-mi" magodbg_2010.sln
+  - if     "%VS%"=="15" nmake install_vs_only_vs2017
+  - if not "%VS%"=="15" nmake install_vs_no_vs2017
 
 after_build:
   # publish as artifact
@@ -144,13 +144,10 @@ after_build:
   - for %%I in (downloads\*.exe) do (set BUILD_EXE=%%I && set ARTIFACT=%%~dpnI-%APPVEYOR_BUILD_NUMBER%-vs%VS%.exe)
   - copy %BUILD_EXE% %ARTIFACT%
   - ps: |
-        If ($Env:VS -eq '12') {
-            echo 'Creating artifacts...'
-            Push-AppveyorArtifact $Env:ARTIFACT
-            Push-AppveyorArtifact ..\cv2pdb\trunk\bin\Release\cv2pdb.exe
-            Push-AppveyorArtifact logs_and_symbols.7z
-            Push-AppveyorArtifact ..\mago\bin\Win32\Release\mago-mi.exe
-        }
+        echo 'Creating artifacts...'
+        Push-AppveyorArtifact $Env:ARTIFACT
+        Push-AppveyorArtifact ..\cv2pdb\trunk\bin\Release\cv2pdb.exe
+        Push-AppveyorArtifact logs_and_symbols.7z
 
 on_failure:
   - cd c:\projects

c2d/idl2d.d

@@ -156,6 +156,7 @@ class idl2d
 				"vsdebugguids.h", "VSRegKeyNames.h", "SCGuids.h", "wbids.h", "sharedids.h",
 				"vseeguids.h", "version.h", "scc.h",
 				"vsplatformuiuuids.*", // only in VS2010 SDK
+				"vscookie.*", // only in later VS2017 SDK
 			// no longer in SDK2010: "DSLToolsCmdID.h",
 			 ];
 
@@ -1332,7 +1333,7 @@ version(all)
 		// IP_DEST_PORT_UNREACHABLE defined twice
 		if(currentModule == "ipexport")
 		{
-			replaceTokenSequence(tokens, "#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)\n"
+			replaceTokenSequence(tokens, "#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)\n" ~
 				"#define IP_HOP_LIMIT_EXCEEDED       (IP_STATUS_BASE + 13)\n",
 				"#define IP_HOP_LIMIT_EXCEEDED       (IP_STATUS_BASE + 13)\n", false);
 		}

doc/BuildFromSource.dd

@@ -92,16 +92,25 @@ $(UL
    )
   )
  )
- $(LI VS2010-VS2017: The mechanism has changed with VS2010, as the non-standard registry settings are rebuilt
+ $(LI VS2010-VS2015: The mechanism has changed with VS2010, as the non-standard registry settings are rebuilt
    on every start of Visual Studio.
   $(UL
-   $(LI Copy the files from `$(DOLLAR)(VSINSTALLDIR)\Common\IDE\Extensions\Rainer Schuetze\visuald\VisualD` into the folder
+   $(LI Copy the files from `$(DOLLAR)(VSINSTALLDIR)\Common7\IDE\Extensions\Rainer Schuetze\visuald\VisualD` into the folder
      `$(DOLLAR)(APPDATA)\Local\Microsoft\VisualStudio\12.0D\Extensions\VisualD` (replace 12.0D with 14.0D for VS2015, 15.0_`<id>`D
-	 for VS2017 with `<id>` some identifier generated during VS installation))
+     for VS2017 with `<id>` some identifier generated during VS installation))
    $(LI in visuald.pkgdef, replace the path "C:\\Program Files (x86)\\Visual D\\visuald.dll" with your debug build output path.)
+   $(LI Modify a line in `$(DOLLAR)(VSINSTALLDIR)\Common7\IDE\devenv.pkgdef:
+     $(PRE -"PkgDefSearchPath" = "$ApplicationExtensionsFolder$;$RootFolder$\Common7\IDE\CommonExtensions;$RootFolder$\Common7\IDE\devenv.admin.pkgdef;")
+     $(PRE +"PkgDefSearchPath" = "$ApplicationExtensionsFolder$;$RootFolder$\Common7\IDE\CommonExtensions;$AppDataLocalFolder$\Extensions;$RootFolder$\Common7\IDE\devenv.admin.pkgdef;")
+    )
+   $(LI in the registry, delete hives
+    $(UL
+     $(LI `HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\14.0D`)
+     $(LI `HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\14.0D_Config`)
+   ))
    $(LI Start the IDE with the new settings branch via)
     $(PRE devenv /RootSuffix D)
-   $(LI Visual D will now be shown in the Extension Manager where it has to be enabled.)
+   $(LI Visual D will now be shown in the Extension Manager where it might have to be enabled.)
   )
  )
 )

doc/Editor.dd

@@ -20,8 +20,8 @@ $(UL
  )
 )
 
-$(P The colorizer can be configured in the "Colorizer" setup page of the language settings in
-Tools->Options->Text Editor->D->Colorizer: )
+$(P The colorizer can be configured in the "Editor" setup page of the language settings in
+Tools->Options->Text Editor->D->Editor: )
 
  $(IMG_CENTER images/editor-options.png)
 

msbuild/dbuild/CompileD.cs

@@ -798,22 +798,16 @@ private void SetStringArray(string name,
 
         private ToolSwitchType GetToolSwitchTypeForStringPathArray()
         {
-#if TOOLS_V12
+            // dynamically decide whether ToolSwitchType.StringPathArray exists
+            // (not declared in Microsoft.Build.CPPTasks.Common, Version=12.0.0.0, but still seems to work)
+            var type = typeof(ToolSwitchType);
+            var enums = type.GetEnumNames();
+            if (enums.Length >= 10)
+                return (ToolSwitchType)9; // ToolSwitchType.StringPathArray;
             return ToolSwitchType.StringArray;
-#else
-            return ToolSwitchType.StringPathArray;
-#endif
         }
 
-#if TOOLS_V14 || TOOLS_V15
-        public 
-#else
-        protected
-#endif
-        override string SourcesPropertyName
-        {
-            get { return "Sources"; }
-        }
+        // use the default implementation of SourcesPropertyName, it returns "Sources"
 
         protected override ITaskItem[] TrackedInputFiles
         {
@@ -895,11 +889,11 @@ protected static ushort GetPEArchitecture(string pFilePath)
                 {
                     using (System.IO.BinaryReader bReader = new System.IO.BinaryReader(fStream))
                     {
-                        if (bReader.ReadUInt16() == 23117) //check the MZ signature
+                        if (bReader.ReadUInt16() == 0x5A4D) //check the MZ signature
                         {
                             fStream.Seek(0x3A, System.IO.SeekOrigin.Current); //seek to e_lfanew.
                             fStream.Seek(bReader.ReadUInt32(), System.IO.SeekOrigin.Begin); //seek to the start of the NT header.
-                            if (bReader.ReadUInt32() == 17744) //check the PE\0\0 signature.
+                            if (bReader.ReadUInt32() == 0x4550) //check the PE\0\0 signature.
                             {
                                 fStream.Seek(20, System.IO.SeekOrigin.Current); //seek past the file header,
                                 architecture = bReader.ReadUInt16(); //read the magic number of the optional header.

msbuild/dbuild/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]