suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into no-implicit-fallthrough

Browse Source 
* master:
  fix reference to libc.so to be libc.so.7 for FreeBSD (machine types i3fb, ti3fb, a6fb, ta6fb)   foreign.ms
  adds entry to LOG
  fixes wrong type for iconv
  support Windows build on Bash/WSL
  Add CC option to configure

original commit: 05ddaf8c994a20450104819e06d7c987bbc0acaa
This commit is contained in:
Graham Watt 2017-06-20 19:02:16 -04:00
commit 62055ddbf6
45 changed files with 235 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BUILDING
View File

@ -167,15 +167,18 @@ The make file supports several targets:
WINDOWS WINDOWS
Building Chez Scheme under Windows with Cygwin follows the Building Chez Scheme under Windows with Cygwin or Bash/WSL follows the
instructions above except that make install is not supported: instructions above, except that 'make install' is not supported, and
the 'OS' environment variable must be set to 'Windows_NT' on Bash/WSL
(to indicate a build for Windows, as opposed to a build for Linux on
Windows):
./configure env OS=Windows_NT ./configure
make env OS=Windows_NT make
Prerequisites: Prerequisites:
* Cygwin with bash, grep, make, sed, etc. * Cygwin or Bash/WSL with bash, grep, make, sed, etc.
* Microsoft Visual Studio 2015 * Microsoft Visual Studio 2015
* WiX Toolset (for making an install) * WiX Toolset (for making an install)

15
LOG
View File

@ -511,8 +511,15 @@
cp0.ss, cp0.ss,
misc.ms, misc.ms,
release_notes.stex release_notes.stex
- support Windows build on Bash/WSL
BUILDING, configure, workarea, c/vs.bat (new), mats/vs.bat (new),
c/Mf-*nt, mats/Mf-*, s/Mf-base
- fix c/version.h for FreeBDS (machine types i3fb, ti3fb, a6fb, ta6fb)
- fix reference to libc.so to be libc.so.7 for FreeBSD (machine types
i3fb, ti3fb, a6fb, ta6fb)
foreign.ms
- added CC option to configure for selecting the compiler
configure,
c/Mf-*
- Suppress warnings from implicit fallthrough in case labels. - Suppress warnings from implicit fallthrough in case labels.
Mf-a6{fb,le,nb,ob,osx,s2}, Mf-arm32le, Mf-{a6,arm32,i3,ppc,ta6,ti3,tpp32}le
Mf-i3{fb,le,nb,ob,osx,s2}, Mf-ppc32le,
Mf-ta6{fb,le,nb,ob,osx,s2},
Mf-ti3{fb,le,nb,ob,osx,s2}, Mf-tpp32le

8
c/Mf-a6fb
View File

@ -1,12 +1,12 @@
# Mf-a6fb # Mf-a6fb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses mdclib = -L/usr/local/lib -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-a6le
View File

@ -1,12 +1,12 @@
# Mf-a6le # Mf-a6le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = a6le
Cpu = X86_64 Cpu = X86_64
mdclib = -lm -ldl -lncurses -lrt mdclib = -lm -ldl -lncurses -lrt
C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-a6nb
View File

@ -1,12 +1,12 @@
# Mf-a6nb # Mf-a6nb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include
mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

20
c/Mf-a6nt
View File

@ -25,27 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
include Mf-base include Mf-base
${Scheme}: make.bat ${Scheme}: make.bat
./make.bat cmd.exe /c make.bat
cp ../bin/$m/scheme.exe ../bin/$m/petite.exe cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
vs.bat:
echo '@echo off' > $@
echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
echo 'echo Visual Studio 2015 must be installed.' >> $@
echo 'exit 1' >> $@
echo ':VS' >> $@
echo 'set INCLUDE=' >> $@
echo 'set LIB=' >> $@
echo 'set LIBPATH=' >> $@
echo 'set MACHINETYPE=amd64' >> $@
echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" set MACHINETYPE=x86_amd64' >> $@
echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat" set MACHINETYPE=amd64' >> $@
echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %MACHINETYPE%' >> $@
echo '%*' >> $@
chmod +x $@
make.bat: vs.bat make.bat: vs.bat
echo '@echo off' > $@ echo '@echo off' > $@
echo 'set MAKEFLAGS=' >> $@ echo 'set MAKEFLAGS=' >> $@
echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@ echo 'vs.bat x86_amd64 amd64 && nmake /f Makefile.$m /nologo %*' >> $@
chmod +x $@ chmod +x $@

