Skip to content

Commit 7f09288

Browse files
rainersrainers
committed
Merge pull request #60 from rainers/master
Changes for v0.3.44-beta1
2 parents e0234b7 + 0f58a76 commit 7f09288

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4586
-1061
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
/sdk/vsi
99
vdc/abothe/comserver/obj
1010
vdextensions/obj
11-
*.userprefs
11+
*.userprefs
12+
/msbuild/dbuild/obj
13+
/msbuild/dbuild/bin
14+
/msbuild/dbuild/.vs

‎CHANGES‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,3 +805,18 @@ Version history
805805
- added icons to some commands
806806
- search pane did not save its last state, only when switching between file and symbol search
807807
- dustmite: pattern passed to "find" must always use quotes
808+
809+
unreleased Version 0.3.44
810+
811+
* mago: bring back support to run on Windows XP
812+
* cv2pdb: fix crashes with very long symbols
813+
* can now read and write Mono-D project files (but likely to be incomplete because this was
814+
a failed attempt to integrate with msbuild and the VC projects)
815+
* now builds with dmd 2.071
816+
* when linking with MS linker, options for the map file broke the command line
817+
* bugzilla 16063: missing option -L/DLL when linking a DLL with MS linker
818+
* added integration with msbuild and VC++ projects
819+
* added installation of mago expression evalutro to Concord debug engine
820+
* added $(Platform) as a settings macro replacement in addition to $(PlatformName)
821+
* changed default output directory to $(PlatformName)/$(ConfigurationName)
822+
* added x64 configurations to project templates

‎Makefile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,23 @@ vdserver:
144144
devenv /Project "vdserver" /Build "Release|Win32" visuald_vs10.sln
145145

146146
dparser:
147-
cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
147+
cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release;Platform=x86 /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
148148

149149
vdextension:
150150
cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=x86 /t:Rebuild
151151

152+
dbuild12:
153+
cd msbuild\dbuild && devenv /Build "Release|AnyCPU" /Project "dbuild" dbuild.sln
154+
# cd msbuild\dbuild && $(MSBUILD) dbuild.sln /p:Configuration=Release;Platform="Any CPU" /t:Rebuild
155+
156+
dbuild14:
157+
cd msbuild\dbuild && devenv /Build "Release-v14|AnyCPU" /Project "dbuild" dbuild.sln
158+
# cd msbuild\dbuild && $(MSBUILD) dbuild.sln /p:Configuration=Release;Platform="Any CPU" /t:Rebuild
159+
152160
mago:
153161
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
154162
cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
163+
cd ..\..\mago && devenv /Build "Release StaticDE|Win32" /Project "MagoNatCC" magodbg_2010.sln
155164

156165
cv2pdb:
157166
cd ..\..\cv2pdb\trunk && devenv /Project "cv2pdb" /Build "Release|Win32" src\cv2pdb_vs12.sln
@@ -160,7 +169,7 @@ cv2pdb:
160169

161170
dcxxfilt: $(DCXXFILT_EXE)
162171
$(DCXXFILT_EXE): tools\dcxxfilt.d
163-
cd tools && set CONFIG=Release&& build_dcxxfilt
172+
cd tools && set CONFIG=Release && build_dcxxfilt
164173

165174
##################################
166175
# create installer
@@ -169,7 +178,8 @@ install: all cpp2d_exe idl2d_exe
169178
cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi
170179
"$(ZIP)" -j ..\downloads\visuald_pdb.zip bin\release\visuald.pdb bin\release\vdserver.pdb
171180

172-
install_vs: prerequisites visuald_vs vdserver cv2pdb dparser vdextension mago dcxxfilt install_only
181+
install_vs: prerequisites visuald_vs vdserver cv2pdb dparser vdextension mago dcxxfilt \
182+
dbuild12 dbuild14 install_only
173183

174184
install_only:
175185
cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi

‎TODO‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Project:
4343
- single file commands: track dependencies, also outputs
4444
- single file commands: multiple outputs
4545

46-
- VS2013: property pages don't follow resize
46+
+ VS2013: property pages don't follow resize
4747
- VS2013: possible to copy a project item with DnD into the same project again
4848
- saving file while it is being compiled/linked does not force a recompilation
4949

@@ -207,7 +207,7 @@ Unsorted
207207

208208
- compile and run : set VCInstallDir for -m64
209209
+ mago keeps image locked when terminating debugger
210-
- -gc/-g depending on debug engine
210+
+ -gc/-g depending on debug engine
211211
- dub support
212212
+ dustmite support
213213
- dfix support
@@ -221,3 +221,6 @@ Unsorted
221221

222222
- hide Visual D menu if inactive
223223
- follow theme colors for tool windows
224+
225+
- version highlighting in files not in a project
226+
- does not rebuild lib if c-file recompiled

