Skip to content

Commit a677b78

Browse files
dmillerdmiller
committed
CLJCLR-128: normalize line endings
1 parent d54b9bf commit a677b78

File tree

316 files changed

+99067
-99067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

316 files changed

+99067
-99067
lines changed

‎.gitignore

Lines changed: 368 additions & 368 deletions
Large diffs are not rendered by default.

‎Clojure.nuspec

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3-
<metadata>
4-
<id>Clojure</id>
5-
<version>1.10.0</version>
6-
<authors>Rich Hickey, Clojure</authors>
7-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8-
<licenseUrl>http://opensource.org/licenses/eclipse-1.0.php</licenseUrl>
9-
<projectUrl>https://github.com/clojure/clojure-clr</projectUrl>
10-
<iconUrl>http://clojure.org/file/view/clojure-icon.gif</iconUrl>
11-
<description>Clojure for the CLR.</description>
12-
<tags>clojure clojureclr</tags>
13-
</metadata>
14-
<files>
15-
<file src="bin\4.5\Release\ilmerge\Clojure.dll" target="lib\net45" />
16-
<file src="bin\4.5\Release\Microsoft.Dynamic.dll" target="lib\net45" />
17-
<file src="bin\4.5\Release\Microsoft.Scripting.dll" target="lib\net45" />
18-
<file src="bin\4.5\Release\Clojure.Main.exe" target="tools\net45" />
19-
<file src="bin\4.5\Release\Clojure.Compile.exe" target="tools\net45" />
20-
<file src="bin\4.5\Release\clojure.core.specs.alpha.dll" target="lib\net45" />
21-
<file src="bin\4.5\Release\clojure.spec.alpha.dll" target="lib\net45" />
22-
<file src="bin\4.0\Release\ilmerge\Clojure.dll" target="lib\net40" />
23-
<file src="bin\4.0\Release\Microsoft.Dynamic.dll" target="lib\net40" />
24-
<file src="bin\4.0\Release\Microsoft.Scripting.dll" target="lib\net40" />
25-
<file src="bin\4.0\Release\Clojure.Main.exe" target="tools\net40" />
26-
<file src="bin\4.0\Release\Clojure.Compile.exe" target="tools\net40" />
27-
<file src="bin\4.0\Release\clojure.core.specs.alpha.dll" target="lib\net40" />
28-
<file src="bin\4.0\Release\clojure.spec.alpha.dll" target="lib\net40" />
29-
<file src="bin\3.5\Release\ilmerge\Clojure.dll" target="lib\net35" />
30-
<file src="bin\3.5\Release\Microsoft.Dynamic.dll" target="lib\net35" />
31-
<file src="bin\3.5\Release\Microsoft.Scripting.dll" target="lib\net35" />
32-
<file src="bin\3.5\Release\Microsoft.Scripting.Core.dll" target="lib\net35" />
33-
<file src="bin\3.5\Release\Clojure.Main.exe" target="tools\net35" />
34-
<file src="bin\3.5\Release\Clojure.Compile.exe" target="tools\net35" />
35-
<file src="bin\3.5\Release\clojure.core.specs.alpha.dll" target="lib\net35" />
36-
<file src="bin\3.5\Release\clojure.spec.alpha.dll" target="lib\net35" />
37-
</files>
38-
</package>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Clojure</id>
5+
<version>1.10.0</version>
6+
<authors>Rich Hickey, Clojure</authors>
7+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8+
<licenseUrl>http://opensource.org/licenses/eclipse-1.0.php</licenseUrl>
9+
<projectUrl>https://github.com/clojure/clojure-clr</projectUrl>
10+
<iconUrl>http://clojure.org/file/view/clojure-icon.gif</iconUrl>
11+
<description>Clojure for the CLR.</description>
12+
<tags>clojure clojureclr</tags>
13+
</metadata>
14+
<files>
15+
<file src="bin\4.5\Release\ilmerge\Clojure.dll" target="lib\net45" />
16+
<file src="bin\4.5\Release\Microsoft.Dynamic.dll" target="lib\net45" />
17+
<file src="bin\4.5\Release\Microsoft.Scripting.dll" target="lib\net45" />
18+
<file src="bin\4.5\Release\Clojure.Main.exe" target="tools\net45" />
19+
<file src="bin\4.5\Release\Clojure.Compile.exe" target="tools\net45" />
20+
<file src="bin\4.5\Release\clojure.core.specs.alpha.dll" target="lib\net45" />
21+
<file src="bin\4.5\Release\clojure.spec.alpha.dll" target="lib\net45" />
22+
<file src="bin\4.0\Release\ilmerge\Clojure.dll" target="lib\net40" />
23+
<file src="bin\4.0\Release\Microsoft.Dynamic.dll" target="lib\net40" />
24+
<file src="bin\4.0\Release\Microsoft.Scripting.dll" target="lib\net40" />
25+
<file src="bin\4.0\Release\Clojure.Main.exe" target="tools\net40" />
26+
<file src="bin\4.0\Release\Clojure.Compile.exe" target="tools\net40" />
27+
<file src="bin\4.0\Release\clojure.core.specs.alpha.dll" target="lib\net40" />
28+
<file src="bin\4.0\Release\clojure.spec.alpha.dll" target="lib\net40" />
29+
<file src="bin\3.5\Release\ilmerge\Clojure.dll" target="lib\net35" />
30+
<file src="bin\3.5\Release\Microsoft.Dynamic.dll" target="lib\net35" />
31+
<file src="bin\3.5\Release\Microsoft.Scripting.dll" target="lib\net35" />
32+
<file src="bin\3.5\Release\Microsoft.Scripting.Core.dll" target="lib\net35" />
33+
<file src="bin\3.5\Release\Clojure.Main.exe" target="tools\net35" />
34+
<file src="bin\3.5\Release\Clojure.Compile.exe" target="tools\net35" />
35+
<file src="bin\3.5\Release\clojure.core.specs.alpha.dll" target="lib\net35" />
36+
<file src="bin\3.5\Release\clojure.spec.alpha.dll" target="lib\net35" />
37+
</files>
38+
</package>

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net462</TargetFrameworks>
6-
<StartupObject>BootstrapCompile.Compile</StartupObject>
7-
</PropertyGroup>
8-
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10-
<WarningLevel>0</WarningLevel>
11-
</PropertyGroup>
12-
13-
<ItemGroup>
14-
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
15-
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
16-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<ProjectReference Include="..\Clojure.Source\Clojure.Source.csproj" />
21-
<ProjectReference Include="..\Clojure\Clojure.csproj" />
22-
</ItemGroup>
23-
24-
25-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
26-
<PropertyGroup>
27-
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
28-
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
29-
</PropertyGroup>
30-
<Exec Command="$(TargetCmdline) clojure.core clojure.core.protocols clojure.core.server clojure.core.reducers 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 clojure.edn clojure.datafy clojure.instant clojure.uuid clojure.math" WorkingDirectory="$(OutDir)" />
31-
<ItemGroup>
32-
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
33-
</ItemGroup>
34-
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
35-
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" />
36-
</Target>
37-
38-
39-
40-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFrameworks>net462</TargetFrameworks>
6+
<StartupObject>BootstrapCompile.Compile</StartupObject>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<WarningLevel>0</WarningLevel>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
15+
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
16+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\Clojure.Source\Clojure.Source.csproj" />
21+
<ProjectReference Include="..\Clojure\Clojure.csproj" />
22+
</ItemGroup>
23+
24+
25+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
26+
<PropertyGroup>
27+
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
28+
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
29+
</PropertyGroup>
30+
<Exec Command="$(TargetCmdline) clojure.core clojure.core.protocols clojure.core.server clojure.core.reducers 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 clojure.edn clojure.datafy clojure.instant clojure.uuid clojure.math" WorkingDirectory="$(OutDir)" />
31+
<ItemGroup>
32+
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
33+
</ItemGroup>
34+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
35+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" />
36+
</Target>
37+
38+
39+
40+
</Project>