8
c/Mf-a6ob
View File

@ -1,12 +1,12 @@
# Mf-a6ob # Mf-a6ob
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses mdclib = -L/usr/local/lib -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

2
c/Mf-a6osx
View File

@ -17,7 +17,7 @@ m = a6osx
Cpu = X86_64 Cpu = X86_64
mdclib = -liconv -lm -lncurses mdclib = -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -I/opt/X11/include/ ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-a6s2
View File

@ -1,12 +1,12 @@
# Mf-a6s2 # Mf-a6s2
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = a6s2
Cpu = X86_64 Cpu = X86_64
mdclib = -lnsl -ldl -lm -lcurses -lrt mdclib = -lnsl -ldl -lm -lcurses -lrt
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-arm32le
View File

@ -1,12 +1,12 @@
# Mf-arm32le # Mf-arm32le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = arm32le
Cpu = ARMV6 Cpu = ARMV6
mdclib = -lm -ldl -lncurses -lrt mdclib = -lm -ldl -lncurses -lrt
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS}
o = o o = o
mdsrc = arm32le.c mdsrc = arm32le.c
mdobj = arm32le.o mdobj = arm32le.o

8
c/Mf-i3fb
View File

@ -1,12 +1,12 @@
# Mf-i3fb # Mf-i3fb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses mdclib = -L/usr/local/lib -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-i3le
View File

@ -1,12 +1,12 @@
# Mf-i3le # Mf-i3le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = i3le
Cpu = I386 Cpu = I386
mdclib = -lm -ldl -lncurses -lrt mdclib = -lm -ldl -lncurses -lrt
C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -fno-stack-protector ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -fno-stack-protector ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-i3nb
View File

@ -1,12 +1,12 @@
# Mf-i3nb # Mf-i3nb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

17
c/Mf-i3nt
View File

@ -25,24 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
include Mf-base include Mf-base
${Scheme}: make.bat ${Scheme}: make.bat
./make.bat cmd.exe /c make.bat
cp ../bin/$m/scheme.exe ../bin/$m/petite.exe cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
vs.bat:
echo '@echo off' > $@
echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
echo 'echo Visual Studio 2015 must be installed.' >> $@
echo 'exit 1' >> $@
echo ':VS' >> $@
echo 'set INCLUDE=' >> $@
echo 'set LIB=' >> $@
echo 'set LIBPATH=' >> $@
echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86' >> $@
echo '%*' >> $@
chmod +x $@
make.bat: vs.bat make.bat: vs.bat
echo '@echo off' > $@ echo '@echo off' > $@
echo 'set MAKEFLAGS=' >> $@ echo 'set MAKEFLAGS=' >> $@
echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@ echo 'vs.bat x86 && nmake /f Makefile.$m /nologo %*' >> $@
chmod +x $@ chmod +x $@

8
c/Mf-i3ob
View File

@ -1,12 +1,12 @@
# Mf-i3ob # Mf-i3ob
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses mdclib = -L/usr/local/lib -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -Wno-implicit-fallthrough -O ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-i3osx
View File

@ -1,12 +1,12 @@
# Mf-i3osx # Mf-i3osx
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = i3osx
Cpu = I386 Cpu = I386
mdclib = -liconv -lm -lncurses mdclib = -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-i3s2
View File

@ -1,12 +1,12 @@
# Mf-i3s2 # Mf-i3s2
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = i3s2
Cpu = I386 Cpu = I386
mdclib = -lnsl -ldl -lm -lcurses -lrt mdclib = -lnsl -ldl -lm -lcurses -lrt
C = gcc ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O ${CPPFLAGS} C = ${CC} ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ppc32le
View File

@ -1,12 +1,12 @@
# Mf-ppc32le # Mf-ppc32le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ppc32le
Cpu = PPC32 Cpu = PPC32
mdclib = -lm -ldl -lncurses -lrt mdclib = -lm -ldl -lncurses -lrt
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS}
o = o o = o
mdsrc = ppc32.c mdsrc = ppc32.c
mdobj = ppc32.o mdobj = ppc32.o

8
c/Mf-ta6fb
View File

@ -1,12 +1,12 @@
# Mf-ta6fb # Mf-ta6fb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ta6le
View File

