Merge pull request #44 from rainers/master

Visual D 0.3.42 beta1

Author: rainers

CHANGES

@@ -698,7 +698,7 @@ Version history
   * object browser/symbol search: now filters out __unittest and __invariant symbols
   * cv2pdb: updated to 0.33 with better DWARF location support
 
-unreleased Version 0.3.41
+2015-05-16 Version 0.3.41
 
   * mago:
     - module list now shows x64 addresses correctly
@@ -727,3 +727,12 @@ unreleased Version 0.3.41
   * new command "Compile and Disassemble" to show the disassembly of the current file in
     the code context window that is automatically synchronized with editor movements
 
+unreleased Version 0.3.42
+
+  * added new command "DustMite Build Failure" to reduce source of startup project
+    for build error with DustMite
+  * update "Build Phobos Browse Info" and "Build local version of phobos" for dmd 2.067+
+  * cv2pdb: 
+    - last version introduced crashes with DWARF conversions
+    - DWARF debug info now stripped from executable
+    - support for mspdb140.dll from VS2015

VERSION

@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      3
-#define VERSION_REVISION   41
-#define VERSION_BETA       
-#define VERSION_BUILD      0
+#define VERSION_REVISION   42
+#define VERSION_BETA       -beta
+#define VERSION_BUILD      1

doc/DustMite.dd

@@ -0,0 +1,39 @@
+Ddoc
+
+$(P Every now and then, you might run into a build problem that might look like a compiler issue.
+Your first step should be to search D's bug tracking system at $(LINK https://issues.dlang.org/).
+If that doesn't help you, you should consider filing a bug report yourself. This should 
+include a reduced test case, so the people working on improving the compiler don't have
+to work through all your source code (if you can release it to the public to begin with).
+)
+
+$(P Starting with dmd 2.065, the DMD installation comes with a tool called DustMite that can help you
+minimize your source code to create the reduced test case. Setting up the environment to run
+DustMite can be tedious, so Visual D can help you for some use cases.
+)
+
+$(P If your build has failed with an unexpected error message or even internal compiler error, you
+can select the relevant error messsage in the Visual Studio build output window or focus the respective
+issue in the error list. Then select "DustMite Build Failure" from the Visual D menu. This will create
+a clean copy of the startup project alongside the project folder (so make sure that all files necessary
+for the build are actually referenced in the project). In addition the generated build script is added.
+)
+
+$(P DustMite will be run against this folder in a new console window, trying to find a minimal source code that still
+reproduces the error message. For larger code bases this process can take several hours. On success
+it will report the directory with the reduced source code.)
+
+$(H3 Limitations)
+
+$(UL
+ $(LI The DustMite integration does not work with single file compilation as well as compilation of non D files.)
+ $(LI A crashing compiler might cause messages to popup that have to be closed manually. See
+      $(LINK https://github.com/CyberShadow/DustMite/wiki/Useful-test-scripts) for some
+      ideas how to deal with this.)
+)
+
+You can read more about DustMite at $(LINK https://github.com/CyberShadow/DustMite/wiki).
+
+Macros:
+	TITLE=Reducing Build Failures with DustMite
+

doc/build_doc.bat

@@ -23,6 +23,7 @@ set SRC=%SRC% Features.dd
 set SRC=%SRC% VersionHistory.dd
 set SRC=%SRC% News36.dd
 set SRC=%SRC% CompileCommands.dd
+set SRC=%SRC% DustMite.dd
 
 set DDOC=macros.ddoc html.ddoc visuald.ddoc dlang.org.ddoc
 

doc/visuald.ddoc

@@ -1,4 +1,4 @@
-VERSION = 0.3.40
+VERSION = 0.3.41
 ROOT_DIR = http://www.dlang.org/
 ROOT = .
 BODYCLASS = doc

nsis/visuald.nsi

@@ -74,7 +74,7 @@
   !define VS2010_REGISTRY_KEY     SOFTWARE\Microsoft\VisualStudio\10.0
   !define VS2012_REGISTRY_KEY     SOFTWARE\Microsoft\VisualStudio\11.0
   !define VS2013_REGISTRY_KEY     SOFTWARE\Microsoft\VisualStudio\12.0
-  !define VS2014_REGISTRY_KEY     SOFTWARE\Microsoft\VisualStudio\14.0
+  !define VS2015_REGISTRY_KEY     SOFTWARE\Microsoft\VisualStudio\14.0
 !ifdef EXPRESS
   !define VCEXP2008_REGISTRY_KEY  SOFTWARE\Microsoft\VCExpress\9.0
   !define VCEXP2010_REGISTRY_KEY  SOFTWARE\Microsoft\VCExpress\10.0
@@ -348,14 +348,14 @@ ${MementoSection} "Register with VS 2013" SecVS2013
 ${MementoSectionEnd}
 
 ;--------------------------------
-${MementoSection} "Register with VS 14" SecVS2014
+${MementoSection} "Register with VS 2015" SecVS2015
 
-  ;ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLRegister ${VS2014_REGISTRY_KEY}'
-  WriteRegStr ${VS_REGISTRY_ROOT} "${VS2014_REGISTRY_KEY}${VDSETTINGS_KEY}" "DMDInstallDir" $DMDInstallDir
-  ${RegisterWin32Exception} ${VS2014_REGISTRY_KEY} "Win32 Exceptions\D Exception"
+  ;ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLRegister ${VS2015_REGISTRY_KEY}'
+  WriteRegStr ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}${VDSETTINGS_KEY}" "DMDInstallDir" $DMDInstallDir
+  ${RegisterWin32Exception} ${VS2015_REGISTRY_KEY} "Win32 Exceptions\D Exception"
 
-  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2014_REGISTRY_KEY}" InstallDir
-  ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" WritePackageDef ${VS2014_REGISTRY_KEY} $1${EXTENSION_DIR}\visuald.pkgdef'
+  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir
+  ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" WritePackageDef ${VS2015_REGISTRY_KEY} $1${EXTENSION_DIR}\visuald.pkgdef'
 
   ${SetOutPath} "$1${EXTENSION_DIR}"
   ${File} ..\nsis\Extensions\ extension.vsixmanifest
