From 66b32b4bee77bf4e751f5e6b58e77b2ca474057e Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 17 May 2010 07:11:32 -0600 Subject: [PATCH] rackety Mac resources and out-of-memory message --- src/gracket/gracket.cxx | 2 +- src/mac/cw/GRacket.r | 33 ++++++++++++++++----------------- src/mac/osx_appl.rkt | 2 +- src/mac/racket/simpledrop.cpp | 2 +- src/racket/src/salloc.c | 2 +- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/gracket/gracket.cxx b/src/gracket/gracket.cxx index 72594a4ca1..481a83c6c5 100644 --- a/src/gracket/gracket.cxx +++ b/src/gracket/gracket.cxx @@ -2903,7 +2903,7 @@ static void MrEdOutOfMemory(void) #ifdef wx_msw wxNoMoreCallbacks(); MessageBox(NULL, - "PLT Scheme virtual machine is out of memory. Aborting.", + "Racket virtual machine is out of memory. Aborting.", "Out of Memory", MB_OK); #endif diff --git a/src/mac/cw/GRacket.r b/src/mac/cw/GRacket.r index 3105b679b8..69b60367e2 100644 --- a/src/mac/cw/GRacket.r +++ b/src/mac/cw/GRacket.r @@ -7,26 +7,25 @@ data 'DITL' (100) { data 'DITL' (129) { $"0003 0000 0000 0016 0182 002A 01C6 0402" /* .........‚.*.Ζ.. */ $"4F4B 0000 0000 0004 0006 0089 008A C002" /* OK.........‰.Šΐ. */ - $"0081 0000 0000 0018 008F 0048 0170 8844" /* .........H.pˆD */ - $"4372 6561 7465 6420 7769 7468 2050 4C54" /* Created with PLT */ - $"2053 6368 656D 650D A920 3230 3034 2D32" /* Scheme.© 2004-2 */ - $"3030 3920 504C 5420 5363 6865 6D65 2049" /* 009 PLT Scheme I */ - $"6E63 2E20 0DA9 2031 3939 352D 3230 3033" /* nc. .© 1995-2003 */ - $"2050 4C54 0000 0000 004D 008F 0089 018F" /* PLT.....M..‰. */ - $"884E 466F 7220 7570 2D74 6F2D 6461 7465" /* ˆNFor up-to-date */ - $"2069 6E66 6F72 6D61 7469 6F6E 2061 626F" /* information abo */ - $"7574 2050 4C54 2053 6368 656D 652C 2073" /* ut PLT Scheme, s */ - $"6565 0D20 2020 6874 7470 3A2F 2F77 7777" /* ee. http://www */ - $"2E70 6C74 2D73 6368 656D 652E 6F72 672F" /* .plt-scheme.org/ */ + $"0081 0000 0000 0018 008F 0048 0170 882A" /* .........H.pˆ* */ + $"4372 6561 7465 6420 7769 7468 2052 6163" /* Created with Rac */ + $"6B65 740D A920 3230 3130 2050 4C54 2053" /* ket.© 2010 PLT S */ + $"6368 656D 6520 496E 632E 0000 0000 004D" /* cheme Inc......M */ + $"008F 0089 018F 884A 466F 7220 7570 2D74" /* ..‰.ˆJFor up-t */ + $"6F2D 6461 7465 2069 6E66 6F72 6D61 7469" /* o-date informati */ + $"6F6E 2061 626F 7574 2052 6163 6B65 742C" /* on about Racket, */ + $"7365 650D 2020 2068 7474 703A 2F2F 7777" /* see. http://ww */ + $"772E 7261 636B 6574 2D6C 616E 672E 6F72" /* w.racket-lang.or */ + $"672F" /* g/ */ }; data 'DITL' (101, preload) { $"0001 0000 0000 004E 009C 0062 00D6 0404" /* .......N.œ.b.Φ.. */ $"5175 6974 0000 0000 000E 0022 003F 015C" /* Quit.......".?.\ */ - $"883A 5468 6520 504C 5420 5363 6865 6D65" /* ˆ:The PLT Scheme */ - $"2076 6972 7475 616C 206D 6163 6869 6E65" /* virtual machine */ - $"2069 7320 6F75 7420 6F66 206D 656D 6F72" /* is out of memor */ - $"792E 2041 626F 7274 696E 672E" /* y. Aborting. */ + $"8836 5468 6520 5261 636B 6574 2076 6972" /* ˆ6The Racket vir */ + $"7475 616C 206D 6163 6869 6E65 2069 7320" /* tual machine is */ + $"6F75 7420 6F66 206D 656D 6F72 792E 2041" /* out of memory. A */ + $"626F 7274 696E 672E" /* borting. */ }; data 'DITL' (128) { @@ -576,8 +575,8 @@ data 'PICT' (129) { data 'DLOG' (129) { $"0051 0046 00E8 0213 0001 0100 0100 0000" /* .Q.F.θ.......... */ - $"0000 0081 1041 626F 7574 2050 4C54 2053" /* ....About PLT S */ - $"6368 656D 6500 280A" /* cheme.(Β */ + $"0000 0081 0C41 626F 7574 2052 6163 6B65" /* ....About Racke */ + $"7400 280A" /* t.(Β */ }; data 'DLOG' (128) { diff --git a/src/mac/osx_appl.rkt b/src/mac/osx_appl.rkt index d6b210752c..9254275801 100644 --- a/src/mac/osx_appl.rkt +++ b/src/mac/osx_appl.rkt @@ -104,7 +104,7 @@ (assoc-pair "CFBundleExecutable" ,app-name) (assoc-pair "CFBundleIdentifier" - ,(format "org.plt-scheme.~a" app-name)) + ,(format "org.racket-lang.~a" app-name)) ,@(if app? `((assoc-pair "CFBundleIconFile" ,app-name)) diff --git a/src/mac/racket/simpledrop.cpp b/src/mac/racket/simpledrop.cpp index 280cfdcf8b..0d927d9993 100644 --- a/src/mac/racket/simpledrop.cpp +++ b/src/mac/racket/simpledrop.cpp @@ -412,7 +412,7 @@ void wxDrop_GetArgs(int *argc, char ***argv, int *in_terminal) { CFBundleRef fwBundle; - fwBundle = CFBundleGetBundleWithIdentifier(CFSTR("org.plt-scheme.PLT_MrEd")); + fwBundle = CFBundleGetBundleWithIdentifier(CFSTR("org.racket-lang.GRacket")); if (fwBundle) { SInt16 refNum; SInt16 lRefNum; diff --git a/src/racket/src/salloc.c b/src/racket/src/salloc.c index 3f7d97d1b3..4cca5d4978 100644 --- a/src/racket/src/salloc.c +++ b/src/racket/src/salloc.c @@ -319,7 +319,7 @@ extern unsigned long scheme_get_stack_base() void scheme_out_of_memory_abort() { - scheme_log_abort("PLT Scheme virtual machine has run out of memory; aborting"); + scheme_log_abort("Racket virtual machine has run out of memory; aborting"); if (more_report_out_of_memory) more_report_out_of_memory(); abort();