@ -1,12 +1,12 @@
# Mf-ta6le # Mf-ta6le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ta6le
Cpu = X86_64 Cpu = X86_64
mdclib = -lm -ldl -lncurses -lpthread -lrt mdclib = -lm -ldl -lncurses -lpthread -lrt
C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ta6nb
View File

@ -1,12 +1,12 @@
# Mf-ta6nb # Mf-ta6nb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

20
c/Mf-ta6nt
View File

@ -25,27 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
include Mf-base include Mf-base
${Scheme}: make.bat ${Scheme}: make.bat
./make.bat cmd.exe /c make.bat
cp ../bin/$m/scheme.exe ../bin/$m/petite.exe cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
vs.bat:
echo '@echo off' > $@
echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
echo 'echo Visual Studio 2015 must be installed.' >> $@
echo 'exit 1' >> $@
echo ':VS' >> $@
echo 'set INCLUDE=' >> $@
echo 'set LIB=' >> $@
echo 'set LIBPATH=' >> $@
echo 'set MACHINETYPE=amd64' >> $@
echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" set MACHINETYPE=x86_amd64' >> $@
echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat" set MACHINETYPE=amd64' >> $@
echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %MACHINETYPE%' >> $@
echo '%*' >> $@
chmod +x $@
make.bat: vs.bat make.bat: vs.bat
echo '@echo off' > $@ echo '@echo off' > $@
echo 'set MAKEFLAGS=' >> $@ echo 'set MAKEFLAGS=' >> $@
echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@ echo 'vs.bat x86_amd64 amd64 && nmake /f Makefile.$m /nologo %*' >> $@
chmod +x $@ chmod +x $@

8
c/Mf-ta6ob
View File

@ -1,12 +1,12 @@
# Mf-ta6ob # Mf-ta6ob
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = X86_64
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

2
c/Mf-ta6osx
View File

@ -17,7 +17,7 @@ m = ta6osx
Cpu = X86_64 Cpu = X86_64
mdclib = -liconv -lm -lncurses mdclib = -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -I/opt/X11/include/ ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ta6s2
View File

@ -1,12 +1,12 @@
# Mf-ta6s2 # Mf-ta6s2
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ta6s2
Cpu = X86_64 Cpu = X86_64
mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt
C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT ${CFLAGS} C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ti3fb
View File

@ -1,12 +1,12 @@
# Mf-ti3fb # Mf-ti3fb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ti3le
View File

@ -1,12 +1,12 @@
# Mf-ti3le # Mf-ti3le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ti3le
Cpu = I386 Cpu = I386
mdclib = -lm -ldl -lncurses -lpthread -lrt mdclib = -lm -ldl -lncurses -lpthread -lrt
C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ti3nb
View File

@ -1,12 +1,12 @@
# Mf-ti3nb # Mf-ti3nb
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include
mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

17
c/Mf-ti3nt
View File

@ -25,24 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
include Mf-base include Mf-base
${Scheme}: make.bat ${Scheme}: make.bat
./make.bat cmd.exe /c make.bat
cp ../bin/$m/scheme.exe ../bin/$m/petite.exe cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
vs.bat:
echo '@echo off' > $@
echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
echo 'echo Visual Studio 2015 must be installed.' >> $@
echo 'exit 1' >> $@
echo ':VS' >> $@
echo 'set INCLUDE=' >> $@
echo 'set LIB=' >> $@
echo 'set LIBPATH=' >> $@
echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86' >> $@
echo '%*' >> $@
chmod +x $@
make.bat: vs.bat make.bat: vs.bat
echo '@echo off' > $@ echo '@echo off' > $@
echo 'set MAKEFLAGS=' >> $@ echo 'set MAKEFLAGS=' >> $@
echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@ echo 'vs.bat x86 && nmake /f Makefile.$m /nologo %*' >> $@
chmod +x $@ chmod +x $@

8
c/Mf-ti3ob
View File

@ -1,12 +1,12 @@
# Mf-ti3ob # Mf-ti3ob
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,7 +18,7 @@ Cpu = I386
mdinclude = -I/usr/local/include -I/usr/X11R6/include mdinclude = -I/usr/local/include -I/usr/X11R6/include
mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread
C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ti3osx
View File

@ -1,12 +1,12 @@
# Mf-ti3osx # Mf-ti3osx
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ti3osx
Cpu = I386 Cpu = I386
mdclib = -liconv -lm -lncurses mdclib = -liconv -lm -lncurses
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-ti3s2
View File

