From 88404f3b1f02986f21f771b63b6e86dd2fb98cfa Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 25 Jan 2013 17:00:42 -0600 Subject: [PATCH] adjust dists to move picts into the mr distributions This move moves a library from the plt distribution into the mr distribution, which is a direction we do not generally like to go, but the pict library is more core than slideshow and the dependency that triggered this change is that the 2htdp/image library now interoperates with picts (hopefully 2htdp/universe will also work with them at some point). So this teases out the pict part of slideshow (mostly, but not completely the texpict collection) and moves only that part to the mr distribution. --- collects/meta/dist-specs.rkt | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/collects/meta/dist-specs.rkt b/collects/meta/dist-specs.rkt index 9a8ccd7bda..4f955e5fb3 100644 --- a/collects/meta/dist-specs.rkt +++ b/collects/meta/dist-specs.rkt @@ -558,10 +558,18 @@ mz-extras :+= (package: "planet") mz-extras :+= (package: "planet2") ;; -------------------- mrlib -mr-extras :+= (- (+ (package: "mrlib/") - (collects: "hierlist/") - (collects: "icons/turn-{up|down}{|-click}.png") - (tests: "aligned-pasteboard/"))) +mr-extras :+= (+ (package: "mrlib/") + (collects: "hierlist/") + (collects: "icons/turn-{up|down}{|-click}.png") + (tests: "aligned-pasteboard/")) + +;; -------------------- pict library +mr-extras :+= (- (+ (collects: "texpict/") + (srcfile: "slideshow/pict.rkt") + (srcfile: "slideshow/pict-convert.rkt")) + (srcfile: "texpict/slideshow-run.rkt") + (srcfile: "texpict/slideshow.rkt") + (srcfile: "texpict/symbol.rkt")) ;; -------------------- sgl mr-extras :+= (package: "sgl/") @@ -636,9 +644,13 @@ plt-extras :+= (- (+ (package: "games/" #:executable "plt-games") (doc+src: "gl-board-game/" "cards/")) "paint-by-numbers/{hattori|solution-sets|raw-problems}") -;; -------------------- texpict & slideshow -plt-extras :+= (collects: "texpict/") - (package: "slideshow") +;; -------------------- slideshow +plt-extras :+= (- (+ (package: "slideshow") + (srcfile: "texpict/slideshow-run.rkt") + (srcfile: "texpict/slideshow.rkt") + (srcfile: "texpict/symbol.rkt")) + (srcfile: "slideshow/pict.rkt") + (srcfile: "slideshow/pict-convert.rkt")) ;; -------------------- frtime plt-extras :+= (package: "frtime/")