Use new DrRacket opt-in buttons for OC.

typed-racket-compatibility/info.rkt

@@ -11,4 +11,4 @@
 
 (define pkg-authors '(samth stamourv))
 
-(define version "1.6")
+(define version "1.7")

typed-racket-compatibility/typed-scheme/lang/reader.rkt

@@ -6,11 +6,10 @@ typed-scheme
 #:read-syntax r:read-syntax
 #:info make-info
 
-(require (prefix-in r: typed-racket/typed-reader)
-         typed-racket/private/oc-button)
+(require (prefix-in r: typed-racket/typed-reader))
 
 (define (make-info key default use-default)
   (case key
-    [(drscheme:toolbar-buttons)
-     (maybe-show-OC)]
+    [(drracket:opt-in-toolbar-buttons)
+     '(optimization-coach)]
     [else (use-default key default)]))

typed-racket-compatibility/typed/scheme/base/lang/reader.rkt

@@ -7,12 +7,10 @@ typed/scheme/base
 #:info make-info
 #:language-info make-language-info
 
-(require typed-racket/private/oc-button)
-
 (define (make-info key default use-default)
   (case key
-    [(drscheme:toolbar-buttons)
-     (maybe-show-OC)]
+    [(drracket:opt-in-toolbar-buttons)
+     '(optimization-coach)]
     [else (use-default key default)]))
 
 (define make-language-info

typed-racket-compatibility/typed/scheme/lang/reader.rkt

@@ -7,12 +7,10 @@ typed/scheme
 #:info make-info
 #:language-info make-language-info
 
-(require typed-racket/private/oc-button)
-
 (define (make-info key default use-default)
   (case key
-    [(drscheme:toolbar-buttons)
-     (maybe-show-OC)]
+    [(drracket:opt-in-toolbar-buttons)
+     '(optimization-coach)]
     [else (use-default key default)]))
 
 (define make-language-info

typed-racket-doc/info.rkt

@@ -24,4 +24,4 @@
 
 (define pkg-authors '(samth stamourv))
 
-(define version "1.6")
+(define version "1.7")

typed-racket-lib/info.rkt

@@ -11,4 +11,4 @@
 
 (define pkg-authors '(samth stamourv))
 
-(define version "1.6")
+(define version "1.7")

typed-racket-lib/typed-racket/private/oc-button.rkt

@@ -1,16 +0,0 @@
-#lang racket/base
-
-;; Control whether the OC button show up for TR files in DrR.
-
-(provide maybe-show-OC)
-
-(define (maybe-show-OC)
-  ;; If Optimization Coach is installed, load it.
-  (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-    (collection-path "optimization-coach")
-    (if (dynamic-require 'optimization-coach/tool
-                         'optimization-coach-loaded?)
-        ;; OC is loaded, show button
-        (list (dynamic-require 'optimization-coach/tool
-                               'optimization-coach-drracket-button))
-        '())))

typed-racket-lib/typed/racket/base/lang/reader.rkt

@@ -7,12 +7,10 @@ typed/racket/base
 #:info make-info
 #:language-info make-language-info
 
-(require typed-racket/private/oc-button)
-
 (define (make-info key default use-default)
   (case key
-    [(drscheme:toolbar-buttons)
-     (maybe-show-OC)]
+    [(drracket:opt-in-toolbar-buttons)
+     '(optimization-coach)]
     [else (use-default key default)]))
 
 (define make-language-info

typed-racket-lib/typed/racket/lang/reader.rkt

@@ -7,12 +7,10 @@ typed/racket
 #:info make-info
 #:language-info make-language-info
 
-(require typed-racket/private/oc-button)
-
 (define (make-info key default use-default)
   (case key
-    [(drscheme:toolbar-buttons)
-     (maybe-show-OC)]
+    [(drracket:opt-in-toolbar-buttons)
+     '(optimization-coach)]
     [else (use-default key default)]))
 
 (define make-language-info

typed-racket-more/info.rkt

@@ -22,4 +22,4 @@
 
 (define pkg-authors '(samth stamourv))
 
-(define version "1.6")
+(define version "1.7")

typed-racket-more/typed/racket/gui.rkt

@@ -16,13 +16,11 @@
   #:language-info #(typed-racket/language-info get-info ())
   #:info make-info
 
-  (require typed-racket/private/oc-button)
-
   ;; see typed/racket/lang/reader.rkt
   (define (make-info key default use-default)
     (case key
-      [(drscheme:toolbar-buttons)
-       (maybe-show-OC)]
+      [(drracket:opt-in-toolbar-buttons)
+       '(optimization-coach)]
       [else (use-default key default)]))
 
   (require typed-racket/typed-reader))

typed-racket-test/info.rkt

@@ -28,7 +28,7 @@
 
 (define pkg-authors '(samth stamourv endobson asumu))
 
-(define version "1.6")
+(define version "1.7")
 
 
 ;; Collection info

typed-racket/info.rkt

@@ -11,4 +11,4 @@
 
 (define pkg-authors '(samth stamourv))
 
-(define version "1.6")
+(define version "1.7")