From 57b0163e933603f1759af5a79896df3c34d6c87b Mon Sep 17 00:00:00 2001 From: Bob Burger Date: Fri, 7 Sep 2018 16:37:57 -0400 Subject: [PATCH] add PDB files for Windows original commit: 6d9bda11c1f8d31bf86c559892cf968d7f0c1595 --- LOG | 2 ++ c/Makefile.a6nt | 14 ++++++-------- c/Makefile.i3nt | 11 ++++++----- c/Makefile.ta6nt | 14 ++++++-------- c/Makefile.ti3nt | 11 ++++++----- c/Mf-a6nt | 1 + c/Mf-i3nt | 1 + c/Mf-ta6nt | 1 + c/Mf-ti3nt | 1 + wininstall/a6nt.wxs | 12 ++++++++++++ wininstall/i3nt.wxs | 12 ++++++++++++ wininstall/ta6nt.wxs | 12 ++++++++++++ wininstall/ti3nt.wxs | 12 ++++++++++++ 13 files changed, 78 insertions(+), 26 deletions(-) diff --git a/LOG b/LOG index 1d394897d3..4d6519bffb 100644 --- a/LOG +++ b/LOG @@ -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 diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt index 2d3291899d..04c9659e71 100644 --- 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 diff --git a/c/Makefile.i3nt b/c/Makefile.i3nt index f69173c405..279558721e 100644 --- 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 diff --git a/c/Makefile.ta6nt b/c/Makefile.ta6nt index f2fcb8d2c0..637f1b4889 100644 --- 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 diff --git a/c/Makefile.ti3nt b/c/Makefile.ti3nt index f386e36d22..8dfa80e6fa 100644 --- 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 diff --git a/c/Mf-a6nt b/c/Mf-a6nt index 71898b46e2..a38cc91f58 100644 --- 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' > $@ diff --git a/c/Mf-i3nt b/c/Mf-i3nt index 855721aa9d..9b37d41d47 100644 --- 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' > $@ diff --git a/c/Mf-ta6nt b/c/Mf-ta6nt index a6e0d94369..5df2d40d0b 100644 --- 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' > $@ diff --git a/c/Mf-ti3nt b/c/Mf-ti3nt index 5503422757..303b0c09ab 100644 --- 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' > $@ diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs index d511ffe1d6..221693e0a6 100755 --- a/wininstall/a6nt.wxs +++ b/wininstall/a6nt.wxs @@ -12,9 +12,15 @@ + + + + + + + + + @@ -60,8 +69,11 @@ + + + diff --git a/wininstall/i3nt.wxs b/wininstall/i3nt.wxs index a4ede0c6af..bc63d1a740 100755 --- a/wininstall/i3nt.wxs +++ b/wininstall/i3nt.wxs @@ -12,9 +12,15 @@ + + + + + + + + + @@ -60,8 +69,11 @@ + + + diff --git a/wininstall/ta6nt.wxs b/wininstall/ta6nt.wxs index ba4f9dc67c..bc65071096 100755 --- a/wininstall/ta6nt.wxs +++ b/wininstall/ta6nt.wxs @@ -12,9 +12,15 @@ + + + + + + + + + @@ -60,8 +69,11 @@ + + + diff --git a/wininstall/ti3nt.wxs b/wininstall/ti3nt.wxs index ef7766a8ec..3ca3ede5f0 100755 --- a/wininstall/ti3nt.wxs +++ b/wininstall/ti3nt.wxs @@ -12,9 +12,15 @@ + + + + + + + + + @@ -62,8 +71,11 @@ + + +