@@ -433,8 +433,8 @@ ${MementoSection} "cv2pdb" SecCv2pdb
   Push ${VS2013_REGISTRY_KEY}
   Call PatchAutoExp
 
-  Push ${SecVS2014}
-  Push ${VS2014_REGISTRY_KEY}
+  Push ${SecVS2015}
+  Push ${VS2015_REGISTRY_KEY}
   Call PatchAutoExp
 
 ${MementoSectionEnd}
@@ -481,8 +481,8 @@ ${MementoSection} "mago" SecMago
   Push ${VS2013_REGISTRY_KEY}
   Call RegisterMago
 
-  Push ${SecVS2014}
-  Push ${VS2014_REGISTRY_KEY}
+  Push ${SecVS2015}
+  Push ${VS2015_REGISTRY_KEY}
   Call RegisterMago
 
   WriteRegStr HKLM "SOFTWARE\Wow6432Node\MagoDebugger" "Remote_x64" "$INSTDIR\Mago\MagoRemote.exe"
@@ -523,7 +523,7 @@ SectionEnd
   LangString DESC_SecVS2010 ${LANG_ENGLISH} "Register for usage in Visual Studio 2010."
   LangString DESC_SecVS2012 ${LANG_ENGLISH} "Register for usage in Visual Studio 2012."
   LangString DESC_SecVS2013 ${LANG_ENGLISH} "Register for usage in Visual Studio 2013."
-  LangString DESC_SecVS2014 ${LANG_ENGLISH} "Register for usage in Visual Studio 14."
+  LangString DESC_SecVS2015 ${LANG_ENGLISH} "Register for usage in Visual Studio 2015."
 !ifdef EXPRESS
   LangString DESC_SecVCExpress2008 ${LANG_ENGLISH} "Register for usage in Visual C++ Express 2008 (experimental and unusable)."
   LangString DESC_SecVCExpress2010 ${LANG_ENGLISH} "Register for usage in Visual C++ Express 2010 (experimental and unusable)."
@@ -552,7 +552,7 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2010} $(DESC_SecVS2010)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2012} $(DESC_SecVS2012)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2013} $(DESC_SecVS2013)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2014} $(DESC_SecVS2014)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2015} $(DESC_SecVS2015)
 !ifdef EXPRESS
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVCExpress2008} $(DESC_SecVCExpress2008)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVCExpress2008} $(DESC_SecVCExpress2010)
@@ -582,18 +582,18 @@ Section "Uninstall"
   ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VS2010_REGISTRY_KEY}'
   ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VS2012_REGISTRY_KEY}'
   ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VS2013_REGISTRY_KEY}'
-  ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VS2014_REGISTRY_KEY}'
+  ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VS2015_REGISTRY_KEY}'
 !ifdef EXPRESS
   ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VCEXP2008_REGISTRY_KEY}'
   ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" RunDLLUnregister ${VCEXP2010_REGISTRY_KEY}'
 !endif
 
