Skip to content

Commit

Permalink
CLJCLR-128: normalize line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
dmiller committed Jan 7, 2023
1 parent d54b9bf commit a677b78
Show file tree
Hide file tree
Showing 316 changed files with 99,067 additions and 99,067 deletions.
736 changes: 368 additions & 368 deletions .gitignore

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions Clojure.nuspec
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Clojure</id>
<version>1.10.0</version>
<authors>Rich Hickey, Clojure</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>http://opensource.org/licenses/eclipse-1.0.php</licenseUrl>
<projectUrl>https://github.com/clojure/clojure-clr</projectUrl>
<iconUrl>http://clojure.org/file/view/clojure-icon.gif</iconUrl>
<description>Clojure for the CLR.</description>
<tags>clojure clojureclr</tags>
</metadata>
<files>
<file src="bin\4.5\Release\ilmerge\Clojure.dll" target="lib\net45" />
<file src="bin\4.5\Release\Microsoft.Dynamic.dll" target="lib\net45" />
<file src="bin\4.5\Release\Microsoft.Scripting.dll" target="lib\net45" />
<file src="bin\4.5\Release\Clojure.Main.exe" target="tools\net45" />
<file src="bin\4.5\Release\Clojure.Compile.exe" target="tools\net45" />
<file src="bin\4.5\Release\clojure.core.specs.alpha.dll" target="lib\net45" />
<file src="bin\4.5\Release\clojure.spec.alpha.dll" target="lib\net45" />
<file src="bin\4.0\Release\ilmerge\Clojure.dll" target="lib\net40" />
<file src="bin\4.0\Release\Microsoft.Dynamic.dll" target="lib\net40" />
<file src="bin\4.0\Release\Microsoft.Scripting.dll" target="lib\net40" />
<file src="bin\4.0\Release\Clojure.Main.exe" target="tools\net40" />
<file src="bin\4.0\Release\Clojure.Compile.exe" target="tools\net40" />
<file src="bin\4.0\Release\clojure.core.specs.alpha.dll" target="lib\net40" />
<file src="bin\4.0\Release\clojure.spec.alpha.dll" target="lib\net40" />
<file src="bin\3.5\Release\ilmerge\Clojure.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Dynamic.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Scripting.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Scripting.Core.dll" target="lib\net35" />
<file src="bin\3.5\Release\Clojure.Main.exe" target="tools\net35" />
<file src="bin\3.5\Release\Clojure.Compile.exe" target="tools\net35" />
<file src="bin\3.5\Release\clojure.core.specs.alpha.dll" target="lib\net35" />
<file src="bin\3.5\Release\clojure.spec.alpha.dll" target="lib\net35" />
</files>
</package>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Clojure</id>
<version>1.10.0</version>
<authors>Rich Hickey, Clojure</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>http://opensource.org/licenses/eclipse-1.0.php</licenseUrl>
<projectUrl>https://github.com/clojure/clojure-clr</projectUrl>
<iconUrl>http://clojure.org/file/view/clojure-icon.gif</iconUrl>
<description>Clojure for the CLR.</description>
<tags>clojure clojureclr</tags>
</metadata>
<files>
<file src="bin\4.5\Release\ilmerge\Clojure.dll" target="lib\net45" />
<file src="bin\4.5\Release\Microsoft.Dynamic.dll" target="lib\net45" />
<file src="bin\4.5\Release\Microsoft.Scripting.dll" target="lib\net45" />
<file src="bin\4.5\Release\Clojure.Main.exe" target="tools\net45" />
<file src="bin\4.5\Release\Clojure.Compile.exe" target="tools\net45" />
<file src="bin\4.5\Release\clojure.core.specs.alpha.dll" target="lib\net45" />
<file src="bin\4.5\Release\clojure.spec.alpha.dll" target="lib\net45" />
<file src="bin\4.0\Release\ilmerge\Clojure.dll" target="lib\net40" />
<file src="bin\4.0\Release\Microsoft.Dynamic.dll" target="lib\net40" />
<file src="bin\4.0\Release\Microsoft.Scripting.dll" target="lib\net40" />
<file src="bin\4.0\Release\Clojure.Main.exe" target="tools\net40" />
<file src="bin\4.0\Release\Clojure.Compile.exe" target="tools\net40" />
<file src="bin\4.0\Release\clojure.core.specs.alpha.dll" target="lib\net40" />
<file src="bin\4.0\Release\clojure.spec.alpha.dll" target="lib\net40" />
<file src="bin\3.5\Release\ilmerge\Clojure.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Dynamic.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Scripting.dll" target="lib\net35" />
<file src="bin\3.5\Release\Microsoft.Scripting.Core.dll" target="lib\net35" />
<file src="bin\3.5\Release\Clojure.Main.exe" target="tools\net35" />
<file src="bin\3.5\Release\Clojure.Compile.exe" target="tools\net35" />
<file src="bin\3.5\Release\clojure.core.specs.alpha.dll" target="lib\net35" />
<file src="bin\3.5\Release\clojure.spec.alpha.dll" target="lib\net35" />
</files>
</package>
80 changes: 40 additions & 40 deletions Clojure/Clojure.Compile/Clojure.Compile.csproj
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net462</TargetFrameworks>
<StartupObject>BootstrapCompile.Compile</StartupObject>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Clojure.Source\Clojure.Source.csproj" />
<ProjectReference Include="..\Clojure\Clojure.csproj" />
</ItemGroup>