‎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 3
3-
#define VERSION_REVISION 43
4-
#define VERSION_BETA
5-
#define VERSION_BUILD 0
3+
#define VERSION_REVISION 44
4+
#define VERSION_BETA -beta
5+
#define VERSION_BUILD 1

‎build/build.visualdproj‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<multiobj>0</multiobj>
99
<singleFileCompilation>3</singleFileCompilation>
1010
<oneobj>0</oneobj>
11+
<mscoff>0</mscoff>
1112
<trace>0</trace>
1213
<quiet>0</quiet>
1314
<verbose>0</verbose>
@@ -95,6 +96,7 @@
9596
<exefile>$(OutDir)\$(ProjectName).sdk</exefile>
9697
<useStdLibPath>1</useStdLibPath>
9798
<cRuntime>2</cRuntime>
99+
<privatePhobos>0</privatePhobos>
98100
<additionalOptions />
99101
<preBuildCommand />
100102
<postBuildCommand>echo Success &gt;$(TargetPath)</postBuildCommand>
@@ -108,6 +110,7 @@
108110
<multiobj>0</multiobj>
109111
<singleFileCompilation>3</singleFileCompilation>
110112
<oneobj>0</oneobj>
113+
<mscoff>0</mscoff>
111114
<trace>0</trace>
112115
<quiet>0</quiet>
113116
<verbose>0</verbose>
@@ -195,25 +198,26 @@
195198
<exefile>$(OutDir)\$(ProjectName).sdk</exefile>
196199
<useStdLibPath>1</useStdLibPath>
197200
<cRuntime>1</cRuntime>
201+
<privatePhobos>0</privatePhobos>
198202
<additionalOptions />
199203
<preBuildCommand />
200204
<postBuildCommand>echo Success &gt;$(TargetPath)
201205
echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
202206
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
203207
</Config>
204208
<Folder name="build">
205-
<File tool="Custom" path="dte_idl.bat" dependencies="$(OutDir)\tlb2idl.exe" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
209+
<File path="dte_idl.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
206210
if errorlevel 1 goto reportError
207-
call $(InputPath) &quot;$(OutDir)\tlb2idl.exe&quot; &quot;$(OutDir)\dte_idl.success&quot;" outfile="$(OutDir)\dte_idl.success" />
208-
<File tool="Custom" path="..\tools\filemonitor.d" customcmd="dmd -g -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).dll -defaultlib=user32.lib -L/ENTRY:_DllMain@12 $(InputPath)" outfile="$(OutDir)\$(InputName).dll" />
209-
<File tool="Custom" path="..\tools\largeadr.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath)" outfile="$(OutDir)\$(InputName).exe" />
210-
<File tool="Custom" path="..\tools\pipedmd.d" dependencies="..\tools\nostacktrace.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" />
211-
<File tool="Custom" path="sdk.bat" dependencies="$(OutDir)\dte_idl.success $(OutDir)\vsi2d.exe" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
211+
call $(InputPath) &quot;$(OutDir)\tlb2idl.exe&quot; &quot;$(OutDir)\dte_idl.success&quot;" tool="Custom" dependencies="$(OutDir)\tlb2idl.exe" outfile="$(OutDir)\dte_idl.success" />
212+
<File path="..\tools\filemonitor.d" customcmd="dmd -g -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).dll -defaultlib=user32.lib -L/ENTRY:_DllMain@12 $(InputPath)" tool="Custom" outfile="$(OutDir)\$(InputName).dll" />
213+
<File path="..\tools\largeadr.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath)" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
214+
<File path="..\tools\pipedmd.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d" tool="Custom" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" />
215+
<File path="sdk.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
212216
if errorlevel 1 goto reportError
213-
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk.success&quot;" outfile="$(OutDir)\sdk.success" />
214-
<File tool="Custom" path="sdk_libs.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
217+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk.success&quot;" tool="Custom" dependencies="$(OutDir)\dte_idl.success $(OutDir)\vsi2d.exe" outfile="$(OutDir)\sdk.success" />
218+
<File path="sdk_libs.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
215219
if errorlevel 1 goto reportError
216-
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk_libs.success&quot;" outfile="$(OutDir)\sdk_libs.success" />
217-
<File tool="Custom" path="..\tools\tlb2idl.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) oleaut32.lib uuid.lib" outfile="$(OutDir)\$(InputName).exe" />
220+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk_libs.success&quot;" tool="Custom" outfile="$(OutDir)\sdk_libs.success" />
221+
<File path="..\tools\tlb2idl.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) oleaut32.lib uuid.lib" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
218222
</Folder>
219223
</DProject>

‎build/sdk_libs.bat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ if "%WINSDKLIB%" == "" if exist "%WindowsSdkDir%\lib\win8\um\x86\kernel32.lib" s
2525
if "%WINSDKLIB%" == "" if exist "%WindowsSdkDir%\lib\kernel32.lib" set WINSDKLIB=%WindowsSdkDir%\lib
2626
if "%WINSDKLIB%" == "" (echo could not detect the Windows SDK library folder && exit /B 1)
2727