@ -1,12 +1,12 @@
# Mf-ti3s2 # Mf-ti3s2
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = ti3s2
Cpu = I386 Cpu = I386
mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
o = o o = o
mdsrc = i3le.c mdsrc = i3le.c
mdobj = i3le.o mdobj = i3le.o

8
c/Mf-tppc32le
View File

@ -1,12 +1,12 @@
# Mf-tppc32le # Mf-tppc32le
# Copyright 1984-2017 Cisco Systems, Inc. # Copyright 1984-2017 Cisco Systems, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -17,7 +17,7 @@ m = tppc32le
Cpu = PPC32 Cpu = PPC32
mdclib = -lm -ldl -lncurses -lpthread -lrt mdclib = -lm -ldl -lncurses -lpthread -lrt
C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o o = o
mdsrc = ppc32le.c mdsrc = ppc32le.c
mdobj = ppc32le.o mdobj = ppc32le.o

2
c/version.h
View File

@ -140,7 +140,7 @@ typedef int tputsputcchar;
#define NSECATIME(sb) (sb).st_atimespec.tv_nsec #define NSECATIME(sb) (sb).st_atimespec.tv_nsec
#define NSECCTIME(sb) (sb).st_ctimespec.tv_nsec #define NSECCTIME(sb) (sb).st_ctimespec.tv_nsec
#define NSECMTIME(sb) (sb).st_mtimespec.tv_nsec #define NSECMTIME(sb) (sb).st_mtimespec.tv_nsec
#define ICONV_INBUF_TYPE const char ** #define ICONV_INBUF_TYPE char **
#define UNUSED __attribute__((__unused__)) #define UNUSED __attribute__((__unused__))
#endif #endif

39
c/vs.bat Normal file
View File

@ -0,0 +1,39 @@
@echo off
:: Set up Visual Studio command line environment variables given a
:: sequence of machine types to try ("x86", "x86_amd64", and "amd64").
:: Note: VS 11.0 (2012) and earlier won't work, because they
:: don't support C99 mid-block declarations. Also, there's no
:: such thing as VS 13.0.
:: Clear environment variables that we might otherwise inherit
set INCLUDE=
set LIB=
set LIBPATH=
:: Find visual studio
set VCDIR=%VS140COMNTOOLS%\..\..\vc
if not exist "%VCDIR%\vcvarsall.bat" set VCDIR=%VS120COMNTOOLS%\..\..\vc
:: Loop to find a requested machine type
if exist "%VCDIR%\vcvarsall.bat" goto :VCDIR
echo Could not find Visual Studio installed.
exit 1
:VCDIR
set MACHINETYPE=%1
if "%MACHINETYPE%" neq "" goto :MACHINE
echo Could not find working machine type.
exit 1
:MACHINE
if "%MACHINETYPE%" == "x86" goto :VS
if exist "%VCDIR%\bin\%MACHINETYPE%\vcvars%MACHINETYPE%.bat" goto :VS
shift
goto :VCDIR
:: Set environment variables
:VS
"%VCDIR%\vcvarsall.bat" %MACHINETYPE%

15
configure vendored
View File

@ -37,11 +37,20 @@ installman=""
installschemename="scheme" installschemename="scheme"
installpetitename="petite" installpetitename="petite"
installscriptname="scheme-script" installscriptname="scheme-script"
: ${CC:="gcc"}
: ${CPPFLAGS:=""} : ${CPPFLAGS:=""}
: ${CFLAGS:=""} : ${CFLAGS:=""}
: ${LDFLAGS:=""} : ${LDFLAGS:=""}
case `uname` in # On WSL, set OS to "Windows_NT" to create a Windows
# build instead of a Linux (on Windows) build:
if [ "$OS" = "Windows_NT" ] ; then
CONFIG_UNAME="CYGWIN_NT-"
else
CONFIG_UNAME=`uname`
fi
case "${CONFIG_UNAME}" in
Linux) Linux)
if uname -a | egrep 'i386|i686|amd64|athlon|x86_64' > /dev/null 2>&1 ; then if uname -a | egrep 'i386|i686|amd64|athlon|x86_64' > /dev/null 2>&1 ; then
m32=i3le m32=i3le
@ -191,6 +200,9 @@ while [ $# != 0 ] ; do
--help) --help)
help=yes help=yes
;; ;;
CC=*)
CC=`echo $1 | sed -e 's/^CC=//'`
;;
CPPFLAGS=*) CPPFLAGS=*)
CPPFLAGS=`echo $1 | sed -e 's/^CPPFLAGS=//'` CPPFLAGS=`echo $1 | sed -e 's/^CPPFLAGS=//'`
;; ;;
@ -348,6 +360,7 @@ cat > $w/c/config.h << END
END END
cat > $w/c/Mf-config << END cat > $w/c/Mf-config << END
CC=$CC
CPPFLAGS=$CPPFLAGS CPPFLAGS=$CPPFLAGS
CFLAGS=$CFLAGS CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS LDFLAGS=$LDFLAGS

