add PDB files for Windows

original commit: 6d9bda11c1f8d31bf86c559892cf968d7f0c1595
2018-09-07 16:37:57 -04:00 · 2018-09-07 16:37:57 -04:00 · 57b0163e93
commit 57b0163e93
parent d468c35f29
13 changed files with 78 additions and 26 deletions
--- a/2
+++ b/2
@ -1005,3 +1005,5 @@
    syntax.ss, 8.ms
 - add uninstall target
    Makefile.in, Makefile-workarea.in, Mf-install.in
+- add PDB files for Windows
+    c/*nt, wininstall/*nt.wxs
--- a/c/Makefile.a6nt
+++ b/c/Makefile.a6nt
@ -28,20 +28,18 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res

 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
-DLLLDFLAGS=/machine:X64 /release /nologo
+DLLLDFLAGS=/debug:full /machine:X64 /nologo
 # stack limit is 1MB by default.  this is not enough for one of the mats in foreign.ms, which
 # builds up nested C & Scheme stack frames.  2MB seems to be enough, but we set to 16MB.
-EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
+EXELDFLAGS=/debug:full /machine:X64 /incremental:no /nologo /STACK:0x1000000

 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
-# MDCFLAGS=$(CFLAGS) /Zi /MDd
-# MTCFLAGS=$(CFLAGS) /Zi /MTd
-# DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
-# EXELDFLAGS=/machine:X64 /incremental:no /debug /nologo /STACK:0x1000000
+# CFLAGS=/nologo /Od /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# MDCFLAGS=$(CFLAGS) /MDd
+# MTCFLAGS=$(CFLAGS) /MTd

 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
 MDZlibLib=..\zlib\zlib.lib
--- a/c/Makefile.i3nt
+++ b/c/Makefile.i3nt
@ -28,16 +28,17 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res

 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
-DLLLDFLAGS=/machine:ix86 /release /nologo
+DLLLDFLAGS=/debug:full /machine:ix86 /nologo
 # see note in Makefile.a6nt regarding stack size.  we use 8MB here to be consistent.
-EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
+EXELDFLAGS=/debug:full /machine:ix86 /incremental:no /nologo /STACK:0x800000

 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
-# LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
+# CFLAGS=/nologo /fp:precise /Od /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# MDCFLAGS=$(CFLAGS) /MDd
+# MTCFLAGS=$(CFLAGS) /MTd

 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
 MDZlibLib=..\zlib\zlib.lib
--- a/c/Makefile.ta6nt
+++ b/c/Makefile.ta6nt
@ -28,20 +28,18 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res

 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
-DLLLDFLAGS=/machine:X64 /release /nologo
+DLLLDFLAGS=/debug:full /machine:X64 /nologo
 # stack limit is 1MB by default.  this is not enough for one of the mats in foreign.ms, which
 # builds up nested C & Scheme stack frames.  2MB seems to be enough, but we set to 16MB.
-EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
+EXELDFLAGS=/debug:full /machine:X64 /incremental:no /nologo /STACK:0x1000000

 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
-# MDCFLAGS=$(CFLAGS) /Zi /MDd
-# MTCFLAGS=$(CFLAGS) /Zi /MTd
-# DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
-# EXELDFLAGS=/machine:X64 /incremental:no /debug /nologo /STACK:0x1000000
+# CFLAGS=/nologo /Od /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# MDCFLAGS=$(CFLAGS) /MDd
+# MTCFLAGS=$(CFLAGS) /MTd

 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
 MDZlibLib=..\zlib\zlib.lib
--- a/c/Makefile.ti3nt
+++ b/c/Makefile.ti3nt
@ -28,16 +28,17 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res

 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
-DLLLDFLAGS=/machine:ix86 /release /nologo
+DLLLDFLAGS=/debug:full /machine:ix86 /nologo
 # see note in Makefile.a6nt regarding stack size.  we use 8MB here to be consistent.
-EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
+EXELDFLAGS=/debug:full /machine:ix86 /incremental:no /nologo /STACK:0x800000

 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
-# LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
+# CFLAGS=/nologo /fp:precise /Od /W3 /Zi /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# MDCFLAGS=$(CFLAGS) /MDd
+# MTCFLAGS=$(CFLAGS) /MTd

 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
 MDZlibLib=..\zlib\zlib.lib
--- a/c/Mf-a6nt
+++ b/c/Mf-a6nt
@ -27,6 +27,7 @@ include Mf-base
 ${Scheme}: make.bat
 	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
+	cp ../bin/$m/scheme.pdb ../bin/$m/petite.pdb

 make.bat: vs.bat
 	echo '@echo off' > $@
--- a/c/Mf-i3nt
+++ b/c/Mf-i3nt
@ -27,6 +27,7 @@ include Mf-base
 ${Scheme}: make.bat
 	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
+	cp ../bin/$m/scheme.pdb ../bin/$m/petite.pdb

 make.bat: vs.bat
 	echo '@echo off' > $@
--- a/c/Mf-ta6nt
+++ b/c/Mf-ta6nt
@ -27,6 +27,7 @@ include Mf-base
 ${Scheme}: make.bat
 	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
+	cp ../bin/$m/scheme.pdb ../bin/$m/petite.pdb

 make.bat: vs.bat
 	echo '@echo off' > $@
--- a/c/Mf-ti3nt
+++ b/c/Mf-ti3nt
@ -27,6 +27,7 @@ include Mf-base
 ${Scheme}: make.bat
 	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
+	cp ../bin/$m/scheme.pdb ../bin/$m/petite.pdb

 make.bat: vs.bat
 	echo '@echo off' > $@
--- a/wininstall/a6nt.wxs
+++ b/wininstall/a6nt.wxs
@ -12,9 +12,15 @@
        <Component Id="cmp0B0A70880E3C505B199705D415235AC7" Guid="*">
          <File Id="fil69E98A18AB5AD3061617C9E68F536773" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv951.lib" />
        </Component>
+        <Component Id="cmp41C1093548579E6BE087DD4BE735B7C5" Guid="*">
+          <File Id="fil11683117A53DD772D9B6F0C11BE06C7C" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv951.pdb" />
+        </Component>
        <Component Id="cmpD50999EDF5C2480D6F6F6A04E6B127F3" Guid="*">
          <File Id="filE439E2DE55CFE1366273AF3E232D4519" KeyPath="yes" Source="..\a6nt\bin\a6nt\petite.exe" />
        </Component>
+        <Component Id="cmp5740FF469BE73A073AF9A5DB75C36C8F" Guid="*">
+          <File Id="filAFA637C0D30922D860F3EE6D92EEB420" KeyPath="yes" Source="..\a6nt\bin\a6nt\petite.pdb" />
+        </Component>
        <Component Id="cmpDD19E9A8DE8058599CFC66AF8DB39487" Guid="*">
          <File Id="filA4D665DE511690E448BF115110B44A21" KeyPath="yes" Source="..\a6nt\bin\a6nt\scheme.exe">
            <Shortcut Id="cs_a6nt_shortcut"
@ -26,6 +32,9 @@
                      WorkingDirectory="APPLICATIONFOLDER"/>
          </File>
        </Component>
+        <Component Id="cmp6BB67EB735F0C8C23D4B94F0096A19BF" Guid="*">
+          <File Id="fil7A6708590A224BCB853A13A84ABACC69" KeyPath="yes" Source="..\a6nt\bin\a6nt\scheme.pdb" />
+        </Component>
      </Directory>
    </DirectoryRef>
    <DirectoryRef Id="D_boot">
@ -60,8 +69,11 @@
      <ComponentRef Id="cmp9E121291956F53F264990A9F6E93E67D" />
      <ComponentRef Id="cmpDB181AE3BD838D4F431CAE12DB40B70A" />
      <ComponentRef Id="cmp0B0A70880E3C505B199705D415235AC7" />
+      <ComponentRef Id="cmp41C1093548579E6BE087DD4BE735B7C5" />
      <ComponentRef Id="cmpD50999EDF5C2480D6F6F6A04E6B127F3" />
+      <ComponentRef Id="cmp5740FF469BE73A073AF9A5DB75C36C8F" />
      <ComponentRef Id="cmpDD19E9A8DE8058599CFC66AF8DB39487" />
+      <ComponentRef Id="cmp6BB67EB735F0C8C23D4B94F0096A19BF" />
      <ComponentRef Id="cmpB8AFC5E7298C4FB423F21E474D718248" />
      <ComponentRef Id="cmp41A0F324C636C03565EFAB5DC1197958" />
      <ComponentRef Id="cmp08025CB77BA01465D21171D27231AE6A" />
--- a/wininstall/i3nt.wxs
+++ b/wininstall/i3nt.wxs
@ -12,9 +12,15 @@
        <Component Id="cmp905F254ECBC3BCB861BBBF60B0F34D73" Guid="*">
          <File Id="fil811C8A53860477F59CD4D11BF7C36A5E" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv951.lib" />
        </Component>
+        <Component Id="cmp43EE1BA94E7D15B5F9721D32B41CDFF1" Guid="*">
+          <File Id="fil3475AECC40E6C77A1E5A74C81205D246" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv951.pdb" />
+        </Component>
        <Component Id="cmp2660425B08191D07FD2B8E4D12C25CAF" Guid="*">
          <File Id="fil6C14AF587FDAABD1440BADC640EEF64E" KeyPath="yes" Source="..\i3nt\bin\i3nt\petite.exe" />
        </Component>
+        <Component Id="cmpAC1ABACB8A49AE94049D935A4287537A" Guid="*">
+          <File Id="filC15378730032D4E1DF3C49336189B52D" KeyPath="yes" Source="..\i3nt\bin\i3nt\petite.pdb" />
+        </Component>
        <Component Id="cmpE28E1FD7F26C181DE59FFBF90644FC76" Guid="*">
          <File Id="filC9140B162E813FF1382AAFCAD00F39F7" KeyPath="yes" Source="..\i3nt\bin\i3nt\scheme.exe">
            <Shortcut Id="cs_i3nt_shortcut"
@ -26,6 +32,9 @@
                      WorkingDirectory="APPLICATIONFOLDER"/>
          </File>
        </Component>
+        <Component Id="cmp96EA6B2AB750C71AA1E52C818D83CAA4">
+          <File Id="filADC31C50E441F5FCF3FD24F2A89DEB6C" Source="..\i3nt\bin\i3nt\scheme.pdb" />
+        </Component>
      </Directory>
    </DirectoryRef>
    <DirectoryRef Id="D_boot">
@ -60,8 +69,11 @@
      <ComponentRef Id="cmp3EAD5F342D86023E323C2F3E96A596B9" />
      <ComponentRef Id="cmpF2410A7AF5FB7C10A33DA57476B0E56B" />
      <ComponentRef Id="cmp905F254ECBC3BCB861BBBF60B0F34D73" />
+      <ComponentRef Id="cmp43EE1BA94E7D15B5F9721D32B41CDFF1" />
      <ComponentRef Id="cmp2660425B08191D07FD2B8E4D12C25CAF" />
+      <ComponentRef Id="cmpAC1ABACB8A49AE94049D935A4287537A" />
      <ComponentRef Id="cmpE28E1FD7F26C181DE59FFBF90644FC76" />
+      <ComponentRef Id="cmp96EA6B2AB750C71AA1E52C818D83CAA4" />
      <ComponentRef Id="cmp47E339F22F1D268C3D889C89DC04B1EC" />
      <ComponentRef Id="cmp97E86E3E78EC5C1E35333413F9D239A9" />
      <ComponentRef Id="cmp4EC08D9AF0D6DADE3077A7EB099476B4" />
--- a/wininstall/ta6nt.wxs
+++ b/wininstall/ta6nt.wxs
@ -12,9 +12,15 @@
        <Component Id="cmp372F759C97C3C69E4C336B81D807E4F5" Guid="*">
          <File Id="fil602A8BBB83416294672AA22507E6452A" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv951.lib" />
        </Component>
+        <Component Id="cmp009F56824D2716FAAC978FE17A4D947D" Guid="*">
+          <File Id="filDD0E7D06D27FC4C00388CB48E4B2818C" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv951.pdb" />
+        </Component>
        <Component Id="cmp50972D99EC9DDA63E4BC6E29DAA592D0" Guid="*">
          <File Id="fil8A260A0B8935F8F9011AA2EDB9147BDE" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\petite.exe" />
        </Component>
+        <Component Id="cmp06CB93AA8B342FF0F33E91AAD7442833" Guid="*">
+          <File Id="fil28785B1496AE7F6C41D003949FC2B161" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\petite.pdb" />
+        </Component>
        <Component Id="cmpDEB15B7CB19176296C92E8032592FDB4" Guid="*">
          <File Id="fil25DA5700F745B21085322BA7CBBEFEB7" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\scheme.exe">
            <Shortcut Id="cs_ta6nt_shortcut"
@ -26,6 +32,9 @@
                      WorkingDirectory="APPLICATIONFOLDER"/>
          </File>
        </Component>
+        <Component Id="cmp11A1080D3E8EBF95EED2BE17CA4E3140" Guid="*">
+          <File Id="filB463198F2BD7379A7E3A758313DBEF30" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\scheme.pdb" />
+        </Component>
      </Directory>
    </DirectoryRef>
    <DirectoryRef Id="D_boot">
@ -60,8 +69,11 @@
      <ComponentRef Id="cmpA67EF6318D00B4209BFCD0BFDCDF781C" />
      <ComponentRef Id="cmpF41FF9DE554F79FB6FBD85E5B80A5221" />
      <ComponentRef Id="cmp372F759C97C3C69E4C336B81D807E4F5" />
+      <ComponentRef Id="cmp009F56824D2716FAAC978FE17A4D947D" />
      <ComponentRef Id="cmp50972D99EC9DDA63E4BC6E29DAA592D0" />
+      <ComponentRef Id="cmp06CB93AA8B342FF0F33E91AAD7442833" />
      <ComponentRef Id="cmpDEB15B7CB19176296C92E8032592FDB4" />
+      <ComponentRef Id="cmp11A1080D3E8EBF95EED2BE17CA4E3140" />
      <ComponentRef Id="cmpCBDB945622604667783C3C57A0427DF5" />
      <ComponentRef Id="cmpD7880184C113065E511275EFD531D589" />
      <ComponentRef Id="cmp5211817ED85951CDAF2FD5E2419BD211" />
--- a/wininstall/ti3nt.wxs
+++ b/wininstall/ti3nt.wxs
@ -12,9 +12,15 @@
        <Component Id="cmpCA1F1C55C49A3A332E60F8D0D78363C2" Guid="*">
          <File Id="filB8607D2BF295249DD6F51070A687E14B" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv951.lib" />
        </Component>
+        <Component Id="cmp01D266C0ECE540BE4BF6E6AE14AFFCBB" Guid="*">
+          <File Id="filE99735E84B4934FC41AAA6BBF547F1C5" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv951.pdb" />
+        </Component>
        <Component Id="cmpC00FD9C7415A1D2D22EA38F5259CAAA4" Guid="*">
          <File Id="fil80D2F31CB0D3B8F98E3C8CCAF9DA6F29" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\petite.exe" />
        </Component>
+        <Component Id="cmp0949B35B6635F6A272D3653F0A7E1C06" Guid="*">
+          <File Id="fil00202A504AF867AFC9C6D2FD59A70835" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\petite.pdb" />
+        </Component>
        <Component Id="cmp10BA4CB7C0EB863E5ADE7BC00B949622" Guid="*">
          <File Id="filE30343224C6DDDA38B98EFAFC66A3E13" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\scheme.exe">
            <Shortcut Id="cs_ti3nt_shortcut"
@ -26,6 +32,9 @@
                      WorkingDirectory="APPLICATIONFOLDER"/>
          </File>
        </Component>
+        <Component Id="cmp13CD3D77D4FA3BAC5500D6A9D0C6F7DB">
+          <File Id="fil38418D3FE9E8C3F883F39363313BB74F" Source="..\ti3nt\bin\ti3nt\scheme.pdb" />
+        </Component>
      </Directory>
    </DirectoryRef>
    <DirectoryRef Id="D_boot">
@ -62,8 +71,11 @@
      <ComponentRef Id="cmp3E51840FF941B7410025EFB2215EAB58" />
      <ComponentRef Id="cmp68BA21E76800BFFA057D33973E89D8F4" />
      <ComponentRef Id="cmpCA1F1C55C49A3A332E60F8D0D78363C2" />
+      <ComponentRef Id="cmp01D266C0ECE540BE4BF6E6AE14AFFCBB" />
      <ComponentRef Id="cmpC00FD9C7415A1D2D22EA38F5259CAAA4" />
+      <ComponentRef Id="cmp0949B35B6635F6A272D3653F0A7E1C06" />
      <ComponentRef Id="cmp10BA4CB7C0EB863E5ADE7BC00B949622" />
+      <ComponentRef Id="cmp13CD3D77D4FA3BAC5500D6A9D0C6F7DB" />
      <ComponentRef Id="cmp7099C9EB3F487AAFE3A880CED21FA9C2" />
      <ComponentRef Id="cmpF3038779EA05930E72A29C15DC2D64B2" />
      <ComponentRef Id="cmp9DDE0523EFC5EEA983DE3CFA0F493908" />