distro-build: move a file out that is accessed directly

The "pack-all.rkt" file is needed before (and only before) the
distro-build package itself is ready, so move it to the "racket/src"
directory.
This commit is contained in:
Matthew Flatt 2014-06-13 07:57:01 +01:00
parent c06542b393
commit b7610c405d
4 changed files with 24 additions and 15 deletions

View File

@ -261,10 +261,6 @@ REQUIRED_PKGS = racket-lib
# Packages needed for building distribution: # Packages needed for building distribution:
DISTRO_BUILD_PKGS = distro-build-lib 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-pkgs/distro-build-server
SVR_PRT = $(SERVER):$(SERVER_PORT) SVR_PRT = $(SERVER):$(SERVER_PORT)
SVR_CAT = http://$(SVR_PRT)/$(SERVER_CATALOG_PATH) SVR_CAT = http://$(SVR_PRT)/$(SERVER_CATALOG_PATH)
@ -367,11 +363,11 @@ PACK_NATIVE = --native --pack build/native/pkgs \
++catalog build/native/catalog \ ++catalog build/native/catalog \
++catalog build/local/catalog ++catalog build/local/catalog
native-catalog: native-catalog:
$(RACKET) $(DISTBLD)/pack-and-catalog.rkt $(PACK_NATIVE) native-pkgs $(RACKET) racket/src/pack-all.rkt $(PACK_NATIVE) native-pkgs
# Create a catalog for all packages in this directory: # Create a catalog for all packages in this directory:
local-source-catalog: local-source-catalog:
$(RACKET) $(DISTBLD)/pack-and-catalog.rkt ++catalog build/local/catalog pkgs $(RACKET) racket/src/pack-all.rkt ++catalog build/local/catalog pkgs
# Clear out a package build in "build/user", and then install # Clear out a package build in "build/user", and then install
# packages: # packages:

View File

@ -92,14 +92,16 @@ Each Windows client needs the following:
Windows command line (like freeSSHd) or bash with access to Windows command line (like freeSSHd) or bash with access to
cmd.exe (like Cygwin's opensshd) cmd.exe (like Cygwin's opensshd)
* git (unless the working directory is ready) * git (unless the working directory is ready)
* Microsoft Visual Studio 9.0 (2008), installed in the * Microsoft Visual Studio (version >= 9.0, <= 12.0), installed
default folder: in the default folder:
C:\Program Files\Microsoft Visual Studio 9.0 (32-bit host) C:\Program Files\Microsoft Visual Studio <vers>
C:\Program Files (x86)\Microsoft Visual Studio 9.0 (64-bit host) or
C:\Program Files (x86)\Microsoft Visual Studio <vers>
* Nullsoft Scriptable Install System (NSIS) verstion 2.x, installed * Nullsoft Scriptable Install System (NSIS) verstion 2.x, installed
in the default folder: in the default folder:
C:\Program Files\NSIS\makensis.exe C:\Program Files\NSIS\makensis.exe
or C:\Program Files (x86)\NSIS\makensis.exe or
C:\Program Files (x86)\NSIS\makensis.exe
or installed so that `makensis' in your PATH. or installed so that `makensis' in your PATH.
Site Configuration Site Configuration
@ -211,10 +213,10 @@ Site-configuration keywords (where <string*> means no spaces, etc.):
#:configure '(<string> ...) --- arguments to `configure' #:configure '(<string> ...) --- arguments to `configure'
#:bits <integer> --- 32 or 64, affects Visual Studio path #:bits <integer> --- 32 or 64, affects Visual Studio mode
#:vc <string*> --- "x86" or "x64" to select the Visual C build mode; #:vc <string*> --- "x86" or "x64" to select the Visual Studio build
default depends on `#:bits' mode; default depends on `#:bits'
#:sign-identity <string> --- provides an identity to be passed to #:sign-identity <string> --- provides an identity to be passed to
`codesign` for code signing on Mac OS X (for all executables in a `codesign` for code signing on Mac OS X (for all executables in a

View File

@ -10,6 +10,14 @@
pkg/lib pkg/lib
pkg/path) pkg/path)
;; Find packages in a directory tree ("info.rkt" indicates a package)
;; and link the packages into an installation. The packages are linked
;; in a "devel-pkgs" scope to isolate them from packages at
;; "installation" scope, so that the set of linked packages can be
;; updated when the directory content changes.
;; Used by the top-level Makefile in the main Racket repository.
(define config-dir-path (build-path "racket" "etc")) (define config-dir-path (build-path "racket" "etc"))
(define config-file-path (build-path config-dir-path "config.rktd")) (define config-file-path (build-path config-dir-path "config.rktd"))
(define devel-pkgs-rel-dir (build-path "devel-pkgs")) (define devel-pkgs-rel-dir (build-path "devel-pkgs"))

View File

@ -12,7 +12,10 @@
pkg/lib pkg/lib
setup/getinfo) setup/getinfo)
(module test racket/base) ;; Find packages in the same way as "link-all.rkt", but packs
;; them into ".zip" files and adds them to a catalog.
;; Used by the top-level Makefile in the main Racket repository.
(define pack-dest-dir #f) (define pack-dest-dir #f)
(define catalog-dirs null) (define catalog-dirs null)