4
mats/Mf-a6nt
View File

@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for
include Mf-base include Mf-base
foreign1.so: $(fsrc) foreign1.so: $(fsrc)
../c/vs.bat cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc) cmd.exe /c "vs.bat x86_amd64 amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc)"
cat_flush: cat_flush.c cat_flush: cat_flush.c
../c/vs.bat cl /DWIN32 /DX86_64 /MD /nologo $< cmd.exe /c "vs.bat x86_amd64 amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<"

10
mats/Mf-base
View File

@ -39,9 +39,17 @@ ifeq (${OS},Windows_NT)
else else
dirsep = : dirsep = :
endif endif
# Explicit ".exe" needed for WSL
ifeq ($(OS),Windows_NT)
ExeSuffix = .exe
else
ExeSuffix =
endif
# Scheme is the scheme executable to test, and SCHEMEHEAPDIRS tells # Scheme is the scheme executable to test, and SCHEMEHEAPDIRS tells
# it where to find its boot files # it where to find its boot files
Scheme = ../bin/$m/scheme Scheme = ../bin/$m/scheme${ExeSuffix}
export SCHEMEHEAPDIRS=.${dirsep}../boot/%m export SCHEMEHEAPDIRS=.${dirsep}../boot/%m
# Include is the directory holding scheme.h. # Include is the directory holding scheme.h.

4
mats/Mf-i3nt
View File

@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for
include Mf-base include Mf-base
foreign1.so: $(fsrc) foreign1.so: $(fsrc)
../c/vs.bat cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc) cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc)"
cat_flush: cat_flush.c cat_flush: cat_flush.c
../c/vs.bat cl /DWIN32 /MD /nologo $< cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<"

4
mats/Mf-ta6nt
View File

@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for
include Mf-base include Mf-base
foreign1.so: $(fsrc) foreign1.so: $(fsrc)
../c/vs.bat cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc) cmd.exe /c "vs.bat x86_amd64 amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc)"
cat_flush: cat_flush.c cat_flush: cat_flush.c
../c/vs.bat cl /DWIN32 /DX86_64 /MD /nologo $< cmd.exe /c "vs.bat x86_amd64 amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<"

4
mats/Mf-ti3nt
View File

@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for
include Mf-base include Mf-base
foreign1.so: $(fsrc) foreign1.so: $(fsrc)
../c/vs.bat cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc) cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv941.lib $(fsrc)"
cat_flush: cat_flush.c cat_flush: cat_flush.c
../c/vs.bat cl /DWIN32 /MD /nologo $< cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<"

14
mats/foreign.ms
View File

