Skip to content

Commit e04e5f7

Browse files
rainersrainers
authored
Merge pull request #79 from rainers/master
Visual D 0.45.1-rc1
2 parents 40d71fb + 4b36197 commit e04e5f7

21 files changed

+328
-92
lines changed

‎Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ NSIS = $(PROGRAMFILES)\NSIS
3737
CV2PDB = $(PROGRAMFILES)\VisualD\cv2pdb\cv2pdb.exe
3838
ZIP = c:\u\unix\zip.exe
3939
MSBUILD = c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
40+
CONFIG = Release COFF32
4041

4142
##############################################################
4243
# no more changes should be necessary starting from here
@@ -135,13 +136,13 @@ idl2d_exe: $(VSI2D_EXE)
135136
copy $(VSI2D_EXE) ..\downloads\idl2d.exe
136137

137138
prerequisites:
138-
devenv /Project "build" /Build "Release|Win32" visuald_vs10.sln
139+
devenv /Project "build" /Build "$(CONFIG)|Win32" visuald_vs10.sln
139140

140141
visuald_vs:
141-
devenv /Project "visuald" /Build "Release|Win32" visuald_vs10.sln
142+
devenv /Project "visuald" /Build "$(CONFIG)|Win32" visuald_vs10.sln
142143

143144
vdserver:
144-
devenv /Project "vdserver" /Build "Release|Win32" visuald_vs10.sln
145+
devenv /Project "vdserver" /Build "$(CONFIG)|Win32" visuald_vs10.sln
145146

146147
dparser:
147148
cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
@@ -197,7 +198,7 @@ install_modules: prerequisites visuald_vs vdserver cv2pdb dparser vdextension ma
197198

198199
install_only:
199200
if not exist ..\downloads\nul md ..\downloads
200-
cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi
201+
cd nsis && "$(NSIS)\makensis" /V1 "/DCONFIG=$(CONFIG)" visuald.nsi
201202

202203
##################################
203204
# clean build results

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

‎build/build.visualdproj‎

