~ chicken-core (chicken-5) 857aae25368f8405c246167021cf1bfd23b4b6fb
commit 857aae25368f8405c246167021cf1bfd23b4b6fb
Author: felix <bunny351@gmail.com>
AuthorDate: Wed Apr 28 08:33:38 2010 +0200
Commit: felix <bunny351@gmail.com>
CommitDate: Wed Apr 28 08:33:38 2010 +0200
reverted nonsensical change in setup-api
diff --git a/manual/Extensions b/manual/Extensions
index 6592a74f..94f5c2c5 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -212,14 +212,14 @@ overwritten. If {{WHICH}} is a list of the form {{OLD NEW}}, then a different fi
==== copy-file
-<procedure>(copy-file* FROM TO)</procedure>
+<procedure>(copy-file FROM TO)</procedure>
Copies the file or directory (recursively) given in the string {{FROM}} to the destination
file or directory {{TO}}.
==== move-file
-<procedure>(move-file* FROM TO)</procedure>
+<procedure>(move-file FROM TO)</procedure>
Moves the file or directory (recursively) given in the string {{FROM}} to the destination
file or directory {{TO}}.
diff --git a/setup-api.scm b/setup-api.scm
index eb056490..01d14967 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -52,8 +52,7 @@
setup-root-directory create-directory/parents
test-compile try-compile run-verbose
extra-features
- copy-file move-file ;XXX DEPRECATED
- copy-file* move-file*
+ copy-file move-file
required-chicken-version required-extension-version cross-chicken
sudo-install keep-intermediates
version>=?
@@ -475,7 +474,7 @@
(else (with-output-to-file setup-file (cut pp info))))
(unless *windows-shell* (run (,*chmod-command* a+r ,(shellpath setup-file)))))))
-(define (copy-file* from to #!optional (err #t) (prefix (installation-prefix)))
+(define (copy-file from to #!optional (err #t) (prefix (installation-prefix)))
;;XXX the prefix handling is completely bogus
(let ((from (if (pair? from) (car from) from))
(to (let ((to-path (if (pair? from) (make-pathname to (cadr from)) to)))
@@ -488,21 +487,17 @@
(run (,*copy-command* ,(shellpath from) ,(shellpath to)))
to))
-(define copy-file copy-file*) ;XXX DEPRECATED
-
(define (path-prefix? pref path)
(string-prefix?
(normalize-pathname pref)
(normalize-pathname path)))
-(define (move-file* from to)
+(define (move-file from to)
(let ((from (if (pair? from) (car from) from))
(to (if (pair? from) (make-pathname to (cadr from)) to)))
(ensure-directory to)
(run (,*move-command* ,(shellpath from) ,(shellpath to)) ) ) )
-(define move-file move-file*) ;XXX DEPRECATED
-
(define (remove-file* dir)
(run (,*remove-command* ,(shellpath dir)) ) )
Trap