‎Clojure/Clojure.Compile/Compile.cs

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
1-
/**
2-
* Copyright (c) Rich Hickey. All rights reserved.
3-
* The use and distribution terms for this software are covered by the
4-
* Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
5-
* which can be found in the file epl-v10.html at the root of this distribution.
6-
* By using this software in any fashion, you are agreeing to be bound by
7-
* the terms of this license.
8-
* You must not remove this notice, or any other, from this software.
9-
**/
10-
11-
/**
12-
* Author: David Miller
13-
**/
14-
15-
using System;
16-
using System.Diagnostics;
17-
using System.IO;
18-
using clojure.lang;
19-
20-
namespace BootstrapCompile
21-
{
22-
static class Compile
23-
{
24-
25-
const string PATH_PROP = "CLOJURE_COMPILE_PATH";
26-
const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
27-
const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";
28-
29-
static void Main(string[] args)
30-
{
31-
RT.Init();
32-
33-
TextWriter outTW = (TextWriter)RT.OutVar.deref();
34-
TextWriter errTW = RT.errPrintWriter();
35-
36-
string path = Environment.GetEnvironmentVariable(PATH_PROP);
37-
38-
path = path ?? ".";
39-
40-
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
41-
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
42-
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
43-
object uncheckedMath = false;
44-
45-
if ("true".Equals(mathVal))
46-
uncheckedMath = true;
47-
else if ("warn-on-boxed".Equals(mathVal))
48-
uncheckedMath = Keyword.intern("warn-on-boxed");
49-
50-
51-
// Force load to avoid transitive compilation during lazy load
52-
Compiler.EnsureMacroCheck();
53-
54-
try
55-
{
56-
Var.pushThreadBindings(RT.map(
57-
Compiler.CompilePathVar, path,
58-
RT.WarnOnReflectionVar, warnOnReflection,
59-
RT.UncheckedMathVar, uncheckedMath
60-
));
61-
62-
Stopwatch sw = new Stopwatch();
63-
64-
foreach (string lib in args)
65-
{
66-
sw.Reset();
67-
sw.Start();
68-
outTW.Write("Compiling {0} to {1}", lib, path);
69-
outTW.Flush();
70-
Compiler.CompileVar.invoke(Symbol.intern(lib));
71-
sw.Stop();
72-
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
73-
}
74-
}
75-
catch (Exception e)
76-
{
77-
errTW.WriteLine(e.ToString());
78-
errTW.Flush();
79-
Environment.Exit(1);
80-
}
81-
finally
82-
{
83-
Var.popThreadBindings();
84-
try {
85-
outTW.Flush();
86-
}
87-
catch ( IOException e)
88-
{
89-
errTW.WriteLine(e.StackTrace);
90-
errTW.Flush();
91-
}
92-
}
93-
94-
95-
96-
}
97-
}
98-
}
1+
/**
2+
* Copyright (c) Rich Hickey. All rights reserved.
3+
* The use and distribution terms for this software are covered by the
4+
* Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
5+
* which can be found in the file epl-v10.html at the root of this distribution.
6+
* By using this software in any fashion, you are agreeing to be bound by
7+
* the terms of this license.
8+
* You must not remove this notice, or any other, from this software.
9+
**/
10+
11+
/**
12+
* Author: David Miller
13+
**/
14+
15+
using System;
16+
using System.Diagnostics;
17+
using System.IO;
18+
using clojure.lang;
19+
20+
namespace BootstrapCompile
21+
{
22+
static class Compile
23+
{
24+
25+
const string PATH_PROP = "CLOJURE_COMPILE_PATH";
26+
const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
27+
const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";
28+
29+
static void Main(string[] args)
30+
{
31+
RT.Init();
32+
33+
TextWriter outTW = (TextWriter)RT.OutVar.deref();
34+
TextWriter errTW = RT.errPrintWriter();
35+
36+
string path = Environment.GetEnvironmentVariable(PATH_PROP);
37+
38+
path = path ?? ".";
39+
40+
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
41+
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
42+
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
43+
object uncheckedMath = false;
44+
45+
if ("true".Equals(mathVal))
46+
uncheckedMath = true;
47+
else if ("warn-on-boxed".Equals(mathVal))
48+
uncheckedMath = Keyword.intern("warn-on-boxed");
49+
50+
51+
// Force load to avoid transitive compilation during lazy load
52+
Compiler.EnsureMacroCheck();
53+
54+
try
55+
{
56+
Var.pushThreadBindings(RT.map(
57+
Compiler.CompilePathVar, path,
58+
RT.WarnOnReflectionVar, warnOnReflection,
59+
RT.UncheckedMathVar, uncheckedMath
60+
));
61+
62+
Stopwatch sw = new Stopwatch();
63+
64+
foreach (string lib in args)
65+
{
66+
sw.Reset();
67+
sw.Start();
68+
outTW.Write("Compiling {0} to {1}", lib, path);
69+
outTW.Flush();
70+
Compiler.CompileVar.invoke(Symbol.intern(lib));
71+
sw.Stop();
72+
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
73+
}
74+
}
75+
catch (Exception e)
76+
{
77+
errTW.WriteLine(e.ToString());
78+
errTW.Flush();
79+
Environment.Exit(1);
80+
}
81+
finally
82+
{
83+
Var.popThreadBindings();
84+
try {
85+
outTW.Flush();
86+
}
87+
catch ( IOException e)
88+
{
89+
errTW.WriteLine(e.StackTrace);
90+
errTW.Flush();
91+
}
92+
}
93+
94+
95+
96+
}
97+
}
98+
}

0 commit comments

Comments
 (0)