Lines changed: 115 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<otherDMD>0</otherDMD>
5353
<cccmd>$(CC) -c</cccmd>
5454
<ccTransOpt>1</ccTransOpt>
55+
<addDepImp>0</addDepImp>
5556
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
5657
<imppath />
5758
<fileImppath />
@@ -154,6 +155,7 @@
154155
<otherDMD>0</otherDMD>
155156
<cccmd>$(CC) -c</cccmd>
156157
<ccTransOpt>1</ccTransOpt>
158+
<addDepImp>0</addDepImp>
157159
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
158160
<imppath />
159161
<fileImppath />
@@ -205,19 +207,126 @@
205207
echo. &gt;$(TargetDir)\build.dep</postBuildCommand>
206208
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
207209
</Config>
210+
<Config name="Release COFF32" platform="Win32">
211+
<obj>0</obj>
212+
<link>0</link>
213+
<lib>1</lib>
214+
<subsystem>0</subsystem>
215+
<multiobj>0</multiobj>
216+
<singleFileCompilation>3</singleFileCompilation>
217+
<oneobj>0</oneobj>
218+
<mscoff>0</mscoff>
219+
<trace>0</trace>
220+
<quiet>0</quiet>
221+
<verbose>0</verbose>
222+
<vtls>0</vtls>
223+
<vgc>0</vgc>
224+
<symdebug>0</symdebug>
225+
<optimize>0</optimize>
226+
<cpu>0</cpu>
227+
<isX86_64>0</isX86_64>
228+
<isLinux>0</isLinux>
229+
<isOSX>0</isOSX>
230+
<isWindows>0</isWindows>
231+
<isFreeBSD>0</isFreeBSD>
232+
<isSolaris>0</isSolaris>
233+
<scheduler>0</scheduler>
234+
<useDeprecated>0</useDeprecated>
235+
<errDeprecated>0</errDeprecated>
236+
<useAssert>0</useAssert>
237+
<useInvariants>0</useInvariants>
238+
<useIn>0</useIn>
239+
<useOut>0</useOut>
240+
<useArrayBounds>0</useArrayBounds>
241+
<noboundscheck>0</noboundscheck>
242+
<useSwitchError>0</useSwitchError>
243+
<useUnitTests>0</useUnitTests>
244+
<useInline>0</useInline>
245+
<release>1</release>
246+
<preservePaths>0</preservePaths>
247+
<warnings>0</warnings>
248+
<infowarnings>0</infowarnings>
249+
<checkProperty>0</checkProperty>
250+
<genStackFrame>0</genStackFrame>
251+
<pic>0</pic>
252+
<cov>0</cov>
253+
<nofloat>0</nofloat>
254+
<Dversion>2</Dversion>
255+
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
256+
<allinst>0</allinst>
257+
<stackStomp>0</stackStomp>
258+
<compiler>0</compiler>
259+
<otherDMD>0</otherDMD>
260+
<cccmd>$(CC) -c</cccmd>
261+
<ccTransOpt>1</ccTransOpt>
262+
<addDepImp>0</addDepImp>
263+
<program>$(DMDInstallDir)windows\bin\dmd.exe</program>
264+
<imppath />
265+
<fileImppath />
266+
<outdir>..\bin\$(ConfigurationName)</outdir>
267+
<objdir>$(OutDir)</objdir>
268+
<objname />
269+
<libname />
270+
<doDocComments>0</doDocComments>
271+
<docdir />
272+
<docname />
273+
<modules_ddoc />
274+
<ddocfiles />
275+
<doHdrGeneration>0</doHdrGeneration>
276+
<hdrdir />
277+
<hdrname />
278+
<doXGeneration>1</doXGeneration>
279+
<xfilename>$(IntDir)\$(TargetName).json</xfilename>
280+
<debuglevel>0</debuglevel>
281+
<debugids />
282+
<versionlevel>0</versionlevel>
283+
<versionids />
284+
<dump_source>0</dump_source>
285+
<mapverbosity>0</mapverbosity>
286+
<createImplib>0</createImplib>
287+
<defaultlibname />
288+
<debuglibname />
289+
<moduleDepsFile />
290+
<run>0</run>
291+
<runargs />
292+
<runCv2pdb>0</runCv2pdb>
293+
<pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
294+
<cv2pdbPre2043>0</cv2pdbPre2043>
295+
<cv2pdbNoDemangle>0</cv2pdbNoDemangle>
296+
<cv2pdbEnumType>0</cv2pdbEnumType>
297+
<cv2pdbOptions />
298+
<objfiles />
299+
<linkswitches />
300+
<libfiles />
301+
<libpaths />
302+
<deffile />
303+
<resfile />
304+
<exefile>$(OutDir)\$(ProjectName).sdk</exefile>
305+
<useStdLibPath>1</useStdLibPath>
306+
<cRuntime>1</cRuntime>
307+
<privatePhobos>0</privatePhobos>
308+
<additionalOptions />
309+
<preBuildCommand />
310+
<postBuildCommand>echo Success &gt;&quot;$(TargetPath)&quot;
311+
echo. &gt;&quot;$(TargetDir)\build.dep&quot;</postBuildCommand>
312+
<filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
313+
</Config>
208314
<Folder name="build">
209315
<File path="dte_idl.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
210316
if errorlevel 1 goto reportError
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" />
317+
call $(InputPath) &quot;$(OutDir)\tlb2idl.exe&quot; &quot;$(OutDir)\dte_idl.success&quot;" tool="Custom" dependencies="&quot;$(OutDir)\tlb2idl.exe&quot;" outfile="$(OutDir)\dte_idl.success" />
318+
<File path="..\tools\filemonitor.d" customcmd="dmd -g -map &quot;$(OutDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).dll&quot; -defaultlib=user32.lib -L/ENTRY:_DllMain@12 $(InputPath)" tool="Custom" outfile="$(OutDir)\$(InputName).dll" />
319+
<File path="..\tools\largeadr.d" customcmd="dmd -map &quot;$(OutDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath)" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
320+
<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" perConfig="true" outfile="$(OutDir)\$(InputName).exe">
321+
<Config name="Release COFF32|Win32" customcmd="dmd -m32mscoff -map &quot;$(OutDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) ..\tools\nostacktrace.d user32.lib" tool="Custom" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" />
322+
<Config name="Debug|Win32" customcmd="dmd -g -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) ..\tools\nostacktrace.d" tool="Custom" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" />
323+
</File>
215324
<File path="sdk.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
216325
if errorlevel 1 goto reportError
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" />
326+
call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk.success&quot;" tool="Custom" dependencies="&quot;$(OutDir)\dte_idl.success&quot; &quot;$(OutDir)\vsi2d.exe&quot;" outfile="$(OutDir)\sdk.success" />
218327
<File path="sdk_libs.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
219328
if errorlevel 1 goto reportError
220329
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 -d -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) oleaut32.lib uuid.lib" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
330+
<File path="..\tools\tlb2idl.d" customcmd="dmd -d -map &quot;$(OutDir)\$(InputName).map&quot; &quot;-of$(OutDir)\$(InputName).exe&quot; $(InputPath) oleaut32.lib uuid.lib" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
222331
</Folder>
223332
</DProject>

