fix bad uses of installer argument
svn: r2939
This commit is contained in:
parent
aaa9a18c77
commit
36f0720c5a
|
@ -1,9 +1,10 @@
|
||||||
(module installer mzscheme
|
(module installer mzscheme
|
||||||
(require (lib "process.ss"))
|
(require (lib "process.ss")
|
||||||
|
(lib "dirs.ss" "setup"))
|
||||||
(provide post-installer)
|
(provide post-installer)
|
||||||
(define (post-installer plt-home)
|
(define (post-installer plt-home)
|
||||||
(define (make-dll-path . more)
|
(define (make-dll-path . more)
|
||||||
(apply build-path plt-home "lib" more))
|
(apply build-path (find-dll-dir) more))
|
||||||
(define (warn fmt . args) (apply fprintf (current-error-port) fmt args))
|
(define (warn fmt . args) (apply fprintf (current-error-port) fmt args))
|
||||||
(let* ([dlls '("myspage.dll" "myssink.dll")]
|
(let* ([dlls '("myspage.dll" "myssink.dll")]
|
||||||
[dll-paths (map make-dll-path dlls)]
|
[dll-paths (map make-dll-path dlls)]
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
(module installer mzscheme
|
(module installer mzscheme
|
||||||
(require (lib "process.ss"))
|
(require (lib "process.ss")
|
||||||
|
(lib "dirs.ss" "setup"))
|
||||||
(provide post-installer)
|
(provide post-installer)
|
||||||
(define (post-installer plt-home)
|
(define (post-installer plt-home)
|
||||||
(let ([exe "MzCOM.exe"])
|
(let ([exe "MzCOM.exe"])
|
||||||
(cond [(not (eq? (system-type) 'windows))
|
(cond [(not (eq? (system-type) 'windows))
|
||||||
(printf "Warning: can't install MzCOM on non-Windows machine\n")]
|
(printf "Warning: can't install MzCOM on non-Windows machine\n")]
|
||||||
[(not (file-exists? (build-path plt-home exe)))
|
[(not (file-exists? (build-path (find-console-bin-dir) exe)))
|
||||||
(printf "Warning: MzCOM binary not installed\n")]
|
(printf "Warning: MzCOM binary not installed\n")]
|
||||||
[else (parameterize ([current-directory plt-home])
|
[else (parameterize ([current-directory (find-console-bin-dir)])
|
||||||
(system* exe "/RegServer"))]))))
|
(system* exe "/RegServer"))]))))
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
(module makefile mzscheme
|
(module makefile mzscheme
|
||||||
(require (lib "make.ss" "make")
|
(require (lib "make.ss" "make")
|
||||||
|
(lib "dirs.ss" "setup")
|
||||||
"make-gl-info.ss")
|
"make-gl-info.ss")
|
||||||
|
|
||||||
(provide pre-installer)
|
(provide pre-installer)
|
||||||
|
@ -12,6 +13,6 @@
|
||||||
(make-print-checking #f))
|
(make-print-checking #f))
|
||||||
(make/proc
|
(make/proc
|
||||||
`((,(build-path dir "gl-info.zo")
|
`((,(build-path dir "gl-info.zo")
|
||||||
("make-gl-info.ss" ,(build-path home "include" "schvers.h"))
|
("make-gl-info.ss" ,(build-path (find-include-dir) "schvers.h"))
|
||||||
,(lambda () (make-gl-info dir home)))))))
|
,(lambda () (make-gl-info dir home)))))))
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user