distro-build: split server and client parts

Makefile

@@ -202,11 +202,11 @@ SERVE_DURING_CMD_qq =
 REQUIRED_PKGS = racket-lib
 
 # Packages needed for building distribution:
-DISTRO_BUILD_PKGS = distro-build
+DISTRO_BUILD_PKGS = distro-build-lib
 
 # To bootstrap, we use some "distro-build" libraries directly,
 # instead of from an installed package:
-DISTBLD = pkgs/distro-build
+DISTBLD = pkgs/distro-build-pkgs/distro-build-server
 
 SVR_PRT = $(SERVER):$(SERVER_PORT)
 
@@ -412,7 +412,7 @@ win32-client:
 # Install the "distro-build" package from the server into
 # a local build:
 distro-build-from-server:
-	$(RACO) pkg install $(REMOTE_USER_AUTO) distro-build
+	$(RACO) pkg install $(REMOTE_USER_AUTO) distro-build-client
 
 # Copy our local build into a "bundle/racket" build, dropping in the
 # process things that should not be in an installer (such as the "src"

pkgs/distro-build-pkgs/distro-build-client/info.rkt

@@ -0,0 +1,11 @@
+#lang info
+
+(define collection "distro-build")
+
+(define deps '("base"
+               "ds-store-lib"))
+(define build-deps '("at-exp-lib"))
+
+(define pkg-desc "client-side part of \"distro-build\"")
+
+(define pkg-authors '(mflatt))

pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt

@@ -0,0 +1,11 @@
+distro-build
+Copyright (c) 2010-2014 PLT Design Inc.
+
+This package is distributed under the GNU Lesser General Public
+License (LGPL).  This means that you can link Racket into proprietary
+applications, provided you follow the rules stated in the LGPL.  You
+can also modify this package; if you distribute a modified version,
+you must distribute it under the terms of the LGPL, which in
+particular means that you must release the source code for the
+modified software.  See http://www.gnu.org/copyleft/lesser.html
+for more information.

pkgs/distro-build-pkgs/distro-build-lib/info.rkt

@@ -0,0 +1,12 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("distro-build-client"
+               "distro-build-server"))
+(define implies '("distro-build-client"
+                  "distro-build-server"))
+
+(define pkg-desc "implementation (no documentation) part of \"distro-build\"")
+
+(define pkg-authors '(mflatt))

pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt

@@ -0,0 +1,11 @@
+distro-build
+Copyright (c) 2010-2014 PLT Design Inc.
+
+This package is distributed under the GNU Lesser General Public
+License (LGPL).  This means that you can link Racket into proprietary
+applications, provided you follow the rules stated in the LGPL.  You
+can also modify this package; if you distribute a modified version,
+you must distribute it under the terms of the LGPL, which in
+particular means that you must release the source code for the
+modified software.  See http://www.gnu.org/copyleft/lesser.html
+for more information.

pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt

@@ -3,7 +3,7 @@
          racket/file
          net/url
          "download-page.rkt"
-         (only-in "config.rkt" extract-options))
+         (only-in distro-build/config extract-options))
 
 (module test racket/base)
 

pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt

@@ -6,14 +6,14 @@
          racket/file
          racket/string
          racket/path
-         (only-in "config.rkt"
+         (only-in distro-build/config
                   current-mode
                   site-config?
                   site-config-tag site-config-options site-config-content
                   current-stamp)
-         "url-options.rkt"
+         distro-build/url-options
-         "display-time.rkt"
+         distro-build/display-time
-         "readme.rkt"
+         distro-build/readme
          "email.rkt")
 
 ;; See "config.rkt" for an overview.

pkgs/distro-build-pkgs/distro-build-server/info.rkt

@@ -3,11 +3,12 @@
 (define collection "distro-build")
 
 (define deps '("base"
+               "distro-build-client"
                "web-server-lib"
                "ds-store-lib"
                "net-lib"))
 (define build-deps '("at-exp-lib"))
 
-(define pkg-desc "Tools for constructing a distribution of Racket")
+(define pkg-desc "server-side part of \"distro-build\"")
 
 (define pkg-authors '(mflatt))

pkgs/distro-build-pkgs/distro-build-server/manage-snapshots.rkt

@@ -3,7 +3,7 @@
          racket/file
          net/url
          "download-page.rkt"
-         (only-in "config.rkt" extract-options))
+         (only-in distro-build/config extract-options))
 
 (module test racket/base)
 

pkgs/distro-build-pkgs/distro-build-server/serve-catalog.rkt

@@ -12,8 +12,8 @@
          racket/tcp
          racket/port
          racket/system
-         (only-in "config.rkt" extract-options)
+         (only-in distro-build/config extract-options)
-         "readme.rkt")
+         distro-build/readme)
 
 (module test racket/base)
 

pkgs/distro-build-pkgs/distro-build/LICENSE.txt

@@ -0,0 +1,11 @@
+distro-build
+Copyright (c) 2010-2014 PLT Design Inc.
+
+This package is distributed under the GNU Lesser General Public
+License (LGPL).  This means that you can link Racket into proprietary
+applications, provided you follow the rules stated in the LGPL.  You
+can also modify this package; if you distribute a modified version,
+you must distribute it under the terms of the LGPL, which in
+particular means that you must release the source code for the
+modified software.  See http://www.gnu.org/copyleft/lesser.html
+for more information.

pkgs/distro-build-pkgs/distro-build/info.rkt

@@ -0,0 +1,10 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("distro-build-lib"))
+(define implies '("distro-build-lib"))
+
+(define pkg-desc "Tools for constructing a distribution of Racket")
+
+(define pkg-authors '(mflatt))