‎build/dte_idl.bat‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
@echo off
1+
rem @echo off
22
rem expecting
33
rem - tlb2idl.exe with path as the first argument
44
rem - output file as second arg to remember build success
55
rem - WindowsSdkDir to be set
66

7-
if "%1" == "" (echo please specify the path to tlb2idl.exe as the first argument && exit /B 1)
8-
set TLB2IDL=%1
7+
set TLB2IDL=%~1
8+
if "%TLB2IDL%" == "" (echo please specify the path to tlb2idl.exe as the first argument && exit /B 1)
99
if not exist "%TLB2IDL%" (echo %1 does not exist && exit /B 1)
1010

11-
if "%2" == "" (echo please specify the output path to remember succesful builds as second argument && exit /B 1)
12-
set OUT=%2
11+
set OUT=%~2
12+
if "%OUT%" == "" (echo please specify the output path to remember succesful builds as second argument && exit /B 1)
1313
if exist %OUT% del %OUT%
1414

1515
set DTE_IDL_PATH=..\sdk\vsi\idl
@@ -24,13 +24,13 @@ if "%IVIEWER%" == "" if exist "%WindowsSdkDir%\bin\x86\iviewers.dll" set IVIEWER
2424
if "%IVIEWER%" == "" if exist "%WindowsSdkDir%\bin\iviewers.dll" set IVIEWER=%WindowsSdkDir%\bin\iviewers.dll
2525
if "%IVIEWER%" == "" (echo "iviewer.dll" not found && exit /B 1)
2626

27-
echo %TLB2IDL% "%MSENV%\dte80.olb" "%DTE_IDL_PATH%\dte80.idl" "%IVIEWER%"
27+
echo "%TLB2IDL%" "%MSENV%\dte80.olb" "%DTE_IDL_PATH%\dte80.idl" "%IVIEWER%"
2828

29-
%TLB2IDL% "%MSENV%\dte80.olb" "%DTE_IDL_PATH%\dte80.idl" "%IVIEWER%"
29+
"%TLB2IDL%" "%MSENV%\dte80.olb" "%DTE_IDL_PATH%\dte80.idl" "%IVIEWER%"
3030
if errorlevel 1 exit /B 1
31-
%TLB2IDL% "%MSENV%\dte80a.olb" "%DTE_IDL_PATH%\dte80a.idl" "%IVIEWER%"
31+
"%TLB2IDL%" "%MSENV%\dte80a.olb" "%DTE_IDL_PATH%\dte80a.idl" "%IVIEWER%"
3232
if errorlevel 1 exit /B 1
33-
%TLB2IDL% "%MSENV%\dte90.olb" "%DTE_IDL_PATH%\dte90.idl" "%IVIEWER%"
33+
"%TLB2IDL%" "%MSENV%\dte90.olb" "%DTE_IDL_PATH%\dte90.idl" "%IVIEWER%"
3434
if errorlevel 1 exit /B 1
35-
echo Success > %OUT%
35+
echo Success > "%OUT%"
3636
exit /B 0

