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

remove core dependency on `mzlib/restart'

Browse Source
This commit is contained in:
Matthew Flatt 2013-07-10 10:30:23 -06:00
parent 8d3c09b38b
commit 2a4f32d853
3 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
racket/lib/collects/mzlib/restart.rkt → pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt
View File

68
racket/src/worksp/gc2/make.rkt
View File

@ -2,8 +2,7 @@
(use-compiled-file-paths null)
(require mzlib/restart
racket/system)
(require racket/system)
(define (system- s)
(eprintf "~a\n" s)
@ -106,37 +105,42 @@
(if (file-exists? deps)
(with-input-from-file deps read)
null))))))
(unless (parameterize ([use-compiled-file-paths (list "compiled")])
(restart-mzscheme #() (lambda (x) x)
(list->vector
(append
(list "-u"
"../../racket/gc2/xform.rkt"
"--setup"
".")
(if objdest
(if use-precomp
(list "--precompiled" use-precomp)
null)
(list "--precompile"))
(if indirect?
'("--indirect")
null)
(list
"--depends"
"--cpp"
(format "~a /MT /E ~a ~a ~a"
cl.exe
common-cpp-defs
expand-extra-flags
includes)
"-o"
dest
src)))
void))
(define success? #f)
(sync
(thread
(lambda ()
(parameterize ([use-compiled-file-paths (list "compiled")]
[current-namespace (make-base-namespace)]
[current-command-line-arguments
(list->vector
(append
(list "--setup"
".")
(if objdest
(if use-precomp
(list "--precompiled" use-precomp)
null)
(list "--precompile"))
(if indirect?
'("--indirect")
null)
(list
"--depends"
"--cpp"
(format "~a /MT /E ~a ~a ~a"
cl.exe
common-cpp-defs
expand-extra-flags
includes)
"-o"
dest
src)))])
(dynamic-require "../../racket/gc2/xform.rkt" #f)
(set! success? #t)))))
(unless success?
(when (file-exists? dest)
(delete-file dest))
(error "error xforming")))
(delete-file dest))
(error "error xforming")))
(when objdest
(c-compile dest objdest null (string-append
extra-compile-flags

40
racket/src/worksp/mzcom/xform.rkt
View File

@ -1,31 +1,25 @@
#lang scheme/base
(use-compiled-file-paths null)
(require mzlib/restart)
(define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32 /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0")
(define includes "/I ../../racket/include /I . /I .. /I ../../mzcom")
(define (xform src dest)
(parameterize ([use-compiled-file-paths (list "compiled")])
(restart-mzscheme #() (lambda (x) x)
(list->vector
(append
(list "-u"
"../../racket/gc2/xform.rkt"
"--setup"
"../gc2"
"--indirect"
"--depends")
(list
"--cpp"
(format "cl.exe /MT /E ~a ~a"
cpp-flags
includes)
"-o"
dest
src)))
void)))
(parameterize ([use-compiled-file-paths (list "compiled")]
[current-command-line-arguments
(list->vector
(append
(list "--setup"
"../gc2"
"--indirect"
"--depends")
(list
"--cpp"
(format "cl.exe /MT /E ~a ~a"
cpp-flags
includes)
"-o"
dest
src)))])
(dynamic-require "../../racket/gc2/xform.rkt" #f)))
(xform "../../mzcom/mzobj.cxx" "../../mzcom/mzobj3m.cxx")