28-
set COFFIMPLIB=coffimplib
29-
coffimplib >nul 2>&1
28+
set COFFIMPLIB=c:\l\dmc\bin\coffimplib.exe
29+
%coffimplib% >nul 2>&1
30+
if errorlevel 9000 set COFFIMPLIB=coffimplib
31+
%coffimplib% >nul 2>&1
3032
if errorlevel 9000 (echo cannot execute %COFFIMPLIB%, please add to PATH && exit /B 1)
3133

3234
for %%f in (%LIBS%) do (

‎c2d/c2d.visualdproj‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,210 @@
12241224
<postBuildCommand />
12251225
<filesToClean>*.obj</filesToClean>
12261226
</Config>
1227+
<Config name="Release LDC" platform="Win32">
1228+
<obj>0</obj>
1229+
<link>0</link>
1230+
<lib>1</lib>
1231+
<subsystem>0</subsystem>
1232+
<multiobj>0</multiobj>
1233+
<singleFileCompilation>0</singleFileCompilation>
1234+
<oneobj>0</oneobj>
1235+
<mscoff>0</mscoff>
1236+
<trace>0</trace>
1237+
<quiet>0</quiet>
1238+
<verbose>0</verbose>
1239+
<vtls>0</vtls>
1240+
<vgc>0</vgc>
1241+
<symdebug>1</symdebug>
1242+
<optimize>1</optimize>
1243+
<cpu>0</cpu>
1244+
<isX86_64>0</isX86_64>
1245+
<isLinux>0</isLinux>
1246+
<isOSX>0</isOSX>
1247+
<isWindows>0</isWindows>
1248+
<isFreeBSD>0</isFreeBSD>
1249+
<isSolaris>0</isSolaris>
1250+
<scheduler>0</scheduler>
1251+
<useDeprecated>0</useDeprecated>
1252+
<errDeprecated>0</errDeprecated>
1253+
<useAssert>0</useAssert>
1254+
<useInvariants>0</useInvariants>
1255+
<useIn>0</useIn>
1256+
<useOut>0</useOut>
1257+
<useArrayBounds>0</useArrayBounds>
1258+
<noboundscheck>1</noboundscheck>
1259+
<useSwitchError>0</useSwitchError>
1260+
<useUnitTests>0</useUnitTests>
1261+
<useInline>1</useInline>
1262+
<release>0</release>
1263+
<preservePaths>0</preservePaths>
1264+
<warnings>0</warnings>
1265+
<infowarnings>0</infowarnings>
1266+
<checkProperty>0</checkProperty>
1267+
<genStackFrame>0</genStackFrame>
1268+
<pic>0</pic>
1269+
<cov>0</cov>
1270+
<nofloat>0</nofloat>
1271+
<Dversion>2</Dversion>
1272+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
1273+
<allinst>0</allinst>
1274+
<stackStomp>0</stackStomp>
1275+
<compiler>2</compiler>
1276+
<otherDMD>0</otherDMD>
1277+
<cccmd>$(CC) -c</cccmd>
1278+
<ccTransOpt>1</ccTransOpt>
1279+
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
1280+
<imppath>..</imppath>
1281+
<fileImppath>..</fileImppath>
1282+
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
1283+
<objdir>$(OutDir)</objdir>
1284+
<objname />
1285+
<libname />
1286+
<doDocComments>0</doDocComments>
1287+
<docdir />
1288+
<docname />
1289+
<modules_ddoc />
1290+
<ddocfiles />
1291+
<doHdrGeneration>0</doHdrGeneration>
1292+
<hdrdir />
1293+
<hdrname />
1294+
<doXGeneration>1</doXGeneration>
1295+
<xfilename>$(IntDir)\$(ProjectName).json</xfilename>
1296+
<debuglevel>0</debuglevel>
1297+
<debugids />
1298+
<versionlevel>0</versionlevel>
1299+
<versionids />
1300+
<dump_source>0</dump_source>
1301+
<mapverbosity>0</mapverbosity>
1302+
<createImplib>0</createImplib>
1303+
<defaultlibname />
1304+
<debuglibname />
1305+
<moduleDepsFile />
1306+
<run>0</run>
1307+
<runargs />
1308+
<runCv2pdb>1</runCv2pdb>
1309+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
1310+
<cv2pdbPre2043>0</cv2pdbPre2043>
1311+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
1312+
<cv2pdbEnumType>0</cv2pdbEnumType>
1313+
<cv2pdbOptions />
1314+
<objfiles />
1315+
<linkswitches />
1316+
<libfiles />
1317+
<libpaths />
1318+
<deffile />
1319+
<resfile />
1320+
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
1321+
<useStdLibPath>1</useStdLibPath>
1322+
<cRuntime>2</cRuntime>
1323+
<privatePhobos>0</privatePhobos>
1324+
<additionalOptions />
1325+
<preBuildCommand />
1326+
<postBuildCommand />
1327+
<filesToClean>*.obj</filesToClean>
1328+
</Config>
1329+
<Config name="Release LDC" platform="x64">
1330+
<obj>0</obj>
1331+
<link>0</link>
1332+
<lib>1</lib>
1333+
<subsystem>0</subsystem>
1334+
<multiobj>0</multiobj>
1335+
<singleFileCompilation>0</singleFileCompilation>
1336+
<oneobj>0</oneobj>
1337+
<mscoff>0</mscoff>
1338+
<trace>0</trace>
1339+
<quiet>0</quiet>
1340+
<verbose>0</verbose>
1341+
<vtls>0</vtls>
1342+
<vgc>0</vgc>
1343+
<symdebug>1</symdebug>
1344+
<optimize>0</optimize>
1345+
<cpu>0</cpu>
1346+
<isX86_64>1</isX86_64>
1347+
<isLinux>0</isLinux>
1348+
<isOSX>0</isOSX>
1349+
<isWindows>0</isWindows>
1350+
<isFreeBSD>0</isFreeBSD>
1351+
<isSolaris>0</isSolaris>
1352+
<scheduler>0</scheduler>
1353+
<useDeprecated>0</useDeprecated>
1354+
<errDeprecated>0</errDeprecated>
1355+
<useAssert>0</useAssert>
1356+
<useInvariants>0</useInvariants>
1357+
<useIn>0</useIn>
1358+
<useOut>0</useOut>
1359+
<useArrayBounds>0</useArrayBounds>
1360+
<noboundscheck>0</noboundscheck>
1361+
<useSwitchError>0</useSwitchError>
1362+
<useUnitTests>1</useUnitTests>
1363+
<useInline>0</useInline>
1364+
<release>0</release>
1365+
<preservePaths>0</preservePaths>
1366+
<warnings>0</warnings>
1367+
<infowarnings>0</infowarnings>
1368+
<checkProperty>0</checkProperty>
1369+
<genStackFrame>0</genStackFrame>
1370+
<pic>0</pic>
1371+
<cov>0</cov>
1372+
<nofloat>0</nofloat>
1373+
<Dversion>2</Dversion>
1374+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
1375+
<allinst>0</allinst>
1376+
<stackStomp>0</stackStomp>
1377+
<compiler>2</compiler>
1378+
<otherDMD>0</otherDMD>
1379+
<cccmd>$(CC) -c</cccmd>
1380+
<ccTransOpt>1</ccTransOpt>
1381+
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
1382+
<imppath>..</imppath>
1383+
<fileImppath>..</fileImppath>
1384+
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
1385+
<objdir>$(OutDir)</objdir>
1386+
<objname />
1387+
<libname />
1388+
<doDocComments>0</doDocComments>
1389+
<docdir />
1390+
<docname />
1391+
<modules_ddoc />
1392+
<ddocfiles />
1393+
<doHdrGeneration>0</doHdrGeneration>
1394+
<hdrdir />
1395+
<hdrname />
1396+
<doXGeneration>1</doXGeneration>
1397+
<xfilename>$(IntDir)\$(ProjectName).json</xfilename>
1398+
<debuglevel>0</debuglevel>
1399+
<debugids />
1400+
<versionlevel>0</versionlevel>
1401+
<versionids />
1402+
<dump_source>0</dump_source>
1403+
<mapverbosity>0</mapverbosity>
1404+
<createImplib>0</createImplib>
1405+
<defaultlibname />
1406+
<debuglibname />
1407+
<moduleDepsFile />
1408+
<run>0</run>
1409+
<runargs />
1410+
<runCv2pdb>1</runCv2pdb>
1411+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
1412+
<cv2pdbPre2043>0</cv2pdbPre2043>
1413+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
1414+
<cv2pdbEnumType>0</cv2pdbEnumType>
1415+
<cv2pdbOptions />
1416+
<objfiles />
1417+
<linkswitches />
1418+
<libfiles />
1419+
<libpaths />
1420+
<deffile />
1421+
<resfile />
1422+
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
1423+
<useStdLibPath>1</useStdLibPath>
1424+
<cRuntime>2</cRuntime>
1425+
<privatePhobos>0</privatePhobos>
1426+
<additionalOptions />
1427+
<preBuildCommand />
1428+
<postBuildCommand />
1429+
<filesToClean>*.obj</filesToClean>
1430+
</Config>
12271431
<Folder name="c2d">
12281432
<File path="ast.d" />
12291433
<File path="cpp2d.d" />

0 commit comments

Comments
 (0)