~ chicken-core (chicken-5) 74d080dd35967ed639c470c2c73f64749baba5cb
commit 74d080dd35967ed639c470c2c73f64749baba5cb
Merge: 8f20a795 c4c60ce5
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Mar 8 00:20:37 2017 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Wed Mar 8 00:20:37 2017 +0100
Merge remote-tracking branch 'origin/chicken-5' into chicken-5-new-egg-install
Conflicts:
chicken-install.scm
chicken-status.scm
chicken-uninstall.scm
csc.scm
defaults.make
manual/Extensions
rules.make
setup-api.scm
setup-download.scm
setup.defaults
tests/runtests.sh
diff --cc README
index 6c761d49,573384a1..30a03eb4
--- a/README
+++ b/README
@@@ -314,8 -308,12 +318,8 @@@ _/ _/ _/ _/ _/ _
| | |-- chicken.read-syntax.import.so
| | |-- chicken.tcp.import.so
| | |-- chicken.time.import.so
- | | |-- chicken.utils.import.so
+ | | |-- chicken.time.posix.import.so
| | |-- modules.db
- | | |-- setup-api.import.so
- | | |-- setup-api.so
- | | |-- setup-download.import.so
- | | |-- setup-download.so
| | |-- srfi-4.import.so
| | `-- types.db
| |-- libchicken.a
diff --cc defaults.make
index 3a2bca08,607d0849..e87e956a
--- a/defaults.make
+++ b/defaults.make
@@@ -264,12 -264,14 +264,14 @@@ CHICKEN_PROGRAM_OPTIONS += $(if $(PROFI
# import libraries
PRIMITIVE_IMPORT_LIBRARIES = chicken chicken.csi chicken.foreign
-DYNAMIC_IMPORT_LIBRARIES = setup-api setup-download srfi-4
+DYNAMIC_IMPORT_LIBRARIES = srfi-4
- DYNAMIC_CHICKEN_IMPORT_LIBRARIES = bitwise errno fixnum flonum format \
- gc io keyword locative memory posix pretty-print random time
+ DYNAMIC_CHICKEN_IMPORT_LIBRARIES = bitwise errno file.posix fixnum flonum \
+ format gc io keyword locative memory posix pretty-print process \
+ process.signal random time time.posix
+ DYNAMIC_CHICKEN_COMPILER_IMPORT_LIBRARIES = user-pass
DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation data-structures \
- eval expand files internal irregex lolevel pathname ports \
- read-syntax repl tcp utils
+ eval expand file files internal irregex lolevel pathname port \
+ read-syntax repl tcp
# targets
diff --cc distribution/manifest
index 38996c36,1848d1d3..a73a12e7
--- a/distribution/manifest
+++ b/distribution/manifest
@@@ -314,10 -329,12 +329,10 @@@ chicken.tcp.import.sc
chicken.tcp.import.c
chicken.time.import.scm
chicken.time.import.c
- chicken.utils.import.scm
- chicken.utils.import.c
+ chicken.time.posix.import.scm
+ chicken.time.posix.import.c
srfi-4.import.scm
srfi-4.import.c
-setup-download.scm
-setup-api.scm
chicken-status.scm
chicken-status.c
chicken-install.scm
diff --cc rules.make
index 44e212af,cfdde464..7f26377c
--- a/rules.make
+++ b/rules.make
@@@ -33,11 -33,13 +33,11 @@@ VPATH=$(SRCDIR
# object files
-SETUP_API_OBJECTS_1 = setup-api setup-download
-
LIBCHICKEN_SCHEME_OBJECTS_1 = \
- library eval read-syntax repl data-structures pathname ports files \
- extras lolevel utils tcp srfi-4 continuation $(POSIXFILE) internal \
- irregex scheduler debugger-client profiler stub expand modules \
- chicken-syntax chicken-ffi-syntax build-version
+ library eval read-syntax repl data-structures pathname port file \
+ files extras lolevel tcp srfi-4 continuation $(POSIXFILE) \
+ internal irregex scheduler debugger-client profiler stub expand \
+ modules chicken-syntax chicken-ffi-syntax build-version
LIBCHICKEN_OBJECTS_1 = $(LIBCHICKEN_SCHEME_OBJECTS_1) runtime
LIBCHICKEN_SHARED_OBJECTS = $(LIBCHICKEN_OBJECTS_1:=$(O))
LIBCHICKEN_STATIC_OBJECTS = $(LIBCHICKEN_OBJECTS_1:=-static$(O))
@@@ -640,9 -662,10 +643,9 @@@ chicken-status.c: chicken-status.scm
chicken.format.import.scm \
chicken.irregex.import.scm \
chicken.pathname.import.scm \
- chicken.ports.import.scm \
+ chicken.port.import.scm \
chicken.posix.import.scm \
- chicken.pretty-print.import.scm \
- setup-api.import.scm
+ chicken.pretty-print.import.scm
chicken-install.c: chicken-install.scm \
chicken.data-structures.import.scm \
chicken.files.import.scm \
@@@ -651,17 -674,41 +654,17 @@@
chicken.io.import.scm \
chicken.irregex.import.scm \
chicken.pathname.import.scm \
- chicken.ports.import.scm \
+ chicken.port.import.scm \
chicken.posix.import.scm \
- chicken.pretty-print.import.scm \
- setup-api.import.scm \
- setup-download.import.scm
-chicken-uninstall.c: chicken-uninstall.scm \
- chicken.data-structures.import.scm \
- chicken.foreign.import.scm \
- chicken.format.import.scm \
- chicken.irregex.import.scm \
- chicken.pathname.import.scm \
- chicken.port.import.scm \
- chicken.posix.import.scm \
- setup-api.import.scm
-setup-api.c: setup-api.scm \
- chicken.data-structures.import.scm \
- chicken.files.import.scm \
- chicken.foreign.import.scm \
- chicken.format.import.scm \
- chicken.io.import.scm \
- chicken.irregex.import.scm \
- chicken.pathname.import.scm \
- chicken.posix.import.scm \
chicken.pretty-print.import.scm
-setup-download.c: setup-download.scm \
+chicken-uninstall.c: chicken-uninstall.scm \
chicken.data-structures.import.scm \
- chicken.files.import.scm \
chicken.foreign.import.scm \
chicken.format.import.scm \
- chicken.io.import.scm \
chicken.irregex.import.scm \
chicken.pathname.import.scm \
- chicken.posix.import.scm \
- chicken.tcp.import.scm \
- setup-api.import.scm
+ chicken.ports.import.scm \
+ chicken.posix.import.scm
srfi-4.c: srfi-4.scm \
chicken.bitwise.import.scm \
chicken.expand.import.scm \
diff --cc setup.defaults
index 5f176bc0,d7ec1e74..e8f096fb
--- a/setup.defaults
+++ b/setup.defaults
@@@ -32,8 -28,8 +32,8 @@@
(map
(data-structures
- extras files foreign irregex lolevel ports tcp utils
+ extras files foreign irregex lolevel ports tcp
- posix irregex setup-api setup-download srfi-4
+ posix irregex srfi-4
->) )
Trap