Skip to content

Commit 7745dec

Browse files
dmillerdmiller
committed
CLJCLR-25: Allow Clojure.Compile.exe to create single DLL for all compile .clj files
1 parent d14947b commit 7745dec

File tree

5 files changed

+127
-41
lines changed

5 files changed

+127
-41
lines changed

‎Clojure/Clojure.Compile/Clojure.Compile.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
7575
</PropertyGroup>
7676
<ItemGroup>
77-
<Reference Include="Microsoft.Scripting.Core" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
77+
<Reference Include="Microsoft.Scripting.Core" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
7878
<HintPath>..\packages\DynamicLanguageRuntime.1.1.0-alpha1\lib\Net35\Microsoft.Scripting.Core.dll</HintPath>
79-
</Reference>
79+
</Reference>
8080
<Reference Include="System" />
8181
<Reference Include="System.Core">
8282
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -134,7 +134,10 @@
134134
<Runtime>.Net</Runtime>
135135
</PropertyGroup>
136136
<PropertyGroup>
137-
<PostBuildEvent Condition=" '$(Runtime)' == 'Mono' ">mono "$(TargetPath)" clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
138-
<PostBuildEvent Condition=" '$(Runtime)' == '.Net' ">"$(TargetPath)" clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
137+
<PostBuildEvent Condition=" '$(Runtime)' == 'Mono' ">mono "$(TargetPath)" -o clojure.core.clj.dll clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
138+
<PostBuildEvent Condition=" '$(Runtime)' == '.Net' ">"$(TargetPath)" -o clojure.core.clj.dll clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
139+
</PropertyGroup>
140+
<PropertyGroup>
141+
<PostBuildEvent>"$(TargetPath)" -o clojure.core2.clj.dll clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
139142
</PropertyGroup>
140143
</Project>

‎Clojure/Clojure.Compile/Compile.cs‎

Lines changed: 88 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,85 @@
1313
**/
1414

1515
using System;
16+
using System.Collections;
1617
using System.Collections.Generic;
17-
using System.Linq;
18-
using System.Text;
18+
using System.Diagnostics;
1919
using System.IO;
2020
using clojure.lang;
21-
using System.Collections;
22-
using System.Diagnostics;
2321

2422
namespace BootstrapCompile
2523
{
2624
static class Compile
2725
{
28-
2926
const string PATH_PROP = "CLOJURE_COMPILE_PATH";
3027
const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
3128
const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";
3229

3330
static void Main(string[] args)
3431
{
35-
TextWriter outTW = (TextWriter)RT.OutVar.deref();
36-
TextWriter errTW = RT.errPrintWriter();
32+
string assemblyName;
33+
List<string> fileNames;
34+
35+
if (!ParseArgs(args, out assemblyName, out fileNames))
36+
return;
37+
38+
DoCompile(assemblyName, fileNames);
39+
}
40+
41+
static bool ParseArgs(string[] args, out string assemblyName, out List<String> fileNames)
42+
{
43+
assemblyName = null;
44+
fileNames = null;
45+
46+
if (args.Length == 0)
47+
{
48+
PrintUsage();
49+
return false;
50+
}
51+
52+
if (args[0].Equals("-o"))
53+
{
54+
if (args.Length == 1)
55+
{
56+
Console.WriteLine("-o option must be followed by a filename");
57+
PrintUsage();
58+
return false;
59+
}
60+
61+
if (args.Length == 2)
62+
{
63+
Console.WriteLine("Need filenames to compile");
64+
PrintUsage();
65+
return false;
66+
}
67+
assemblyName = args[1];
68+
fileNames = new List<String>(args.Length - 2);
3769

70+
for (int i = 2; i < args.Length; i++)
71+
fileNames.Add(args[i]);
72+
73+
return true;
74+
}
75+
else
76+
{
77+
assemblyName = null;
78+
fileNames = new List<String>(args);
79+
return true;
80+
}
81+
}
82+
83+
static void PrintUsage()
84+
{
85+
Console.WriteLine("Usage: Clojure.Compile [-o assemblyName] fileNames...");
86+
}
87+
88+
static void DoCompile(string assemblyName, List<String> fileNames)
89+
{
3890
string path = Environment.GetEnvironmentVariable(PATH_PROP);
3991

4092
path = path ?? ".";
4193

42-
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
94+
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
4395
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
4496
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
4597
bool uncheckedMath = mathVal == null ? false : mathVal.Equals("true");
@@ -49,14 +101,19 @@ static void Main(string[] args)
49101
{
50102
String name = (String)kv.Key;
51103
String v = (String)kv.Value;
52-
if ( name.StartsWith("CLOJURE_COMPILER_") )
104+
if (name.StartsWith("CLOJURE_COMPILER_"))
53105
{
54106
compilerOptions = RT.assoc(compilerOptions
55-
,RT.keyword(null,name.Substring(1+name.LastIndexOf('_')))
56-
,RT.readString(v));
107+
, RT.keyword(null, name.Substring(1 + name.LastIndexOf('_')))
108+
, RT.readString(v));
57109
}
58110
}
59111

112+
// Even though these are not used in all paths, we need this early
113+
// to get RT initialized before Compiler.
114+
TextWriter outTW = (TextWriter)RT.OutVar.deref();
115+
TextWriter errTW = RT.errPrintWriter();
116+
60117
try
61118
{
62119
Var.pushThreadBindings(RT.map(
@@ -66,39 +123,39 @@ static void Main(string[] args)
66123
Compiler.CompilerOptionsVar, compilerOptions
67124
));
68125

69-
Stopwatch sw = new Stopwatch();
70-
71-
foreach (string lib in args)
126+
if (String.IsNullOrWhiteSpace(assemblyName))
72127
{
73-
sw.Reset();
74-
sw.Start();
75-
outTW.Write("Compiling {0} to {1}", lib, path);
76-
outTW.Flush();
77-
Compiler.CompileVar.invoke(Symbol.intern(lib));
78-
sw.Stop();
79-
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
128+
Stopwatch sw = new Stopwatch();
129+
foreach (string lib in fileNames)
130+
{
131+
sw.Reset();
132+
sw.Start();
133+
outTW.Write("Compiling {0} to {1}", lib, path);
134+
outTW.Flush();
135+
Compiler.CompileVar.invoke(Symbol.intern(lib));
136+
sw.Stop();
137+
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
138+
}
139+
}
140+
else
141+
{
142+
bool hasMain = assemblyName.ToLower().Trim().EndsWith(".exe");
143+
RT.Compile(fileNames, Path.GetFileNameWithoutExtension(assemblyName), hasMain);
80144
}
81-
}
82-
catch (Exception e)
83-
{
84-
errTW.WriteLine(e.ToString());
85-
Environment.Exit(1);
86145
}
87146
finally
88147
{
89148
Var.popThreadBindings();
90-
try {
149+
try
150+
{
91151
outTW.Flush();
92152
outTW.Close();
93153
}
94-
catch ( IOException e)
154+
catch (IOException e)
95155
{
96156
errTW.WriteLine(e.StackTrace);
97157
}
98158
}
99-
100-
101-
102159
}
103160
}
104161
}

