diff --git a/typed-racket-compatibility/info.rkt b/typed-racket-compatibility/info.rkt index d494ffd4..a7c4703b 100644 --- a/typed-racket-compatibility/info.rkt +++ b/typed-racket-compatibility/info.rkt @@ -11,4 +11,4 @@ (define pkg-authors '(samth stamourv)) -(define version "1.6") +(define version "1.7") diff --git a/typed-racket-compatibility/typed-scheme/lang/reader.rkt b/typed-racket-compatibility/typed-scheme/lang/reader.rkt index d26b323d..8b9443a9 100644 --- a/typed-racket-compatibility/typed-scheme/lang/reader.rkt +++ b/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)])) diff --git a/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt b/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt index 5a360b29..b414e5a6 100644 --- a/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt +++ b/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 diff --git a/typed-racket-compatibility/typed/scheme/lang/reader.rkt b/typed-racket-compatibility/typed/scheme/lang/reader.rkt index 17386e20..4286d938 100644 --- a/typed-racket-compatibility/typed/scheme/lang/reader.rkt +++ b/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 diff --git a/typed-racket-doc/info.rkt b/typed-racket-doc/info.rkt index c36cd7fd..fd34bcdc 100644 --- a/typed-racket-doc/info.rkt +++ b/typed-racket-doc/info.rkt @@ -24,4 +24,4 @@ (define pkg-authors '(samth stamourv)) -(define version "1.6") +(define version "1.7") diff --git a/typed-racket-lib/info.rkt b/typed-racket-lib/info.rkt index aca2f5a2..886e4321 100644 --- a/typed-racket-lib/info.rkt +++ b/typed-racket-lib/info.rkt @@ -11,4 +11,4 @@ (define pkg-authors '(samth stamourv)) -(define version "1.6") +(define version "1.7") diff --git a/typed-racket-lib/typed-racket/private/oc-button.rkt b/typed-racket-lib/typed-racket/private/oc-button.rkt deleted file mode 100644 index c0bf6a97..00000000 --- a/typed-racket-lib/typed-racket/private/oc-button.rkt +++ /dev/null @@ -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)) - '()))) diff --git a/typed-racket-lib/typed/racket/base/lang/reader.rkt b/typed-racket-lib/typed/racket/base/lang/reader.rkt index df5f6555..8083d82e 100644 --- a/typed-racket-lib/typed/racket/base/lang/reader.rkt +++ b/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 diff --git a/typed-racket-lib/typed/racket/lang/reader.rkt b/typed-racket-lib/typed/racket/lang/reader.rkt index da1440b4..302b8a91 100644 --- a/typed-racket-lib/typed/racket/lang/reader.rkt +++ b/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 diff --git a/typed-racket-more/info.rkt b/typed-racket-more/info.rkt index 073904e5..c8c9f004 100644 --- a/typed-racket-more/info.rkt +++ b/typed-racket-more/info.rkt @@ -22,4 +22,4 @@ (define pkg-authors '(samth stamourv)) -(define version "1.6") +(define version "1.7") diff --git a/typed-racket-more/typed/racket/gui.rkt b/typed-racket-more/typed/racket/gui.rkt index cf17f115..5316ec61 100644 --- a/typed-racket-more/typed/racket/gui.rkt +++ b/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)) diff --git a/typed-racket-test/info.rkt b/typed-racket-test/info.rkt index 4a70932b..f1970b68 100644 --- a/typed-racket-test/info.rkt +++ b/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 diff --git a/typed-racket/info.rkt b/typed-racket/info.rkt index 99cba353..ce842699 100644 --- a/typed-racket/info.rkt +++ b/typed-racket/info.rkt @@ -11,4 +11,4 @@ (define pkg-authors '(samth stamourv)) -(define version "1.6") +(define version "1.7")