From 73ecb0cd4ba3638dab4af3d2f7b7812bf0156deb Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Mon, 16 May 2016 14:42:33 -0400 Subject: [PATCH] - updated the Windows makefiles for building and testing to remove links for files that no longer exist, which was getting in the way of creating links for files that do exist. Also updated the build batch file for Windows to compile the nanopass framework separately before building the rest of the scheme compiler and libraries. s/Mf-{a6,i3,ta6,ti3}nt, s/bldnt.bat, mats/Mf-{a6,i3,ta6,ti3}nt - updated the read me to include a link to the Chez Scheme project page. README.md original commit: 969fbf3b69f4ac9729847bae80dab92464b6d08c --- LOG | 9 +++++++++ README.md | 2 ++ mats/Mf-a6nt | 2 +- mats/Mf-i3nt | 2 +- mats/Mf-ta6nt | 2 +- mats/Mf-ti3nt | 2 +- s/Mf-a6nt | 2 +- s/Mf-i3nt | 2 +- s/Mf-ta6nt | 2 +- s/Mf-ti3nt | 2 +- s/bldnt.bat | 1 + 11 files changed, 20 insertions(+), 8 deletions(-) diff --git a/LOG b/LOG index c407f147e3..ebaa64b95b 100644 --- a/LOG +++ b/LOG @@ -148,3 +148,12 @@ structure on windows does not have the tm_gmtoff field used in the mac and linux version of the code. stats.c +- updated the Windows makefiles for building and testing to remove links for + files that no longer exist, which was getting in the way of creating links + for files that do exist. Also updated the build batch file for Windows to + compile the nanopass framework separately before building the rest of the + scheme compiler and libraries. + s/Mf-{a6,i3,ta6,ti3}nt, s/bldnt.bat, + mats/Mf-{a6,i3,ta6,ti3}nt +- updated the read me to include a link to the Chez Scheme project page. + README.md diff --git a/README.md b/README.md index 603f982891..e964b6953d 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ The compiler generates native code for each target processor, with support for x86, x86_64, and 32-bit PowerPC architectures. Get started by [Building Chez Scheme](BUILDING). + +For more information see the [Chez Schem Project Page](http://cisco.github.io/ChezScheme/) diff --git a/mats/Mf-a6nt b/mats/Mf-a6nt index 3e1cf44eee..59a8ad4a4b 100644 --- a/mats/Mf-a6nt +++ b/mats/Mf-a6nt @@ -19,7 +19,7 @@ fsrc = foreign1.c foreign2.c foreign3.c ftmp = foreign1.obj foreign2.obj foreign3.obj fobj = foreign1.so mdclean = ${ftmp} foreign1.exp foreign1.lib make.bat cat_flush.obj cat_flush.exe libiconv-2.dll -mdsrc = bld$m.bat bldnt.bat clean.bat make.bat libiconv-2.dll +mdsrc = bldnt.bat MSDOS = 1 diff --git a/mats/Mf-i3nt b/mats/Mf-i3nt index 097299ef34..9622908a41 100644 --- a/mats/Mf-i3nt +++ b/mats/Mf-i3nt @@ -19,7 +19,7 @@ fsrc = foreign1.c foreign2.c foreign3.c ftmp = foreign1.obj foreign2.obj foreign3.obj fobj = foreign1.so mdclean = ${ftmp} foreign1.exp foreign1.lib make.bat cat_flush.obj cat_flush.exe libiconv-2.dll -mdsrc = bld$m.bat bldnt.bat clean.bat make.bat libiconv-2.dll +mdsrc = bldnt.bat MSDOS = 1 diff --git a/mats/Mf-ta6nt b/mats/Mf-ta6nt index a18e6b185c..e8d579d1f1 100644 --- a/mats/Mf-ta6nt +++ b/mats/Mf-ta6nt @@ -19,7 +19,7 @@ fsrc = foreign1.c foreign2.c foreign3.c ftmp = foreign1.obj foreign2.obj foreign3.obj fobj = foreign1.so mdclean = ${ftmp} foreign1.exp foreign1.lib make.bat cat_flush.obj cat_flush.exe libiconv-2.dll -mdsrc = bld$m.bat bldnt.bat clean.bat make.bat libiconv-2.dll +mdsrc = bldnt.bat MSDOS = 1 diff --git a/mats/Mf-ti3nt b/mats/Mf-ti3nt index 21e0bb282a..121d7cedc7 100644 --- a/mats/Mf-ti3nt +++ b/mats/Mf-ti3nt @@ -19,7 +19,7 @@ fsrc = foreign1.c foreign2.c foreign3.c ftmp = foreign1.obj foreign2.obj foreign3.obj fobj = foreign1.so mdclean = ${ftmp} foreign1.exp foreign1.lib make.bat cat_flush.obj cat_flush.exe libiconv-2.dll -mdsrc = bld$m.bat bldnt.bat clean.bat make.bat libiconv-2.dll +mdsrc = bldnt.bat MSDOS = 1 diff --git a/s/Mf-a6nt b/s/Mf-a6nt index e3c1bb7338..7302b45c5c 100644 --- a/s/Mf-a6nt +++ b/s/Mf-a6nt @@ -15,6 +15,6 @@ m = a6nt archincludes = x86_64.ss -buildsrc = bld$m.bat bldnt.bat clean.bat +buildsrc = bldnt.bat include Mf-base diff --git a/s/Mf-i3nt b/s/Mf-i3nt index f0c2aff7ba..82cc2a80da 100644 --- a/s/Mf-i3nt +++ b/s/Mf-i3nt @@ -15,6 +15,6 @@ m = i3nt archincludes = x86.ss -buildsrc = bld$m.bat bldnt.bat clean.bat +buildsrc = bldnt.bat include Mf-base diff --git a/s/Mf-ta6nt b/s/Mf-ta6nt index ff82f3e677..02f3acbea5 100644 --- a/s/Mf-ta6nt +++ b/s/Mf-ta6nt @@ -15,6 +15,6 @@ m = ta6nt archincludes = x86_64.ss -buildsrc = bld$m.bat bldnt.bat clean.bat +buildsrc = bldnt.bat include Mf-base diff --git a/s/Mf-ti3nt b/s/Mf-ti3nt index 1dc6a37213..faa136cbd5 100644 --- a/s/Mf-ti3nt +++ b/s/Mf-ti3nt @@ -15,6 +15,6 @@ m = ti3nt archincludes = x86.ss -buildsrc = bld$m.bat bldnt.bat clean.bat +buildsrc = bldnt.bat include Mf-base diff --git a/s/bldnt.bat b/s/bldnt.bat index aec349e8ba..c77e993114 100644 --- a/s/bldnt.bat +++ b/s/bldnt.bat @@ -4,4 +4,5 @@ echo (reset-handler abort) (base-exception-handler (lambda (c) (fresh-line) (dis echo (reset-handler abort) (base-exception-handler (lambda (c) (fresh-line) (display-condition c) (newline) (abort))) (case-sensitive #t) (optimize-level 2) (current-expand sc-expand) (generate-inspector-information #f) (subset-mode 'system) (compile-file "priminfo.ss" "priminfo.so") | ..\bin\%1\scheme -q --libdirs ..;. cmacros.so echo (reset-handler abort) (base-exception-handler (lambda (c) (fresh-line) (display-condition c) (newline) (abort))) (case-sensitive #t) (optimize-level 2) (current-expand sc-expand) (subset-mode 'system) (compile-file "primvars.ss" "primvars.so") | ..\bin\%1\scheme -q --libdirs ..;. cmacros.so priminfo.so echo (reset-handler abort) (base-exception-handler (lambda (c) (fresh-line) (display-condition c) (newline) (abort))) (case-sensitive #t) (optimize-level 2) (current-expand sc-expand) (subset-mode 'system) (compile-file "setup.ss" "setup.so") | ..\bin\%1\scheme -q --libdirs ..;. cmacros.so priminfo.so +echo (reset-handler abort) (base-exception-handler (lambda (c) (fresh-line) (display-condition c) (newline) (abort))) (case-sensitive #t) (optimize-level 2) (current-expand sc-expand) (generate-inspector-information #f) (collect-trip-bytes (expt 2 24)) (collect-request-handler (lambda () (collect 0 1))) (collect 1 2) (compile-library "../nanopass/nanopass.ss" "nanopass.so") | ..\bin\%1\scheme -q --libdirs "..\nanopass;;." --compile-imported-libraries ..\bin\%1\scheme -q --libdirs ..;. cmacros.so priminfo.so primvars.so setup.so --script script.all