Update of /cvsroot/scsh/scsh-0.6
In directory usw-pr-cvs1:/tmp/cvs-serv29069
Modified Files:
Makefile.in autogen.sh
Log Message:
- Added BUILD_RUNNABLE variable which has to point to a Scheme 48 0.53
executable
- Changed the rule for scsh/scsh.image to make ./go work and added
install-scsh-image to set =scheme48 correctly in the installed version
- Added an additional run of ./configure to autogen to have a Makefile for the
rest
Index: Makefile.in
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Makefile.in 2001/05/22 15:19:35 1.20
--- Makefile.in 2001/05/30 12:13:07 1.21
***************
*** 44,48 ****
$(CC) -g -c $(CPPFLAGS) $(DEFS) -I$(srcdir)/c -I$(srcdir)/cig $(CFLAGS)
-o $@ $<
! RUNNABLE = scheme48
MANPAGE = $(RUNNABLE).$(manext)
LIB = $(libdir)/$(RUNNABLE)
--- 44,52 ----
$(CC) -g -c $(CPPFLAGS) $(DEFS) -I$(srcdir)/c -I$(srcdir)/cig $(CFLAGS)
-o $@ $<
! # BUILD_RUNNABLE has to be Scheme 48 0.53. This is used for builds directly
! # out of the CVS repository.
! # We cannot use Scsh here since -i is not understood.
! BUILD_RUNNABLE = scheme48
! RUNNABLE = scsh
MANPAGE = $(RUNNABLE).$(manext)
LIB = $(libdir)/$(RUNNABLE)
***************
*** 83,88 ****
# therefor according to 2. but we cannot use scsh since -i is not understood
! LINKER_VM = scheme48 $(BIG_HEAP)
! LINKER_RUNNABLE = scheme48
LINKER_IMAGE = build/linker.image
--- 87,92 ----
# therefor according to 2. but we cannot use scsh since -i is not understood
! LINKER_VM = $(BUILD_RUNNABLE) $(BIG_HEAP)
! LINKER_RUNNABLE = $(BUILD_RUNNABLE)
LINKER_IMAGE = build/linker.image
***************
*** 325,332 ****
$(INSTALL_PROGRAM) $(VM) $(LIB)
- inst-image: $(IMAGE)
- $(INSTALL_DATA) $(IMAGE) $(LIB)
-
-
inst-man:
if [ -d $(mandir) -a -w $(mandir) ]; then \
--- 329,332 ----
***************
*** 369,373 ****
inst-script:
! script=$(bindir)/$(RUNNABLE) && \
echo '#!/bin/sh' >$$script && \
echo >>$$script && \
--- 369,373 ----
inst-script:
! script=$(bindir)/$(BUILD_RUNNABLE) &&
\
echo '#!/bin/sh' >$$script && \
echo >>$$script && \
***************
*** 530,534 ****
build/filenames.make: $(PACKAGES)
! $(RUNNABLE) -a batch <build/filenames.scm
# --------------------
--- 530,534 ----
build/filenames.make: $(PACKAGES)
! $(BUILD_RUNNABLE) -a batch <build/filenames.scm
# --------------------
***************
*** 628,632 ****
(echo ,exec ,load misc/load-static.scm; \
echo \(do-it 150000 \"$(srcdir)/scheme/debug/mini1.image\" \"$@\"\)) \
! | $(RUNNABLE) -h 3000000 -a batch
scheme/debug/mini1.image: $(VM) scheme/debug/mini.image
--- 628,632 ----
(echo ,exec ,load misc/load-static.scm; \
echo \(do-it 150000 \"$(srcdir)/scheme/debug/mini1.image\" \"$@\"\)) \
! | $(BUILD_RUNNABLE) -h 3000000 -a batch
scheme/debug/mini1.image: $(VM) scheme/debug/mini.image
***************
*** 653,657 ****
\"$(srcdir)/scheme/vm/data.scm\"
\
\"$(srcdir)/scheme/rts/record.scm\")"
\
! ) | $(RUNNABLE)
# An old version of the above for legacy code.
--- 653,657 ----
\"$(srcdir)/scheme/vm/data.scm\"
\
\"$(srcdir)/scheme/rts/record.scm\")"
\
! ) | $(BUILD_RUNNABLE)
# An old version of the above for legacy code.
***************
*** 667,671 ****
\"$(srcdir)/scheme/vm/arch.scm\"
\
\"$(srcdir)/scheme/vm/data.scm\")"
\
! ) | $(RUNNABLE)
# Generate vm (scheme48vm.c and scheme48heap.c) from VM sources.
--- 667,671 ----
\"$(srcdir)/scheme/vm/arch.scm\"
\
\"$(srcdir)/scheme/vm/data.scm\")"
\
! ) | $(BUILD_RUNNABLE)
# Generate vm (scheme48vm.c and scheme48heap.c) from VM sources.
***************
*** 682,686 ****
echo ',exec ,load compile-gc.scm'; \
echo ',exit' \
! ) | $(RUNNABLE) -h 5000000 && \
mv ../scheme/vm/scheme48vm.c ../scheme/vm/scheme48heap.c ../c
--- 682,686 ----
echo ',exec ,load compile-gc.scm'; \
echo ',exit' \
! ) | $(BUILD_RUNNABLE) -h 5000000 &&
\
mv ../scheme/vm/scheme48vm.c ../scheme/vm/scheme48heap.c ../c
***************
*** 822,826 ****
echo ",load-package scsh"; \
echo ",load-package scsh-here-string-hax"; \
- echo ",translate =scheme48/ $(LIB)/"; \
echo ",load-package list-lib"; \
echo ",load-package string-lib"; \
--- 822,825 ----
***************
*** 841,848 ****
cd ./scsh/regexp; $(MAKE) lib
! install-scsh: scsh
$(RM) $(bindir)/$(RUNNABLE)
$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
- $(INSTALL_PROGRAM) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
--- 840,846 ----
cd ./scsh/regexp; $(MAKE) lib
! install-scsh: scsh install-scsh-image
$(RM) $(bindir)/$(RUNNABLE)
$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
***************
*** 850,853 ****
--- 848,859 ----
for f in $(srcdir)/scsh/*.scm; \
do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
+
+ install-scsh-image:
+ rm -f '/tmp/scsh.image' &&
+ ( echo ',translate =scheme48 $(LIB)'; \
+ echo '(dump-scsh "/tmp/scsh.image")'; \
+ echo ',exit'; \
+ ) | ./$(VM) -i scsh/scsh.image &&
+ $(INSTALL_DATA) /tmp/scsh.image $(LIB)/scsh.image
clean-scsh:
Index: autogen.sh
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** autogen.sh 2001/05/22 15:19:35 1.4
--- autogen.sh 2001/05/30 12:13:07 1.5
***************
*** 1,7 ****
#! /bin/sh
- rm -f config.cache
autoheader
autoconf
touch scsh/*.c
touch build/filenames.scm
--- 1,7 ----
#! /bin/sh
autoheader
autoconf
+ ./configure
touch scsh/*.c
touch build/filenames.scm
***************
*** 12,13 ****
--- 12,14 ----
make linker
make build/initial.image
+ make distclean
|