‎build/sdk.bat‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ rem - vsi2d.exe with path as the first argument
44
rem - output file as second arg to remember build success
55
rem - WindowsSdkDir to be set
66

7-
if "%1" == "" (echo Error: please specify the path to vsi2d.exe as the first argument && exit /B 1)
8-
set VSI2D=%1
7+
set VSI2D=%~1
8+
if "%VSI2D%" == "" (echo Error: please specify the path to vsi2d.exe as the first argument && exit /B 1)
99
if not exist "%VSI2D%" (echo %1 does not exist && exit /B 1)
1010

11-
if "%2" == "" (echo Error: please specify the output path to remember succesful builds as second argument && exit /B 1)
12-
set OUT=%2
13-
if exist %OUT% del %OUT%
11+
set OUT=%~2
12+
if "%OUT%" == "" (echo Error: please specify the output path to remember succesful builds as second argument && exit /B 1)
13+
if exist "%OUT%" del "%OUT%"
1414

1515
if "%WindowsSdkDir%" == "" (echo Error: environment variable WindowsSdkDir not set && exit /B 1)
1616

@@ -38,12 +38,12 @@ if "%VSISDKINC%" == "" (echo Error: could not detect the Visual Studio SDK && ex
3838
if not exist "%VSISDKINC%\VisualStudioIntegration\Common\Inc\textmgr.h" (echo unexpected Visual Studio SDK installation at "%VSISDKINC%" && exit /B 1)
3939

4040
echo Translating Windows SDK and Visual Studio SDK to D, this can take several minutes. Please be patient.
41-
echo %VSI2D% --vsi="%VSISDKINC:\=/%" --win="%WINSDKINC:\=/%" --dte="%DTE_IDL_PATH%" --sdk=..\sdk
42-
%VSI2D% --vsi="%VSISDKINC:\=/%" --win="%WINSDKINC:\=/%" --dte="%DTE_IDL_PATH%" --sdk=..\sdk
41+
echo "%VSI2D%" --vsi="%VSISDKINC:\=/%" --win="%WINSDKINC:\=/%" --dte="%DTE_IDL_PATH%" --sdk=..\sdk
42+
"%VSI2D%" --vsi="%VSISDKINC:\=/%" --win="%WINSDKINC:\=/%" --dte="%DTE_IDL_PATH%" --sdk=..\sdk
4343
if errorlevel 1 exit /B 1
4444

4545
echo Translation successful!
4646
echo Visual Studio now prompts to reload the vsi project, but cannot do so because the build is still running.
4747
echo Please reload the solution manually.
48-
echo Success > %OUT%
48+
echo Success > "%OUT%"
4949
exit /B 0

‎build/sdk_libs.bat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ rem - vsi2d.exe with path as the first argument
44
rem - output file as second arg to remember build success
55
rem - WindowsSdkDir to be set
66

7-
if "%1" == "" (echo Error: please specify the path to vsi2d.exe as the first argument && exit /B 1)
8-
set VSI2D=%1
7+
set VSI2D=%~1
8+
if "%VSI2D%" == "" (echo Error: please specify the path to vsi2d.exe as the first argument && exit /B 1)
99
if not exist "%VSI2D%" (echo %1 does not exist && exit /B 1)
1010

11-
if "%2" == "" (echo Error: please specify the output path to remember succesful builds as second argument && exit /B 1)
12-
set OUT=%2
13-
if exist %OUT% del %OUT%
11+
set OUT=%~2
12+
if "%OUT%" == "" (echo Error: please specify the output path to remember succesful builds as second argument && exit /B 1)
13+
if exist "%OUT%" del "%OUT%"
1414

1515
if not exist ..\sdk\lib\nul md ..\sdk\lib
1616

@@ -38,5 +38,5 @@ for %%f in (%LIBS%) do (
3838
if errorlevel 1 exit /B 1
3939
)
4040

41-
echo Success > %OUT%
41+
echo Success > "%OUT%"
4242
exit /B 0

0 commit comments

Comments
 (0)