From a98582b82337db02cd47b5d1a932285a80146c07 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 9 Mar 2014 11:40:06 -0600 Subject: [PATCH] distro-build: split server and client parts --- Makefile | 6 +++--- .../distro-build-client}/LICENSE.txt | 0 .../distro-build-client}/add-catalog.rkt | 0 .../distro-build-client}/config.rkt | 0 .../distro-build-client}/display-time.rkt | 0 .../distro-build-client}/doc.txt | 0 pkgs/distro-build-pkgs/distro-build-client/info.rkt | 11 +++++++++++ .../distro-build-client}/install-for-docs.rkt | 0 .../distro-build-client}/install-pkgs.rkt | 0 .../distro-build-client}/installer-dmg.rkt | 0 .../distro-build-client}/installer-exe.rkt | 0 .../distro-build-client}/installer-pkg.rkt | 0 .../distro-build-client}/installer-sh.rkt | 0 .../distro-build-client}/installer-tgz.rkt | 0 .../distro-build-client}/installer.rkt | 0 .../macosx-installer/pkg-bg.png | Bin .../macosx-installer/racket-rising.png | Bin .../distro-build-client}/readme.rkt | 0 .../distro-build-client}/set-config.rkt | 0 .../unix-installer/installer-header | 0 .../distro-build-client}/unpack-collects.rkt | 0 .../distro-build-client}/url-options.rkt | 0 .../windows-installer/header-r.bmp | Bin .../windows-installer/header.bmp | Bin .../windows-installer/installer.ico | Bin .../windows-installer/uninstaller.ico | Bin .../windows-installer/welcome.bmp | Bin pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt | 11 +++++++++++ pkgs/distro-build-pkgs/distro-build-lib/info.rkt | 12 ++++++++++++ .../distro-build-server/LICENSE.txt | 11 +++++++++++ .../distro-build-server}/assemble-site.rkt | 2 +- .../distro-build-server}/download-page.rkt | 0 .../distro-build-server}/drive-clients.rkt | 8 ++++---- .../distro-build-server}/email.rkt | 0 .../distro-build-server}/info.rkt | 3 ++- .../distro-build-server}/manage-snapshots.rkt | 2 +- .../distro-build-server}/pack-and-catalog.rkt | 0 .../distro-build-server}/pack-built.rkt | 0 .../distro-build-server}/pack-collects.rkt | 0 .../distro-build-server}/serve-catalog.rkt | 4 ++-- pkgs/distro-build-pkgs/distro-build/LICENSE.txt | 11 +++++++++++ pkgs/distro-build-pkgs/distro-build/info.rkt | 10 ++++++++++ 42 files changed, 79 insertions(+), 12 deletions(-) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/LICENSE.txt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/add-catalog.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/config.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/display-time.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/doc.txt (100%) create mode 100644 pkgs/distro-build-pkgs/distro-build-client/info.rkt rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/install-for-docs.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/install-pkgs.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer-dmg.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer-exe.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer-pkg.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer-sh.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer-tgz.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/installer.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/macosx-installer/pkg-bg.png (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/macosx-installer/racket-rising.png (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/readme.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/set-config.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/unix-installer/installer-header (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/unpack-collects.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/url-options.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/windows-installer/header-r.bmp (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/windows-installer/header.bmp (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/windows-installer/installer.ico (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/windows-installer/uninstaller.ico (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-client}/windows-installer/welcome.bmp (100%) create mode 100644 pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt create mode 100644 pkgs/distro-build-pkgs/distro-build-lib/info.rkt create mode 100644 pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/assemble-site.rkt (98%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/download-page.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/drive-clients.rkt (99%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/email.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/info.rkt (70%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/manage-snapshots.rkt (99%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/pack-and-catalog.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/pack-built.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/pack-collects.rkt (100%) rename pkgs/{distro-build => distro-build-pkgs/distro-build-server}/serve-catalog.rkt (98%) create mode 100644 pkgs/distro-build-pkgs/distro-build/LICENSE.txt create mode 100644 pkgs/distro-build-pkgs/distro-build/info.rkt diff --git a/Makefile b/Makefile index 73be153dc9..372763e742 100644 --- a/Makefile +++ b/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" diff --git a/pkgs/distro-build/LICENSE.txt b/pkgs/distro-build-pkgs/distro-build-client/LICENSE.txt similarity index 100% rename from pkgs/distro-build/LICENSE.txt rename to pkgs/distro-build-pkgs/distro-build-client/LICENSE.txt diff --git a/pkgs/distro-build/add-catalog.rkt b/pkgs/distro-build-pkgs/distro-build-client/add-catalog.rkt similarity index 100% rename from pkgs/distro-build/add-catalog.rkt rename to pkgs/distro-build-pkgs/distro-build-client/add-catalog.rkt diff --git a/pkgs/distro-build/config.rkt b/pkgs/distro-build-pkgs/distro-build-client/config.rkt similarity index 100% rename from pkgs/distro-build/config.rkt rename to pkgs/distro-build-pkgs/distro-build-client/config.rkt diff --git a/pkgs/distro-build/display-time.rkt b/pkgs/distro-build-pkgs/distro-build-client/display-time.rkt similarity index 100% rename from pkgs/distro-build/display-time.rkt rename to pkgs/distro-build-pkgs/distro-build-client/display-time.rkt diff --git a/pkgs/distro-build/doc.txt b/pkgs/distro-build-pkgs/distro-build-client/doc.txt similarity index 100% rename from pkgs/distro-build/doc.txt rename to pkgs/distro-build-pkgs/distro-build-client/doc.txt diff --git a/pkgs/distro-build-pkgs/distro-build-client/info.rkt b/pkgs/distro-build-pkgs/distro-build-client/info.rkt new file mode 100644 index 0000000000..48249db045 --- /dev/null +++ b/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)) diff --git a/pkgs/distro-build/install-for-docs.rkt b/pkgs/distro-build-pkgs/distro-build-client/install-for-docs.rkt similarity index 100% rename from pkgs/distro-build/install-for-docs.rkt rename to pkgs/distro-build-pkgs/distro-build-client/install-for-docs.rkt diff --git a/pkgs/distro-build/install-pkgs.rkt b/pkgs/distro-build-pkgs/distro-build-client/install-pkgs.rkt similarity index 100% rename from pkgs/distro-build/install-pkgs.rkt rename to pkgs/distro-build-pkgs/distro-build-client/install-pkgs.rkt diff --git a/pkgs/distro-build/installer-dmg.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer-dmg.rkt similarity index 100% rename from pkgs/distro-build/installer-dmg.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer-dmg.rkt diff --git a/pkgs/distro-build/installer-exe.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer-exe.rkt similarity index 100% rename from pkgs/distro-build/installer-exe.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer-exe.rkt diff --git a/pkgs/distro-build/installer-pkg.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer-pkg.rkt similarity index 100% rename from pkgs/distro-build/installer-pkg.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer-pkg.rkt diff --git a/pkgs/distro-build/installer-sh.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer-sh.rkt similarity index 100% rename from pkgs/distro-build/installer-sh.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer-sh.rkt diff --git a/pkgs/distro-build/installer-tgz.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer-tgz.rkt similarity index 100% rename from pkgs/distro-build/installer-tgz.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer-tgz.rkt diff --git a/pkgs/distro-build/installer.rkt b/pkgs/distro-build-pkgs/distro-build-client/installer.rkt similarity index 100% rename from pkgs/distro-build/installer.rkt rename to pkgs/distro-build-pkgs/distro-build-client/installer.rkt diff --git a/pkgs/distro-build/macosx-installer/pkg-bg.png b/pkgs/distro-build-pkgs/distro-build-client/macosx-installer/pkg-bg.png similarity index 100% rename from pkgs/distro-build/macosx-installer/pkg-bg.png rename to pkgs/distro-build-pkgs/distro-build-client/macosx-installer/pkg-bg.png diff --git a/pkgs/distro-build/macosx-installer/racket-rising.png b/pkgs/distro-build-pkgs/distro-build-client/macosx-installer/racket-rising.png similarity index 100% rename from pkgs/distro-build/macosx-installer/racket-rising.png rename to pkgs/distro-build-pkgs/distro-build-client/macosx-installer/racket-rising.png diff --git a/pkgs/distro-build/readme.rkt b/pkgs/distro-build-pkgs/distro-build-client/readme.rkt similarity index 100% rename from pkgs/distro-build/readme.rkt rename to pkgs/distro-build-pkgs/distro-build-client/readme.rkt diff --git a/pkgs/distro-build/set-config.rkt b/pkgs/distro-build-pkgs/distro-build-client/set-config.rkt similarity index 100% rename from pkgs/distro-build/set-config.rkt rename to pkgs/distro-build-pkgs/distro-build-client/set-config.rkt diff --git a/pkgs/distro-build/unix-installer/installer-header b/pkgs/distro-build-pkgs/distro-build-client/unix-installer/installer-header similarity index 100% rename from pkgs/distro-build/unix-installer/installer-header rename to pkgs/distro-build-pkgs/distro-build-client/unix-installer/installer-header diff --git a/pkgs/distro-build/unpack-collects.rkt b/pkgs/distro-build-pkgs/distro-build-client/unpack-collects.rkt similarity index 100% rename from pkgs/distro-build/unpack-collects.rkt rename to pkgs/distro-build-pkgs/distro-build-client/unpack-collects.rkt diff --git a/pkgs/distro-build/url-options.rkt b/pkgs/distro-build-pkgs/distro-build-client/url-options.rkt similarity index 100% rename from pkgs/distro-build/url-options.rkt rename to pkgs/distro-build-pkgs/distro-build-client/url-options.rkt diff --git a/pkgs/distro-build/windows-installer/header-r.bmp b/pkgs/distro-build-pkgs/distro-build-client/windows-installer/header-r.bmp similarity index 100% rename from pkgs/distro-build/windows-installer/header-r.bmp rename to pkgs/distro-build-pkgs/distro-build-client/windows-installer/header-r.bmp diff --git a/pkgs/distro-build/windows-installer/header.bmp b/pkgs/distro-build-pkgs/distro-build-client/windows-installer/header.bmp similarity index 100% rename from pkgs/distro-build/windows-installer/header.bmp rename to pkgs/distro-build-pkgs/distro-build-client/windows-installer/header.bmp diff --git a/pkgs/distro-build/windows-installer/installer.ico b/pkgs/distro-build-pkgs/distro-build-client/windows-installer/installer.ico similarity index 100% rename from pkgs/distro-build/windows-installer/installer.ico rename to pkgs/distro-build-pkgs/distro-build-client/windows-installer/installer.ico diff --git a/pkgs/distro-build/windows-installer/uninstaller.ico b/pkgs/distro-build-pkgs/distro-build-client/windows-installer/uninstaller.ico similarity index 100% rename from pkgs/distro-build/windows-installer/uninstaller.ico rename to pkgs/distro-build-pkgs/distro-build-client/windows-installer/uninstaller.ico diff --git a/pkgs/distro-build/windows-installer/welcome.bmp b/pkgs/distro-build-pkgs/distro-build-client/windows-installer/welcome.bmp similarity index 100% rename from pkgs/distro-build/windows-installer/welcome.bmp rename to pkgs/distro-build-pkgs/distro-build-client/windows-installer/welcome.bmp diff --git a/pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt b/pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt new file mode 100644 index 0000000000..060662acbd --- /dev/null +++ b/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. diff --git a/pkgs/distro-build-pkgs/distro-build-lib/info.rkt b/pkgs/distro-build-pkgs/distro-build-lib/info.rkt new file mode 100644 index 0000000000..cb259c254d --- /dev/null +++ b/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)) diff --git a/pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt b/pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt new file mode 100644 index 0000000000..060662acbd --- /dev/null +++ b/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. diff --git a/pkgs/distro-build/assemble-site.rkt b/pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt similarity index 98% rename from pkgs/distro-build/assemble-site.rkt rename to pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt index 0aed49284a..e446422bfd 100644 --- a/pkgs/distro-build/assemble-site.rkt +++ b/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) diff --git a/pkgs/distro-build/download-page.rkt b/pkgs/distro-build-pkgs/distro-build-server/download-page.rkt similarity index 100% rename from pkgs/distro-build/download-page.rkt rename to pkgs/distro-build-pkgs/distro-build-server/download-page.rkt diff --git a/pkgs/distro-build/drive-clients.rkt b/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt similarity index 99% rename from pkgs/distro-build/drive-clients.rkt rename to pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt index 0e3795399d..1faf831466 100644 --- a/pkgs/distro-build/drive-clients.rkt +++ b/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" - "display-time.rkt" - "readme.rkt" + distro-build/url-options + distro-build/display-time + distro-build/readme "email.rkt") ;; See "config.rkt" for an overview. diff --git a/pkgs/distro-build/email.rkt b/pkgs/distro-build-pkgs/distro-build-server/email.rkt similarity index 100% rename from pkgs/distro-build/email.rkt rename to pkgs/distro-build-pkgs/distro-build-server/email.rkt diff --git a/pkgs/distro-build/info.rkt b/pkgs/distro-build-pkgs/distro-build-server/info.rkt similarity index 70% rename from pkgs/distro-build/info.rkt rename to pkgs/distro-build-pkgs/distro-build-server/info.rkt index 58092499ea..1d92f36f3e 100644 --- a/pkgs/distro-build/info.rkt +++ b/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)) diff --git a/pkgs/distro-build/manage-snapshots.rkt b/pkgs/distro-build-pkgs/distro-build-server/manage-snapshots.rkt similarity index 99% rename from pkgs/distro-build/manage-snapshots.rkt rename to pkgs/distro-build-pkgs/distro-build-server/manage-snapshots.rkt index 18b5daef3d..560e5d7320 100644 --- a/pkgs/distro-build/manage-snapshots.rkt +++ b/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) diff --git a/pkgs/distro-build/pack-and-catalog.rkt b/pkgs/distro-build-pkgs/distro-build-server/pack-and-catalog.rkt similarity index 100% rename from pkgs/distro-build/pack-and-catalog.rkt rename to pkgs/distro-build-pkgs/distro-build-server/pack-and-catalog.rkt diff --git a/pkgs/distro-build/pack-built.rkt b/pkgs/distro-build-pkgs/distro-build-server/pack-built.rkt similarity index 100% rename from pkgs/distro-build/pack-built.rkt rename to pkgs/distro-build-pkgs/distro-build-server/pack-built.rkt diff --git a/pkgs/distro-build/pack-collects.rkt b/pkgs/distro-build-pkgs/distro-build-server/pack-collects.rkt similarity index 100% rename from pkgs/distro-build/pack-collects.rkt rename to pkgs/distro-build-pkgs/distro-build-server/pack-collects.rkt diff --git a/pkgs/distro-build/serve-catalog.rkt b/pkgs/distro-build-pkgs/distro-build-server/serve-catalog.rkt similarity index 98% rename from pkgs/distro-build/serve-catalog.rkt rename to pkgs/distro-build-pkgs/distro-build-server/serve-catalog.rkt index b560aa72e1..11ad01faf3 100644 --- a/pkgs/distro-build/serve-catalog.rkt +++ b/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) - "readme.rkt") + (only-in distro-build/config extract-options) + distro-build/readme) (module test racket/base) diff --git a/pkgs/distro-build-pkgs/distro-build/LICENSE.txt b/pkgs/distro-build-pkgs/distro-build/LICENSE.txt new file mode 100644 index 0000000000..060662acbd --- /dev/null +++ b/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. diff --git a/pkgs/distro-build-pkgs/distro-build/info.rkt b/pkgs/distro-build-pkgs/distro-build/info.rkt new file mode 100644 index 0000000000..b3f7a6ebb5 --- /dev/null +++ b/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))