Update folder layout

Editor/ClojureRepl.cs

@@ -8,13 +8,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-[InitializeOnLoad]
 public class ClojureRepl : EditorWindow {
-  static ClojureRepl() {
-    // TODO read from config
-    ClojureRepl.StartREPL();
-  }
-
   [MenuItem ("Arcadia/REPL/Window...")]
   public static void Init () {
     ClojureRepl window = (ClojureRepl)EditorWindow.GetWindow (typeof (ClojureRepl));

Editor/Initialization.cs

@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+using clojure.lang;
+
+namespace Arcadia {
+  [InitializeOnLoad]
+  public class Initialization {
+    static Initialization() {
+      Initialize();
+    }
+
+    [MenuItem ("Arcadia/Initialization/Rerun")]
+    public static void Initialize() {
+      Debug.Log("Starting Arcadia...");
+
+      CheckSettings();
+      SetClojureLoadPath();
+      StartREPL();
+
+      Debug.Log("Arcadia Started!");    
+    }
+
+    public static void CheckSettings() {
+      Debug.Log("Checking Unity Settings...");
+      if(PlayerSettings.apiCompatibilityLevel != ApiCompatibilityLevel.NET_2_0) {
+        Debug.Log("Updating API Compatibility Level");
+        PlayerSettings.apiCompatibilityLevel = ApiCompatibilityLevel.NET_2_0;
+      }
+
+      if(!PlayerSettings.runInBackground) {
+        Debug.Log("Updating Run In Background");
+        PlayerSettings.runInBackground = true;
+      }
+    }
+
+    public static void SetClojureLoadPath() {
+      try {
+        Debug.Log("Setting Load Path...");
+        string clojureDllFolder = Path.GetDirectoryName(
+          AssetDatabase.FindAssets("Clojure")
+            .Select(x => AssetDatabase.GUIDToAssetPath(x))
+            .Where(x => x.Contains("Clojure.dll"))
+            .Single());
+
+        Environment.SetEnvironmentVariable("CLOJURE_LOAD_PATH",
+          Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Compiled")) + ":" +
+          Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Source")) + ":" +
+          Path.GetFullPath(Application.dataPath));
+        Debug.Log("Load Path is " + Environment.GetEnvironmentVariable("CLOJURE_LOAD_PATH"));
+      } catch(InvalidOperationException e) {
+        throw new SystemException("Error Loading Arcadia! Arcadia expects exactly one Arcadia folder (a folder with Clojure.dll in it)");
+      }
+    }
+
+    static void StartREPL() {
+      ClojureRepl.StartREPL();
+    }
+
+    // old mono...
+    static string VariadicCombine(params string[] paths) {
+      string path = "";
+      foreach(string p in paths) {
+        path = Path.Combine(path, p);
+      }
+      return path;
+    }
+  } 
+}

arcadia/compiler.clj → Source/arcadia/compiler.clj

@@ -6,24 +6,17 @@
            [UnityEditor AssetDatabase ImportAssetOptions PlayerSettings ApiCompatibilityLevel]))
 
 (defn assemblies-path []
-  (Path/Combine
-    (Path/GetDirectoryName
-      (.Location (.Assembly clojure.lang.RT)))
-    "Compiled"))
+  (let [clj-dll-folder (Path/GetDirectoryName (.Location (.Assembly clojure.lang.RT)))
+        arcadia-folder (Path/Combine clj-dll-folder "..")
+        compiled-folder (Path/Combine arcadia-folder "Compiled")]
+    (Path/GetFullPath compiled-folder)))
 
 ;; should we just patch the compiler to make GetFindFilePaths public?
 (defn load-path []
   (seq (.Invoke (.GetMethod clojure.lang.RT "GetFindFilePaths"
                             (enum-or BindingFlags/Static BindingFlags/NonPublic))
                 clojure.lang.RT nil)))
 
-(defn env-load-path []
-  (System.Environment/GetEnvironmentVariable "CLOJURE_LOAD_PATH"))
-
-(defn initialize-unity []
-  (set! PlayerSettings/apiCompatibilityLevel ApiCompatibilityLevel/NET_2_0)
-  (set! PlayerSettings/runInBackground true))
-
 (defn rests
   "Returns a sequence of all rests of the input sequence
   
@@ -70,15 +63,8 @@
                 unchecked-math
                 compiler-options]}
         (@configuration :compiler)
-        load-path (if load-path
-                    (concat load-path ["Assets"])
-                    ["Assets"])
         assemblies (or assemblies
                        (assemblies-path))]
-    (System.Environment/SetEnvironmentVariable
-      "CLOJURE_LOAD_PATH"
-      (clojure.string/join ":"
-                           (cons assemblies load-path)))
     (if-let [namespace (-> (relative-to-load-path asset)
                            first
                            path->ns)]