<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
<PropertyGroup>
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
</PropertyGroup>
<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)" />
<ItemGroup>
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
</ItemGroup>
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" />
</Target>



</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net462</TargetFrameworks>
<StartupObject>BootstrapCompile.Compile</StartupObject>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Clojure.Source\Clojure.Source.csproj" />
<ProjectReference Include="..\Clojure\Clojure.csproj" />
</ItemGroup>


<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
<PropertyGroup>
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
</PropertyGroup>
<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)" />
<ItemGroup>
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
</ItemGroup>
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" />
</Target>



</Project>
196 changes: 98 additions & 98 deletions Clojure/Clojure.Compile/Compile.cs
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
/**
* Copyright (c) Rich Hickey. All rights reserved.
* The use and distribution terms for this software are covered by the
* Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
* which can be found in the file epl-v10.html at the root of this distribution.
* By using this software in any fashion, you are agreeing to be bound by
* the terms of this license.
* You must not remove this notice, or any other, from this software.
**/

/**
* Author: David Miller
**/

using System;
using System.Diagnostics;
using System.IO;
using clojure.lang;

namespace BootstrapCompile
{
static class Compile
{

const string PATH_PROP = "CLOJURE_COMPILE_PATH";
const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";

static void Main(string[] args)
{
RT.Init();

TextWriter outTW = (TextWriter)RT.OutVar.deref();
TextWriter errTW = RT.errPrintWriter();

string path = Environment.GetEnvironmentVariable(PATH_PROP);

path = path ?? ".";

string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
object uncheckedMath = false;

if ("true".Equals(mathVal))
uncheckedMath = true;
else if ("warn-on-boxed".Equals(mathVal))
uncheckedMath = Keyword.intern("warn-on-boxed");


// Force load to avoid transitive compilation during lazy load
Compiler.EnsureMacroCheck();

try
{
Var.pushThreadBindings(RT.map(
Compiler.CompilePathVar, path,
RT.WarnOnReflectionVar, warnOnReflection,
RT.UncheckedMathVar, uncheckedMath
));

Stopwatch sw = new Stopwatch();

foreach (string lib in args)
{
sw.Reset();
sw.Start();
outTW.Write("Compiling {0} to {1}", lib, path);
outTW.Flush();
Compiler.CompileVar.invoke(Symbol.intern(lib));
sw.Stop();
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
}
}
catch (Exception e)
{
errTW.WriteLine(e.ToString());
errTW.Flush();
Environment.Exit(1);
}
finally
{
Var.popThreadBindings();
try {
outTW.Flush();
}
catch ( IOException e)
{
errTW.WriteLine(e.StackTrace);
errTW.Flush();
}
}



}
}
}
/**
* Copyright (c) Rich Hickey. All rights reserved.
* The use and distribution terms for this software are covered by the
* Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
* which can be found in the file epl-v10.html at the root of this distribution.
* By using this software in any fashion, you are agreeing to be bound by
* the terms of this license.
* You must not remove this notice, or any other, from this software.
**/

/**
* Author: David Miller
**/

using System;
using System.Diagnostics;
using System.IO;
using clojure.lang;

namespace BootstrapCompile
{
static class Compile
{

const string PATH_PROP = "CLOJURE_COMPILE_PATH";
const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";

static void Main(string[] args)
{
RT.Init();

TextWriter outTW = (TextWriter)RT.OutVar.deref();
TextWriter errTW = RT.errPrintWriter();

string path = Environment.GetEnvironmentVariable(PATH_PROP);

path = path ?? ".";

string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
object uncheckedMath = false;

if ("true".Equals(mathVal))
uncheckedMath = true;
else if ("warn-on-boxed".Equals(mathVal))
uncheckedMath = Keyword.intern("warn-on-boxed");


// Force load to avoid transitive compilation during lazy load
Compiler.EnsureMacroCheck();

try
{
Var.pushThreadBindings(RT.map(
Compiler.CompilePathVar, path,
RT.WarnOnReflectionVar, warnOnReflection,
RT.UncheckedMathVar, uncheckedMath
));

Stopwatch sw = new Stopwatch();

foreach (string lib in args)
{
sw.Reset();
sw.Start();
outTW.Write("Compiling {0} to {1}", lib, path);
outTW.Flush();
Compiler.CompileVar.invoke(Symbol.intern(lib));
sw.Stop();
outTW.WriteLine(" -- {0} milliseconds.", sw.ElapsedMilliseconds);
}
}
catch (Exception e)
{
errTW.WriteLine(e.ToString());
errTW.Flush();
Environment.Exit(1);
}
finally
{
Var.popThreadBindings();
try {
outTW.Flush();
}
catch ( IOException e)
{
errTW.WriteLine(e.StackTrace);
errTW.Flush();
}
}



}
}
}
Loading

0 comments on commit a677b78

Please sign in to comment.