Start work on MAGIC Nostrand bootstrap

Working but not 100% reproducible yet
nasser · Oct 13, 2020 · f88c3e4 · f88c3e4
1 parent 636f6db
commit f88c3e4
Show file tree

Hide file tree

Showing 79 changed files with 52 additions and 24 deletions.
diff --git a/Nostrand.cs b/Nostrand.cs
@@ -70,8 +70,8 @@ public static Var FindFunction(string name)
 			return null;
 		}
 
-		[DllImport("__Internal", EntryPoint = "mono_get_runtime_build_info")]
-		public extern static string GetMonoVersion();
+		// [DllImport("__Internal", EntryPoint = "mono_get_runtime_build_info")]
+		// public extern static string GetRuntimeVersion();
 
 		public static string Version()
 		{
@@ -86,17 +86,42 @@ public static string FileToRelativePath(string file)
 			return file.Replace(".clj", "").Replace(".cljc", "");
 		}
 
+		static void BootClojureAndNostrand()
+		{
+			var assemblyPath = Path.GetDirectoryName(Assembly.Load("Clojure").Location);
+			foreach(var cljDll in Directory.EnumerateFiles(assemblyPath, "*.clj.dll"))
+			{
+				// Terminal.Message("[loading]", cljDll, ConsoleColor.DarkGray);
+				Assembly.LoadFile(cljDll);
+			}
+
+			// Terminal.Message("[booting]", "runtime", ConsoleColor.DarkGray);
+			RT.Initialize(doRuntimePostBoostrap: false);
+			// Terminal.Message("[booting]", "clojure/core", ConsoleColor.DarkGray);
+			RT.TryLoadInitType("clojure/core");
+			// Terminal.Message("[booting]", "magic/api", ConsoleColor.DarkGray);
+			RT.TryLoadInitType("magic/api");
+
+			// Terminal.Message("[booting]", "establishing root bindings", ConsoleColor.DarkGray);
+			RT.var("clojure.core", "*eval-form-fn*").bindRoot(RT.var("magic.api", "eval"));
+			RT.var("clojure.core", "*load-file-fn*").bindRoot(RT.var("magic.api", "runtime-load-file"));
+			RT.var("clojure.core", "*compile-file-fn*").bindRoot(RT.var("magic.api", "runtime-compile-file"));
+
+			// var loadFunction = RT.var("clojure.core", "*load-fn*");
+			// Terminal.Message("[loading]", "nostrand/core", ConsoleColor.DarkGray);
+			// loadFunction.invoke("nostrand/core");
+			RT.TryLoadInitType("nostrand/core");
+			// Terminal.Message("[loading]", "nostrand/tasks", ConsoleColor.DarkGray);
+			// loadFunction.invoke("nostrand/tasks");
+			RT.TryLoadInitType("nostrand/tasks");
+		}
+
 		public static void Main(string[] args)
 		{
 			new Mono.Terminal.LineEditor("#force-mono.terminal-assembly-load#");
+			BootClojureAndNostrand();
 			if (args.Length > 0)
 			{
-				RuntimeBootstrapFlag._doRTBootstrap = false;
-
-				RT.load("clojure/core");
-				RT.load("nostrand/core");
-				RT.load("nostrand/tasks");
-
 				AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolver.Resolve;
 
 				if (File.Exists("project.edn"))
@@ -150,7 +175,7 @@ public static void Main(string[] args)
 			else
 			{
 				Terminal.Message("Nostrand", Version(), ConsoleColor.White);
-				Terminal.Message("Mono", GetMonoVersion(), ConsoleColor.White);
+				// Terminal.Message("Mono", GetRuntimeVersion(), ConsoleColor.White);
 				Terminal.Message("Clojure", RT.var("clojure.core", "clojure-version").invoke(), ConsoleColor.White);
 			}
 		}

diff --git a/Nostrand.csproj b/Nostrand.csproj
@@ -1,12 +1,13 @@
-<Project InitialTargets="PreBuild" Sdk="Microsoft.NET.Sdk">
+<!-- <Project InitialTargets="PreBuild" Sdk="Microsoft.NET.Sdk"> -->
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net471</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Scripts/nos" Link="nos" CopyToOutputDirectory="PreserveNewest"  />
+    <!-- <Content Include="Scripts/nos" Link="nos" CopyToOutputDirectory="PreserveNewest"  /> -->
     <Content Include="nostrand/**/*.*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>  
@@ -18,16 +19,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Clojure">
-      <HintPath>References/Clojure.dll</HintPath>
-    </Reference>
+    <Reference Include="References/*.dll" />
   </ItemGroup>
 
-  <Target Name="PreBuild">
+  <!-- <Target Name="PreBuild">
     <Exec Command="sh Scripts/patch-assembly-info.sh" />
   </Target>
   <Target Name="PostBuild" AfterTargets="Build">
     <Exec Command="sh Scripts/unpatch-assembly-info.sh" />
     <Exec Command="sh Scripts/aot-assemblies.sh $(OutDir)" Condition="'$(Configuration)'=='Release'" />
-  </Target>
+  </Target> -->
 </Project>
diff --git a/References/Clojure.dll b/References/Clojure.dll
diff --git a/References/Magic.Runtime.dll b/References/Magic.Runtime.dll
diff --git a/References/clojure.clr.io.clj.dll b/References/clojure.clr.io.clj.dll
diff --git a/References/clojure.clr.shell.clj.dll b/References/clojure.clr.shell.clj.dll
diff --git a/References/clojure.core.clj.dll b/References/clojure.core.clj.dll
diff --git a/References/clojure.core.protocols.clj.dll b/References/clojure.core.protocols.clj.dll
diff --git a/References/clojure.core.reducers.clj.dll b/References/clojure.core.reducers.clj.dll
diff --git a/References/clojure.core.server.clj.dll b/References/clojure.core.server.clj.dll
diff --git a/References/clojure.core.specs.alpha.clj.dll b/References/clojure.core.specs.alpha.clj.dll
diff --git a/References/clojure.core_clr.clj.dll b/References/clojure.core_clr.clj.dll
diff --git a/References/clojure.core_deftype.clj.dll b/References/clojure.core_deftype.clj.dll
diff --git a/References/clojure.core_print.clj.dll b/References/clojure.core_print.clj.dll
diff --git a/References/clojure.core_proxy.clj.dll b/References/clojure.core_proxy.clj.dll
diff --git a/References/clojure.data.clj.dll b/References/clojure.data.clj.dll
diff --git a/References/clojure.edn.clj.dll b/References/clojure.edn.clj.dll
diff --git a/References/clojure.genclass.clj.dll b/References/clojure.genclass.clj.dll
diff --git a/References/clojure.gvec.clj.dll b/References/clojure.gvec.clj.dll
diff --git a/References/clojure.instant.clj.dll b/References/clojure.instant.clj.dll
diff --git a/References/clojure.main.clj.dll b/References/clojure.main.clj.dll
diff --git a/References/clojure.repl.clj.dll b/References/clojure.repl.clj.dll
diff --git a/References/clojure.set.clj.dll b/References/clojure.set.clj.dll
diff --git a/References/clojure.spec.alpha.clj.dll b/References/clojure.spec.alpha.clj.dll
diff --git a/References/clojure.spec.gen.alpha.clj.dll b/References/clojure.spec.gen.alpha.clj.dll
diff --git a/References/clojure.stacktrace.clj.dll b/References/clojure.stacktrace.clj.dll
diff --git a/References/clojure.string.clj.dll b/References/clojure.string.clj.dll
diff --git a/References/clojure.template.clj.dll b/References/clojure.template.clj.dll
diff --git a/References/clojure.test.clj.dll b/References/clojure.test.clj.dll
diff --git a/References/clojure.tools.analyzer.ast.clj.dll b/References/clojure.tools.analyzer.ast.clj.dll
diff --git a/References/clojure.tools.analyzer.clj.dll b/References/clojure.tools.analyzer.clj.dll
diff --git a/References/clojure.tools.analyzer.env.clj.dll b/References/clojure.tools.analyzer.env.clj.dll
diff --git a/References/clojure.tools.analyzer.passes.cleanup.clj.dll b/References/clojure.tools.analyzer.passes.cleanup.clj.dll
diff --git a/References/clojure.tools.analyzer.passes.clj.dll b/References/clojure.tools.analyzer.passes.clj.dll
diff --git a/References/clojure.tools.analyzer.passes.elide_meta.clj.dll b/References/clojure.tools.analyzer.passes.elide_meta.clj.dll
diff --git a/References/clojure.tools.analyzer.passes.source_info.clj.dll b/References/clojure.tools.analyzer.passes.source_info.clj.dll
diff --git a/References/clojure.tools.analyzer.passes.trim.clj.dll b/References/clojure.tools.analyzer.passes.trim.clj.dll
diff --git a/References/clojure.tools.analyzer.utils.clj.dll b/References/clojure.tools.analyzer.utils.clj.dll
diff --git a/References/clojure.uuid.clj.dll b/References/clojure.uuid.clj.dll
diff --git a/References/clojure.walk.clj.dll b/References/clojure.walk.clj.dll
diff --git a/References/clojure.zip.clj.dll b/References/clojure.zip.clj.dll
diff --git a/References/mage.core.clj.dll b/References/mage.core.clj.dll
diff --git a/References/magic.analyzer.analyze_host_forms.clj.dll b/References/magic.analyzer.analyze_host_forms.clj.dll
diff --git a/References/magic.analyzer.binder.clj.dll b/References/magic.analyzer.binder.clj.dll
diff --git a/References/magic.analyzer.clj.dll b/References/magic.analyzer.clj.dll
diff --git a/References/magic.analyzer.collect_closed_overs.clj.dll b/References/magic.analyzer.collect_closed_overs.clj.dll
diff --git a/References/magic.analyzer.errors.clj.dll b/References/magic.analyzer.errors.clj.dll
diff --git a/References/magic.analyzer.generated_types.clj.dll b/References/magic.analyzer.generated_types.clj.dll
diff --git a/References/magic.analyzer.intrinsics.clj.dll b/References/magic.analyzer.intrinsics.clj.dll
diff --git a/References/magic.analyzer.literal_reinterpretation.clj.dll b/References/magic.analyzer.literal_reinterpretation.clj.dll
diff --git a/References/magic.analyzer.loop_bindings.clj.dll b/References/magic.analyzer.loop_bindings.clj.dll
diff --git a/References/magic.analyzer.novel.clj.dll b/References/magic.analyzer.novel.clj.dll
diff --git a/References/magic.analyzer.reflection.clj.dll b/References/magic.analyzer.reflection.clj.dll
diff --git a/References/magic.analyzer.remove_local_children.clj.dll b/References/magic.analyzer.remove_local_children.clj.dll
diff --git a/References/magic.analyzer.typed_passes.clj.dll b/References/magic.analyzer.typed_passes.clj.dll
diff --git a/References/magic.analyzer.types.clj.dll b/References/magic.analyzer.types.clj.dll
diff --git a/References/magic.analyzer.uniquify.clj.dll b/References/magic.analyzer.uniquify.clj.dll
diff --git a/References/magic.analyzer.untyped_passes.clj.dll b/References/magic.analyzer.untyped_passes.clj.dll
diff --git a/References/magic.analyzer.util.clj.dll b/References/magic.analyzer.util.clj.dll
diff --git a/References/magic.api.clj.dll b/References/magic.api.clj.dll
diff --git a/References/magic.core.clj.dll b/References/magic.core.clj.dll
diff --git a/References/magic.emission.clj.dll b/References/magic.emission.clj.dll
diff --git a/References/magic.interop.clj.dll b/References/magic.interop.clj.dll
diff --git a/References/magic.intrinsics.clj.dll b/References/magic.intrinsics.clj.dll
diff --git a/References/magic.spells.lift_keywords.clj.dll b/References/magic.spells.lift_keywords.clj.dll
diff --git a/References/magic.spells.lift_vars.clj.dll b/References/magic.spells.lift_vars.clj.dll
diff --git a/References/magic.util.clj.dll b/References/magic.util.clj.dll
diff --git a/References/nostrand.core.clj.dll b/References/nostrand.core.clj.dll
diff --git a/References/nostrand.deps.clj.dll b/References/nostrand.deps.clj.dll
diff --git a/References/nostrand.deps.github.clj.dll b/References/nostrand.deps.github.clj.dll
diff --git a/References/nostrand.deps.maven.clj.dll b/References/nostrand.deps.maven.clj.dll
diff --git a/References/nostrand.deps.nuget.clj.dll b/References/nostrand.deps.nuget.clj.dll
diff --git a/References/nostrand.deps.shell.clj.dll b/References/nostrand.deps.shell.clj.dll
diff --git a/References/nostrand.repl.clj.dll b/References/nostrand.repl.clj.dll
diff --git a/References/nostrand.tasks.clj.dll b/References/nostrand.tasks.clj.dll
diff --git a/nostrand/bootstrap.clj b/nostrand/bootstrap.clj
@@ -1,8 +1,7 @@
 (ns nostrand.bootstrap)
 
 (defn full-aot []
-  (binding [*compile-path* "."
-            *compile-files* true]
-    (require 'nostrand.core :reload-all)
-    (require 'nostrand.tasks :reload-all)
-    (require 'nostrand.repl :reload-all)))
+  (binding [clojure.core/*loaded-libs* (ref (sorted-set))]
+    (compile 'nostrand.core)
+    (compile 'nostrand.tasks)
+    (compile 'nostrand.repl)))
diff --git a/nostrand/core.clj b/nostrand/core.clj
@@ -28,7 +28,12 @@
 (defn update-load-path []
   (Environment/SetEnvironmentVariable
     "CLOJURE_LOAD_PATH"
-    (string/join Path/PathSeparator @-load-path)))
+    (string/join Path/PathSeparator @-load-path))
+  (alter-var-root #'*load-paths*
+                  (fn [load-paths]
+                    (mapv
+                     #(System.IO.Path/GetFullPath %)
+                     (concat @-load-path load-paths)))))
 
 (defn set-load-path [val]
   (reset! -load-path val)

diff --git a/nostrand/repl.clj b/nostrand/repl.clj
@@ -8,7 +8,7 @@
     [System.Net IPEndPoint IPAddress]
     [System.Net.Sockets UdpClient SocketException]
     [Nostrand Nostrand Terminal] 
-    ; [Mono.Terminal LineEditor]
+    [Mono.Terminal LineEditor]
     ))
 
 (defn- prompt []

diff --git a/nostrand/tasks.clj b/nostrand/tasks.clj
@@ -20,7 +20,7 @@
 
 (defn version []
   (msg "Nostrand" (Nostrand/Version))
-  (msg "Mono" (Nostrand/GetMonoVersion))
+  ;; (msg "Mono" (Nostrand/GetMonoVersion))
   (msg "Clojure" (clojure-version)))
 
 (defn cli-repl [args]