-  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2014_REGISTRY_KEY}" InstallDir
-  IfErrors NoVS2014pkgdef
+  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir
+  IfErrors NoVS2015pkgdef
     RMDir /r '$1${EXTENSION_DIR}'
     RMDir '$1${EXTENSION_DIR_ROOT}\${APPNAME}'
     RMDir '$1${EXTENSION_DIR_ROOT}'
-  NoVS2014pkgdef:
+  NoVS2015pkgdef:
 
   ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2013_REGISTRY_KEY}" InstallDir
   IfErrors NoVS2013pkgdef
@@ -637,7 +637,7 @@ Section "Uninstall"
   Push ${VS2013_REGISTRY_KEY}
   Call un.PatchAutoExp
 
-  Push ${VS2014_REGISTRY_KEY}
+  Push ${VS2015_REGISTRY_KEY}
   Call un.PatchAutoExp
 !endif
 
@@ -649,7 +649,7 @@ Section "Uninstall"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2010_REGISTRY_KEY}\${WIN32_EXCEPTION_KEY}\Win32 Exceptions\D Exception"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2012_REGISTRY_KEY}\${WIN32_EXCEPTION_KEY}\Win32 Exceptions\D Exception"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2013_REGISTRY_KEY}\${WIN32_EXCEPTION_KEY}\Win32 Exceptions\D Exception"
-  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2014_REGISTRY_KEY}\${WIN32_EXCEPTION_KEY}\Win32 Exceptions\D Exception"
+  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2015_REGISTRY_KEY}\${WIN32_EXCEPTION_KEY}\Win32 Exceptions\D Exception"
 
 !ifdef MAGO
   ExecWait 'regsvr32 /u /s "$INSTDIR\Mago\MagoNatDE.dll"'
@@ -662,7 +662,7 @@ Section "Uninstall"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2010_REGISTRY_KEY}\${MAGO_ENGINE_KEY}"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2012_REGISTRY_KEY}\${MAGO_ENGINE_KEY}"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2013_REGISTRY_KEY}\${MAGO_ENGINE_KEY}"
-  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2014_REGISTRY_KEY}\${MAGO_ENGINE_KEY}"
+  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2015_REGISTRY_KEY}\${MAGO_ENGINE_KEY}"
 
 !ifdef VS_NET
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS_NET_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
@@ -672,7 +672,7 @@ Section "Uninstall"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2010_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2012_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2013_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
-  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2014_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
+  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2015_REGISTRY_KEY}\${MAGO_EXCEPTION_KEY}"
 
 !ifdef VS_NET
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS_NET_REGISTRY_KEY}\InstalledProducts\Mago"
@@ -682,7 +682,7 @@ Section "Uninstall"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2010_REGISTRY_KEY}\InstalledProducts\Mago"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2012_REGISTRY_KEY}\InstalledProducts\Mago"
   DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2013_REGISTRY_KEY}\InstalledProducts\Mago"
-  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2014_REGISTRY_KEY}\InstalledProducts\Mago"
+  DeleteRegKey ${VS_REGISTRY_ROOT}   "${VS2015_REGISTRY_KEY}\InstalledProducts\Mago"
 !endif
 
   Call un.RegisterVDServer
@@ -758,12 +758,12 @@ Function .onInit
     SectionSetFlags ${SecVS2013} ${SF_RO}
   Installed_VS2013:
 
-  ; detect VS2014
+  ; detect VS2015
   ClearErrors
-  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2014_REGISTRY_KEY}" InstallDir
-  IfErrors 0 Installed_VS2014
-    SectionSetFlags ${SecVS2014} ${SF_RO}
-  Installed_VS2014:
+  ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir
+  IfErrors 0 Installed_VS2015
+    SectionSetFlags ${SecVS2015} ${SF_RO}
+  Installed_VS2015:
 
 !ifdef EXPRESS
   ; detect VCExpress 2008

stdext/path.d

@@ -224,3 +224,31 @@ unittest
 	res = makeRelative(file, path);
 	assert(res == file);
 }
+
+string commonParentDir(string path1, string path2)
+{
+	if (path1.length == 0 || path2.length == 0)
+		return null;
+	string p1 = toLower(normalizeDir(path1));
+	string p2 = toLower(normalizeDir(path2));
+
+	while(p2.length)
+	{
+		if (p1.startsWith(p2))
+			return path1[0 .. p2.length]; // preserve case
+		string q2 = dirName(p2);
+		q2 = normalizeDir(q2);
+		if(q2 == p2)
+			return null;
+		p2 = q2;
+	}
+	return null;
+}
+
+unittest
+{
+	string path1 = "c:\\A\\bc\\def\\ghi.d";
+	string path2 = "c:\\a/bc\\x";
+	string res = commonParentDir(path1, path2);
+	assert(res == "c:\\A\\bc\\");
+}