‎Clojure/Clojure.Tests/clojure/test_clojure/attributes.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Foo (#^{ ObsoleteAttribute "abc"
8383
(defn foo-init [obj]
8484
[[obj] nil])
8585

86-
(assembly-load "foo.Bar")
86+
;;(assembly-load "foo.Bar")
8787
(deftest test-attributes-on-constructor
8888
(is (some #(instance? ObsoleteAttribute %)
8989
(for [ctor (.GetConstructors (clojure.lang.RT/classForName "foo.Bar"))

‎Clojure/Clojure/CljCompiler/GenClass.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ public static Type GenerateClass(string className,
8383

8484
string extension = hasMain ? ".exe" : ".dll";
8585

86-
87-
GenContext context = GenContext.CreateWithExternalAssembly(Compiler.munge(className), extension, true);
86+
87+
GenContext context = Compiler.IsCompiling
88+
? Compiler.CompilerContextVar.deref() as GenContext
89+
: GenContext.CreateWithExternalAssembly(Compiler.munge(className), extension, true);
8890

8991
// define the class
9092
List<Type> interfaceTypes = new List<Type>();
@@ -136,7 +138,8 @@ public static Type GenerateClass(string className,
136138

137139
Type t = proxyTB.CreateType();
138140

139-
context.SaveAssembly();
141+
if ( ! Compiler.IsCompiling)
142+
context.SaveAssembly();
140143

141144
return t;
142145
}

‎Clojure/Clojure/Lib/RT.cs‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
using System.IO;
2020
using System.Linq;
2121
using System.Reflection;
22-
using System.Reflection.Emit;
2322
using System.Runtime.Serialization;
2423
using System.Text;
2524
using System.Text.RegularExpressions;
2625
using System.Threading;
26+
using clojure.lang.CljCompiler.Ast;
2727
using clojure.lang.Runtime;
2828
using Microsoft.Scripting.Hosting;
2929
using RTProperties = clojure.runtime.Properties;
30-
//using BigDecimal = java.math.BigDecimal;
30+
3131

3232
namespace clojure.lang
3333
{
@@ -3385,6 +3385,29 @@ private static void Compile(string dirName, string name, TextReader rdr, string
33853385
Compiler.Compile(rdr, dirName, name, relativePath);
33863386
}
33873387

3388+
public static void Compile(List<string> cljNames, string assemblyName, bool hasMain)
3389+
{
3390+
try
3391+
{
3392+
Var.pushThreadBindings(mapUniqueKeys(Compiler.CompileFilesVar, true));
3393+
GenContext context = GenContext.CreateWithExternalAssembly(assemblyName, assemblyName, hasMain ? ".exe" : ".dll", true);
3394+
foreach (string cljName in cljNames)
3395+
{
3396+
string fileName = cljName.Replace("-", "_").Replace(".", "/") + ".clj";
3397+
FileInfo cljInfo = FindFile(fileName);
3398+
using (TextReader rdr = cljInfo.OpenText())
3399+
{
3400+
Compiler.Compile(context, rdr, cljInfo.Directory.FullName, cljInfo.Name, fileName);
3401+
}
3402+
}
3403+
context.SaveAssembly();
3404+
}
3405+
finally
3406+
{
3407+
Var.popThreadBindings();
3408+
}
3409+
}
3410+
33883411
static FileInfo FindFile(string path, string filename)
33893412
{
33903413
string probePath = ConvertPath(Path.Combine(path, filename));

0 commit comments

Comments
 (0)