From efba034e0186f289962940ff5f09f25b3127e77a Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Sun, 14 Jul 2013 13:55:54 -0400 Subject: [PATCH] Move most of the `planet` collection to 'planet-lib'. --- pkgs/drracket-pkgs/drracket/info.rkt | 1 + pkgs/planet-lib/info.rkt | 3 +++ {racket/lib/collects => pkgs/planet-lib}/planet/info.rkt | 0 .../collects => pkgs/planet-lib}/planet/lang/reader.rkt | 0 .../lib/collects => pkgs/planet-lib}/planet/planet.rkt | 0 .../planet-lib}/planet/private/cmdline-tool.rkt | 8 ++++---- .../planet-lib}/planet/private/linkage.rkt | 0 .../planet-lib}/planet/private/parsereq.rkt | 2 +- .../planet-lib}/planet/private/resolver.rkt | 6 +++--- .../planet-lib}/planet/private/short-syntax-helpers.rkt | 0 .../planet-lib}/planet/private/version.rkt | 2 +- {racket/lib/collects => pkgs/planet-lib}/planet/raco.rkt | 0 .../lib/collects => pkgs/planet-lib}/planet/resolver.rkt | 0 .../lib/collects => pkgs/planet-lib}/planet/syntax.rkt | 0 .../collects => pkgs/planet-lib}/planet/terse-info.rkt | 0 {racket/lib/collects => pkgs/planet-lib}/planet/util.rkt | 6 +++--- .../lib/collects => pkgs/planet-lib}/planet/version.rkt | 0 pkgs/racket-pkgs/racket-doc/info.rkt | 1 + pkgs/racket-pkgs/racket-test/info.rkt | 1 + pkgs/scribble-pkgs/scribble-lib/info.rkt | 1 + 20 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 pkgs/planet-lib/info.rkt rename {racket/lib/collects => pkgs/planet-lib}/planet/info.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/lang/reader.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/planet.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/cmdline-tool.rkt (99%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/linkage.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/parsereq.rkt (99%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/resolver.rkt (99%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/short-syntax-helpers.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/private/version.rkt (98%) rename {racket/lib/collects => pkgs/planet-lib}/planet/raco.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/resolver.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/syntax.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/terse-info.rkt (100%) rename {racket/lib/collects => pkgs/planet-lib}/planet/util.rkt (99%) rename {racket/lib/collects => pkgs/planet-lib}/planet/version.rkt (100%) diff --git a/pkgs/drracket-pkgs/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/info.rkt index 4ee60ade84..a67c93ce49 100644 --- a/pkgs/drracket-pkgs/drracket/info.rkt +++ b/pkgs/drracket-pkgs/drracket/info.rkt @@ -5,6 +5,7 @@ (define deps '("data-lib" "compiler-lib" "base" + "planet-lib" "compatibility-lib" "draw-lib" "errortrace-lib" diff --git a/pkgs/planet-lib/info.rkt b/pkgs/planet-lib/info.rkt new file mode 100644 index 0000000000..c412ec2805 --- /dev/null +++ b/pkgs/planet-lib/info.rkt @@ -0,0 +1,3 @@ +#lang info +(define collection 'multi) +(define deps '("base")) diff --git a/racket/lib/collects/planet/info.rkt b/pkgs/planet-lib/planet/info.rkt similarity index 100% rename from racket/lib/collects/planet/info.rkt rename to pkgs/planet-lib/planet/info.rkt diff --git a/racket/lib/collects/planet/lang/reader.rkt b/pkgs/planet-lib/planet/lang/reader.rkt similarity index 100% rename from racket/lib/collects/planet/lang/reader.rkt rename to pkgs/planet-lib/planet/lang/reader.rkt diff --git a/racket/lib/collects/planet/planet.rkt b/pkgs/planet-lib/planet/planet.rkt similarity index 100% rename from racket/lib/collects/planet/planet.rkt rename to pkgs/planet-lib/planet/planet.rkt diff --git a/racket/lib/collects/planet/private/cmdline-tool.rkt b/pkgs/planet-lib/planet/private/cmdline-tool.rkt similarity index 99% rename from racket/lib/collects/planet/private/cmdline-tool.rkt rename to pkgs/planet-lib/planet/private/cmdline-tool.rkt index cea885b1b0..6e1c24b8d0 100644 --- a/racket/lib/collects/planet/private/cmdline-tool.rkt +++ b/pkgs/planet-lib/planet/private/cmdline-tool.rkt @@ -12,10 +12,10 @@ PLANNED FEATURES: racket/match raco/command-name - "../config.rkt" - "planet-shared.rkt" - "command.rkt" - "../util.rkt") + planet/config + planet/private/planet-shared + planet/util + planet/private/command) (provide start) (define erase? (make-parameter #f)) diff --git a/racket/lib/collects/planet/private/linkage.rkt b/pkgs/planet-lib/planet/private/linkage.rkt similarity index 100% rename from racket/lib/collects/planet/private/linkage.rkt rename to pkgs/planet-lib/planet/private/linkage.rkt diff --git a/racket/lib/collects/planet/private/parsereq.rkt b/pkgs/planet-lib/planet/private/parsereq.rkt similarity index 99% rename from racket/lib/collects/planet/private/parsereq.rkt rename to pkgs/planet-lib/planet/private/parsereq.rkt index af66ccf5a9..7bcf04e771 100644 --- a/racket/lib/collects/planet/private/parsereq.rkt +++ b/pkgs/planet-lib/planet/private/parsereq.rkt @@ -2,7 +2,7 @@ (require racket/match "short-syntax-helpers.rkt" - "data.rkt") + planet/private/data) (provide (struct-out request) parse-package-string diff --git a/racket/lib/collects/planet/private/resolver.rkt b/pkgs/planet-lib/planet/private/resolver.rkt similarity index 99% rename from racket/lib/collects/planet/private/resolver.rkt rename to pkgs/planet-lib/planet/private/resolver.rkt index 1fe32feac7..a18e683661 100644 --- a/racket/lib/collects/planet/private/resolver.rkt +++ b/pkgs/planet-lib/planet/private/resolver.rkt @@ -196,10 +196,10 @@ See the scribble documentation on the planet/resolver module. net/url net/head - "../config.rkt" - "planet-shared.rkt" + planet/config + planet/private/planet-shared "linkage.rkt" - "parsereq.rkt" + planet/private/parsereq "../terse-info.rkt" compiler/cm) diff --git a/racket/lib/collects/planet/private/short-syntax-helpers.rkt b/pkgs/planet-lib/planet/private/short-syntax-helpers.rkt similarity index 100% rename from racket/lib/collects/planet/private/short-syntax-helpers.rkt rename to pkgs/planet-lib/planet/private/short-syntax-helpers.rkt diff --git a/racket/lib/collects/planet/private/version.rkt b/pkgs/planet-lib/planet/private/version.rkt similarity index 98% rename from racket/lib/collects/planet/private/version.rkt rename to pkgs/planet-lib/planet/private/version.rkt index ff06d0888c..cb019392f9 100644 --- a/racket/lib/collects/planet/private/version.rkt +++ b/pkgs/planet-lib/planet/private/version.rkt @@ -4,7 +4,7 @@ racket/match unstable/syntax racket/syntax - "../planet-archives.rkt") + planet/planet-archives) (provide this-package-version this-package-version-name diff --git a/racket/lib/collects/planet/raco.rkt b/pkgs/planet-lib/planet/raco.rkt similarity index 100% rename from racket/lib/collects/planet/raco.rkt rename to pkgs/planet-lib/planet/raco.rkt diff --git a/racket/lib/collects/planet/resolver.rkt b/pkgs/planet-lib/planet/resolver.rkt similarity index 100% rename from racket/lib/collects/planet/resolver.rkt rename to pkgs/planet-lib/planet/resolver.rkt diff --git a/racket/lib/collects/planet/syntax.rkt b/pkgs/planet-lib/planet/syntax.rkt similarity index 100% rename from racket/lib/collects/planet/syntax.rkt rename to pkgs/planet-lib/planet/syntax.rkt diff --git a/racket/lib/collects/planet/terse-info.rkt b/pkgs/planet-lib/planet/terse-info.rkt similarity index 100% rename from racket/lib/collects/planet/terse-info.rkt rename to pkgs/planet-lib/planet/terse-info.rkt diff --git a/racket/lib/collects/planet/util.rkt b/pkgs/planet-lib/planet/util.rkt similarity index 99% rename from racket/lib/collects/planet/util.rkt rename to pkgs/planet-lib/planet/util.rkt index 3592ae3d2f..197efaff34 100644 --- a/racket/lib/collects/planet/util.rkt +++ b/pkgs/planet-lib/planet/util.rkt @@ -1,9 +1,9 @@ #lang racket/base -(require "config.rkt" - "planet-archives.rkt" +(require planet/config + planet/planet-archives - "private/planet-shared.rkt" + planet/private/planet-shared "private/linkage.rkt" "private/resolver.rkt" diff --git a/racket/lib/collects/planet/version.rkt b/pkgs/planet-lib/planet/version.rkt similarity index 100% rename from racket/lib/collects/planet/version.rkt rename to pkgs/planet-lib/planet/version.rkt diff --git a/pkgs/racket-pkgs/racket-doc/info.rkt b/pkgs/racket-pkgs/racket-doc/info.rkt index 27f8dab11b..e8f51f3e45 100644 --- a/pkgs/racket-pkgs/racket-doc/info.rkt +++ b/pkgs/racket-pkgs/racket-doc/info.rkt @@ -3,6 +3,7 @@ (define collection 'multi) (define deps '("base" + "planet-lib" "compatibility-lib" "net-lib" "sandbox-lib" diff --git a/pkgs/racket-pkgs/racket-test/info.rkt b/pkgs/racket-pkgs/racket-test/info.rkt index 402309ea7a..dc8988e0ad 100644 --- a/pkgs/racket-pkgs/racket-test/info.rkt +++ b/pkgs/racket-pkgs/racket-test/info.rkt @@ -7,6 +7,7 @@ "compiler-lib" "sandbox-lib" "compatibility-lib" + "planet-lib" "pconvert-lib" "eli-tester" ;; for `net` tests diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/info.rkt index f68cce664c..00e0eeb7e7 100644 --- a/pkgs/scribble-pkgs/scribble-lib/info.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/info.rkt @@ -5,6 +5,7 @@ (define deps '("base" "compatibility-lib" "scribble-text-lib" + "planet-lib" "net-lib" "at-exp-lib" "draw-lib"