conscript: drop conscript/local

MarcKaufmann · Nov 8, 2024 · b6c1dd5 · b6c1dd5
1 parent 3275ad6
commit b6c1dd5
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 547 deletions.
diff --git a/congame-core/components/dsl.rkt b/congame-core/components/dsl.rkt
@@ -38,22 +38,21 @@
      (dsl-require* src id)]))
 
 (define (dsl-require* src id)
-  (let ([src (regexp-replace #rx"#lang conscript/local" src "#lang conscript")])
-    (log-dsl-debug "dsl-require: ~a" (~.s #:max-width 1024 src))
-    (unless (regexp-match? #rx"^#lang conscript *\r?\n" src)
-      (error 'dsl-require "only #lang conscript is supported"))
-    (define path #f)
-    (dynamic-wind
-      (lambda ()
-        (set! path (make-temporary-file "conscript-dsl-~a.rkt")))
-      (lambda ()
-        (call-with-output-file path
-          #:exists 'truncate/replace
-          (lambda (out)
-            (display src out)))
-        (begin0 (dynamic-require `(file ,(path->string path)) id)
-          (module-cache-clear!)
-          (collect-garbage)))
-      (lambda ()
-        (with-handlers ([exn:fail:filesystem? void])
-          (delete-file path))))))
+  (log-dsl-debug "dsl-require: ~a" (~.s #:max-width 1024 src))
+  (unless (regexp-match? #rx"^#lang conscript *\r?\n" src)
+    (error 'dsl-require "only #lang conscript is supported"))
+  (define path #f)
+  (dynamic-wind
+    (lambda ()
+      (set! path (make-temporary-file "conscript-dsl-~a.rkt")))
+    (lambda ()
+      (call-with-output-file path
+        #:exists 'truncate/replace
+        (lambda (out)
+          (display src out)))
+      (begin0 (dynamic-require `(file ,(path->string path)) id)
+        (module-cache-clear!)
+        (collect-garbage)))
+    (lambda ()
+      (with-handlers ([exn:fail:filesystem? void])
+        (delete-file path)))))
diff --git a/congame-example-study/conscript-archetype1.rkt b/congame-example-study/conscript-archetype1.rkt
@@ -1,4 +1,4 @@
-#lang conscript/local
+#lang conscript
 
 (provide
  hya54)

diff --git a/congame-example-study/conscript-examples.rkt b/congame-example-study/conscript-examples.rkt
@@ -1,4 +1,4 @@
-#lang conscript/local
+#lang conscript
 
 (require racket/format) ; -> provides ~r
 

diff --git a/congame-example-study/conscript-local-shared.rkt b/congame-example-study/conscript-local-shared.rkt
diff --git a/...ame-example-study/conscript-local-transitions-and-image/img/code-screenshot.png b/...ame-example-study/conscript-local-transitions-and-image/img/code-screenshot.png
diff --git a/congame-example-study/conscript-local-transitions-and-image/study.rkt b/congame-example-study/conscript-local-transitions-and-image/study.rkt
diff --git a/congame-example-study/conscript-local.rkt b/congame-example-study/conscript-local.rkt
diff --git a/congame-example-study/many-designs/ach91.rkt b/congame-example-study/many-designs/ach91.rkt
@@ -1,4 +1,4 @@
-#lang conscript/local
+#lang conscript
 
 ;; ACH91:
 ;;

diff --git a/congame-example-study/prisoners-dilemma.rkt b/congame-example-study/prisoners-dilemma.rkt
@@ -9,7 +9,6 @@
  prisoners-dilemma-model)
 
 ;; For next time:
-;; * Multiple participants & current owner in conscript/local
 ;; * Add bot support to conscript (default actions on all steps, figure out models)
 
 (defvar*/instance choices dilemma-choices)

diff --git a/conscript/base.rkt b/conscript/base.rkt
@@ -130,7 +130,6 @@
   (define whitelist
     '(buid
       congame-web/components/uploaded-file
-      conscript/local/matchmaking
       conscript/matchmaking
       conscript/survey-tools
       gregor

diff --git a/conscript/info.rkt b/conscript/info.rkt
@@ -11,6 +11,7 @@
     "koyo-lib"
     "mime-type-lib"
     "net-lib"
+    "threading-lib"
     "web-server-lib"))
 (define build-deps
   '("rackunit-lib"))