Skip to content

Commit ebc2be9

Browse files
committed
CLJCLR-102: On init, load spec DLLs from application base directory
1 parent 73dc639 commit ebc2be9

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Clojure/Clojure/Lib/RT.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,14 +652,22 @@ public static void LoadSpecCode()
652652
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
653653
static void DoInit()
654654
{
655+
// Load clojure.core
656+
655657
//Stopwatch sw = new Stopwatch();
656658
//sw.Start();
657659
load("clojure/core");
658-
Assembly.LoadFrom("clojure.spec.alpha.dll");
659-
Assembly.LoadFrom("clojure.core.specs.alpha.dll");
660660
//sw.Stop();
661661
//Console.WriteLine("Initial clojure/core load: {0} milliseconds.", sw.ElapsedMilliseconds);
662662

663+
// load spec
664+
{
665+
string baseDir = AppDomain.CurrentDomain.BaseDirectory;
666+
667+
Assembly.LoadFile(Path.Combine(baseDir, "clojure.spec.alpha.dll"));
668+
Assembly.LoadFile(Path.Combine(baseDir, "clojure.core.specs.alpha.dll"));
669+
}
670+
663671
PostBootstrapInit();
664672

665673
CHECK_SPECS = RT.instrumentMacros;

0 commit comments

Comments
 (0)