diff --git a/Makefile b/Makefile index 04010d5d94..639718a871 100644 --- a/Makefile +++ b/Makefile @@ -525,6 +525,7 @@ DOC_SEARCH = # server): SERVER = localhost SERVER_PORT = 9440 +SERVER_URL_SCHEME = http # Paths on the server to reach catalog content and "collects.tgz", # if not the root: @@ -618,7 +619,7 @@ OSSLSIGNCODE_ARGS_BASE64 = # URL for a README file to include in an installer (empty for none, # spaces allowed): -README = http://$(SVR_PRT)/README.txt +README = $(SERVER_URL_SCHEME)://$(SVR_PRT)/README.txt # URL destination to upload an installer file after it is created # (empty for no upload, spaces allowed); the file name is added to the @@ -656,7 +657,7 @@ DISTRO_BUILD_PKGS = distro-build-lib SVR_PRT = $(SERVER):$(SERVER_PORT) -SVR_CAT = http://$(SVR_PRT)/$(SERVER_CATALOG_PATH) +SVR_CAT = $(SERVER_URL_SCHEME)://$(SVR_PRT)/$(SERVER_CATALOG_PATH) # To configure package installations on the server: SERVER_PKG_INSTALL_OPTIONS = @@ -890,7 +891,7 @@ bundle-from-server: $(USER_RACKET) -l setup/unixstyle-install bundle racket bundle/racket $(USER_RACKET) -l setup/winstrip bundle/racket $(USER_RACKET) -l setup/winvers-change bundle/racket - $(USER_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) + $(USER_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) $(SERVER_URL_SCHEME)://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) $(IN_BUNDLE_RACO) setup --no-user $(JOB_OPTIONS) $(RECOMPILE_OPTIONS) $(IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) @@ -928,7 +929,7 @@ win32-bundle: win32-bundle-from-server: $(MAKE) win32-bundle $(COPY_ARGS) - $(WIN32_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) + $(WIN32_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) $(SERVER_URL_SCHEME)://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) $(WIN32_IN_BUNDLE_RACO) setup --no-user -l racket/base $(WIN32_IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(WIN32_IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) @@ -962,8 +963,8 @@ win32-test-client: SITE_PATH = FROM_SITE_ARGS = SERVER_CATALOG_PATH=$(SITE_PATH)catalog/ SERVER_COLLECTS_PATH=$(SITE_PATH)origin/ \ - DIST_CATALOGS_q='http://$(SERVER):$(SERVER_PORT)/$(SITE_PATH)catalog/ ""' \ - DOC_SEARCH="http://$(SERVER):$(SERVER_PORT)/$(SITE_PATH)doc/local-redirect/index.html" \ + DIST_CATALOGS_q='$(SERVER_URL_SCHEME)://$(SERVER):$(SERVER_PORT)/$(SITE_PATH)catalog/ ""' \ + DOC_SEARCH="$(SERVER_URL_SCHEME)://$(SERVER):$(SERVER_PORT)/$(SITE_PATH)doc/local-redirect/index.html" \ $(PROP_ARGS) client-from-site: diff --git a/build.md b/build.md index e980a8e85d..41f0f62a1f 100644 --- a/build.md +++ b/build.md @@ -679,9 +679,10 @@ If you (or someone else) previously created an installer site with `make site`, then `make client-from-site` in a clean repository creates an installer for the current platform drawing packages from the site. -At a minimum, provide `SERVER`, `SERVER_PORT` (usually 80), and -`SITE_PATH` (if not empty, include a trailing `/`) makefile variables to -access a site at +At a minimum, provide `SERVER`, `SERVER_PORT` (usually 80 or 443), +`SERVER_URL_SCHEME` (if `https` instead of `http`) and `SITE_PATH` (if +not empty, include a trailing `/`) makefile variables to access a site +at `http://$(SERVER):$(SERVER_PORT)/$(SITE_PATH)` diff --git a/pkgs/racket-build-guide/distribute.scrbl b/pkgs/racket-build-guide/distribute.scrbl index cb62bff0b4..a8bd0d22f8 100644 --- a/pkgs/racket-build-guide/distribute.scrbl +++ b/pkgs/racket-build-guide/distribute.scrbl @@ -383,7 +383,8 @@ If you (or someone else) previously created an installer site with repository creates an installer for the current platform drawing packages from the site. -At a minimum, provide @exec{SERVER}, @exec{SERVER_PORT} (usually 80), +At a minimum, provide @exec{SERVER}, @exec{SERVER_PORT} (usually 80 or 443), +@exec{SERVER_URL_SCHEME} (if @litchar{https} instead of @litchar{http}) and @exec{SITE_PATH} (if not empty, include a trailing @litchar{/}) makefile variables to access a site at