From fd982c55b14a79a318a4b79af0ef15a71e2902cb Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 28 Jun 2013 08:09:11 -0600
Subject: [PATCH] farm: by default, pull git repo in clients from server

---
 Makefile                            | 1 +
 pkgs/distro-build/drive-clients.rkt | 4 ++--
 pkgs/distro-build/serve-catalog.rkt | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0760e8e38c..200d94eac3 100644
--- a/Makefile
+++ b/Makefile
@@ -200,6 +200,7 @@ built-catalog:
 # Run a catalog server to provide pre-built packages, as well
 # as the copy of the server's "collects" tree:
 built-catalog-server:
+	if [ -d ".git" ]; then git update-server-info ; fi
 	$(RACKET) -l distro-build/serve-catalog $(SERVE_DURING_CMD)
 
 # Demonstrate how a catalog server for binary packages works,
diff --git a/pkgs/distro-build/drive-clients.rkt b/pkgs/distro-build/drive-clients.rkt
index 2a3aba048f..d64b311819 100644
--- a/pkgs/distro-build/drive-clients.rkt
+++ b/pkgs/distro-build/drive-clients.rkt
@@ -88,7 +88,7 @@
 ;;   #:timeout <number> --- numbers of seconds to wait before declaring
 ;;                          failure; defaults to 30 minutes
 ;;   #:repo <string> --- the git repository for Racket; defaults to
-;;                       "git://github.com/plt/racket.git"
+;;                       "http://<server>:9440/.git"
 ;;
 ;; Machine-only keywords:
 ;;   #:name <string> --- defaults to host
@@ -406,7 +406,7 @@
   (define dist-dir (or (get-opt c '#:dist-dir)
                        default-dist-dir))
   (define repo (or (get-opt c '#:repo)
-                   "git://github.com/plt/racket.git"))
+                   (~a "http://" server ":9440/.git")))
   ((case (or (get-opt c '#:platform) 'unix)
      [(unix) unix-build]
      [else windows-build])
diff --git a/pkgs/distro-build/serve-catalog.rkt b/pkgs/distro-build/serve-catalog.rkt
index 5135b7e362..8d98b80a14 100644
--- a/pkgs/distro-build/serve-catalog.rkt
+++ b/pkgs/distro-build/serve-catalog.rkt
@@ -90,10 +90,12 @@
    #:command-line? #t
    #:listen-ip #f
    #:extra-files-paths
-   (cons
-    (build-path build-dir "origin")
+   (append
+    (list (build-path build-dir "origin"))
     (for/list ([d (in-list dirs)])
-      (path->complete-path (build-path d "pkgs"))))
+      (path->complete-path (build-path d "pkgs")))
+    ;; for ".git":
+    (list (current-directory)))
    #:servlet-regexp #rx""
    #:port 9440))