@ -176,7 +176,7 @@
(+ v ...))))))))) (+ v ...)))))))))
(machine-case (machine-case
[(i3ob ti3ob a6ob ta6ob i3fb ti3fb a6fb ta6fb a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx) [(i3ob ti3ob a6ob ta6ob a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx)
(mat load-shared-object (mat load-shared-object
(file-exists? "foreign1.so") (file-exists? "foreign1.so")
(begin (load-shared-object "./foreign1.so") #t) (begin (load-shared-object "./foreign1.so") #t)
@ -192,6 +192,14 @@
(error? (load-shared-object 3)) (error? (load-shared-object 3))
) )
] ]
[(i3fb ti3fb a6fb ta6fb)
(mat load-shared-object
(file-exists? "foreign1.so")
(begin (load-shared-object "./foreign1.so") #t)
(begin (load-shared-object "libc.so.7") #t)
(error? (load-shared-object 3))
)
]
[(i3nb ti3nb a6nb ta6nb) [(i3nb ti3nb a6nb ta6nb)
(mat load-shared-object (mat load-shared-object
(file-exists? "foreign1.so") (file-exists? "foreign1.so")
@ -2582,10 +2590,12 @@
(begin (begin
(define load-libc (define load-libc
(machine-case (machine-case
[(i3ob ti3ob a6ob ta6ob i3fb ti3fb a6fb ta6fb a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx i3nb ti3nb a6nb ta6nb) [(i3ob ti3ob a6ob ta6ob a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx i3nb ti3nb a6nb ta6nb)
'(load-shared-object "libc.so")] '(load-shared-object "libc.so")]
[(i3le ti3le a6le ta6le arm32le tarm32le ppc32le tppc32le) [(i3le ti3le a6le ta6le arm32le tarm32le ppc32le tppc32le)
'(load-shared-object "libc.so.6")] '(load-shared-object "libc.so.6")]
[(i3fb ti3fb a6fb ta6fb)
'(load-shared-object "libc.so.7")]
[(i3nt ti3nt a6nt ta6nt) [(i3nt ti3nt a6nt ta6nt)
'(load-shared-object "msvcrt.dll")] '(load-shared-object "msvcrt.dll")]
[(i3osx ti3osx a6osx ta6osx) [(i3osx ti3osx a6osx ta6osx)

3
mats/vs.bat Normal file
View File

@ -0,0 +1,3 @@
:: Redirect to "..\c\vs.bat" without having to use
:: backslashes in the makefile
..\c\vs.bat %*

11
s/Mf-base
View File

@ -67,10 +67,17 @@ gic = f
# pps determines whether pass timings are printed # pps determines whether pass timings are printed
pps = f pps = f
# Explicit ".exe" needed for WSL
ifeq ($(OS),Windows_NT)
ExeSuffix = .exe
else
ExeSuffix =
endif
# The following control where files sit and typically don't need to be changed, except # The following control where files sit and typically don't need to be changed, except
# that Scheme and SCHEMEHEAPDIRS are set by Mf-cross to point to the host Scheme # that Scheme and SCHEMEHEAPDIRS are set by Mf-cross to point to the host Scheme
# implementation # implementation
Scheme = ../bin/$m/scheme Scheme = ../bin/$m/scheme${ExeSuffix}
export SCHEMEHEAPDIRS=../boot/%m export SCHEMEHEAPDIRS=../boot/%m
# Define the libdirs separator character # Define the libdirs separator character
@ -278,7 +285,7 @@ checkboot:
'(#%$$fasl-file-equal? "../boot/$m/sbb" "../boot/$m/petite.boot" #t)'\ '(#%$$fasl-file-equal? "../boot/$m/sbb" "../boot/$m/petite.boot" #t)'\
'(#%$$fasl-file-equal? "../boot/$m/scb" "../boot/$m/scheme.boot" #t)'\ '(#%$$fasl-file-equal? "../boot/$m/scb" "../boot/$m/scheme.boot" #t)'\
'(printf "bootfile comparison succeeded\n"))'\ '(printf "bootfile comparison succeeded\n"))'\
| ../bin/$m/scheme -b ../boot/$m/sbb -q | ../bin/$m/scheme${ExeSuffix} -b ../boot/$m/sbb -q
xcheckboot: ${macroobj} ${patchfile} xcheckboot: ${macroobj} ${patchfile}
@echo '(reset-handler abort)'\ @echo '(reset-handler abort)'\

11
workarea
View File

@ -133,6 +133,12 @@ fi
if [ ! -e $W/c/Mf-config ] ; then if [ ! -e $W/c/Mf-config ] ; then
touch $W/c/Mf-config touch $W/c/Mf-config
fi fi
case $M in
*nt)
(cd $W/c; workln ../../c/vs.bat vs.bat)
;;
esac
workdir $W/s workdir $W/s
(cd $W/s; workln ../../s/Mf-$M Mf-$M) (cd $W/s; workln ../../s/Mf-$M Mf-$M)
@ -147,6 +153,11 @@ workdir $W/mats
(cd $W/mats; forceworkln Mf-$M Makefile) (cd $W/mats; forceworkln Mf-$M Makefile)
(cd $W/mats; workln ../../mats/Mf-base Mf-base) (cd $W/mats; workln ../../mats/Mf-base Mf-base)
(cd $W/mats; workln ../../mats/Mf-exobj Mf-exobj) (cd $W/mats; workln ../../mats/Mf-exobj Mf-exobj)
case $M in
*nt)
(cd $W/mats; workln ../../mats/vs.bat vs.bat)
;;
esac
for dir in `echo examples unicode` ; do for dir in `echo examples unicode` ; do
workdir $W/$dir workdir $W/$dir