Merge pull request #134 from rainers/master

updates for Visual D 1.2.0-rc1
dlang · Nov 29, 2021 · 9c90ff0 · 9c90ff0
2 parents b1eb4f3 + 858e97d
commit 9c90ff0
Show file tree

Hide file tree

Showing 58 changed files with 3,180 additions and 880 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1305,3 +1305,16 @@ Version history
   * installer:
     - full installer now bundled with DMD 2.096.1 and LDC 1.25.1
 
+2021-06-xx version 1.2.0
+  * dmdserver:
+    - updated to frontend of DMD 2.098.0
+    - bugzilla 21710: Code Completion doesn't work if compiler path contains a white space
+    - restrict "errors in imported modules" to a couple of lines
+    - added option to restart the semantic analysis of a memory usage goes above a given threshold
+  * project management
+    - bugzilla 21897: Semicolon inside quotes in path variable causes range violation in pipedmd
+  * editor
+    - bugzilla 21877: VS2019 crash with "Show parameter storage class at call site"
+  * installer:
+    - full installer now bundled with DMD 2.098.0 and LDC 1.28.0
+
diff --git a/Makefile b/Makefile
@@ -41,7 +41,8 @@ MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild
 !ENDIF
 # CONFIG  = Release LDC
 CONFIG  = Release COFF32
-CONFIG_DMDSERVER = Release LDC
+CONFIG_X64 = Release COFF32
+CONFIG_DMDSERVER = Release COFF32
 
 ##############################################################
 # no more changes should be necessary starting from here
@@ -59,6 +60,9 @@ prerequisites:
 visuald_vs:
 	devenv /Project "visuald"   /Build "$(CONFIG)|Win32" visuald_vs10.sln
 
+visuald_vs_x64:
+	devenv /Project "visuald"   /Build "$(CONFIG_X64)|x64" visuald_vs10.sln
+
 visuald_test:
 	devenv /Project "visuald"   /Build "TestDebug|Win32" visuald_vs10.sln
 	bin\TestDebug\VisualD\VisualD.exe
@@ -87,45 +91,52 @@ fake_dparser:
 	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
+	cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
 
 vdext15:
-	cd vdextensions && $(MSBUILD) vdext15.csproj /p:Configuration=Release;Platform=x86 /t:Rebuild
+	cd vdextensions && $(MSBUILD) vdext15.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
 
 visualdwizard:
 	cd vdwizard && $(MSBUILD) VisualDWizard.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
 
 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
+#	cd msbuild\dbuild && devenv /Build "Release|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release;Platform=AnyCPU /t:Rebuild
 
 fake_dbuild12:
 	if not exist msbuild\dbuild\obj\release\nul md msbuild\dbuild\obj\release
 	if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.12.0.dll" copy "$(PROGRAMFILESX86)\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
+#	cd msbuild\dbuild && devenv /Build "Release-v14|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v14;Platform=AnyCPU /t:Rebuild
 
 fake_dbuild14:
 	if not exist msbuild\dbuild\obj\release-v14\nul md msbuild\dbuild\obj\release-v14
 	if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.14.0.dll" copy "$(PROGRAMFILESX86)\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
+#	cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v15;Platform=AnyCPU /t:Rebuild
 
 fake_dbuild15:
 	if not exist msbuild\dbuild\obj\release-v15\nul md msbuild\dbuild\obj\release-v15
 	if exist "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.15.0.dll" copy "$(PROGRAMFILESX86)\VisualD\msbuild\dbuild.15.0.dll" 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
 
 dbuild16:
-	cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
+#	cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16;Platform=AnyCPU /t:Rebuild
 
 dbuild16_1:
-	cd msbuild\dbuild && devenv /Build "Release-v16_1|AnyCPU" /Project "dbuild" dbuild.sln
+#	cd msbuild\dbuild && devenv /Build "Release-v16_1|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v16_1;Platform=AnyCPU /t:Rebuild
+
+dbuild17:
+#	cd msbuild\dbuild && devenv /Build "Release-v16|AnyCPU" /Project "dbuild" dbuild.sln
+	cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17;Platform=AnyCPU /t:Rebuild
 
 
 mago:
@@ -143,6 +154,9 @@ mago_vs16:
 	cd ..\..\mago && msbuild /p:Configuration=Release;Platform=x64;PlatformToolset=v142              /target:DebugEngine\MagoRemote MagoDbg_2010.sln
 	cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
 
+magocc_x64:
+	cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v142" /target:Expression\MagoNatCC MagoDbg_2010.sln
+
 magogc:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoGC" magodbg_2010.sln
 	cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoGC" magodbg_2010.sln
@@ -170,15 +184,15 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
 ##################################
 # create installer
 
-install_release_modules: install_modules dparser dparser_test cv2pdb_vs16 mago_vs16 magogc dbuild12 dbuild14 dbuild15
+install_release_modules: install_modules dparser dparser_test cv2pdb_vs16 mago_vs16 magocc_x64 magogc dbuild12 dbuild14 dbuild15
 
 install_vs: install_release_modules install_only
 
 install_vs_no_vs2017:   install_modules fake_dparser cv2pdb mago magogc dbuild12 dbuild14 fake_dbuild15 install_only
 
 install_vs_only_vs2017: install_modules dparser dparser_test cv2pdb_vs15 mago_vs15 magogc fake_dbuild12 fake_dbuild14 dbuild15 install_only
 
-install_modules: prerequisites visuald_vs vdserver dmdserver vdextension vdext15 visualdwizard dcxxfilt
+install_modules: prerequisites visuald_vs visuald_vs_x64 vdserver dmdserver vdextension vdext15 visualdwizard dcxxfilt
 
 install_only:
 	if not exist ..\downloads\nul md ..\downloads

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      1
-#define VERSION_MINOR      1
-#define VERSION_REVISION   1
-#define VERSION_BETA       
-#define VERSION_BUILD      0
+#define VERSION_MINOR      2
+#define VERSION_REVISION   0
+#define VERSION_BETA       -rc
+#define VERSION_BUILD      1