From 22bfb417a13abebf35da6922e5399453eb3897ab Mon Sep 17 00:00:00 2001
From: Robert Johnson <bobjohnson11@gmail.com>
Date: Tue, 11 Sep 2012 13:22:00 -0400
Subject: [PATCH 1/3] Updated SourceFiles parameter to allow ClojureCLR tests
 to run

---
 Clojure/build.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Clojure/build.proj b/Clojure/build.proj
index e67564f05..a3f10505d 100644
--- a/Clojure/build.proj
+++ b/Clojure/build.proj
@@ -31,7 +31,7 @@
   </Target>
   
   <Target Name="Test" DependsOnTargets="Build;CompileTest">
-    <Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Source\clojure\run_tests.clj" DestinationFolder="$(OutputPath)" />
+    <Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_tests.clj" DestinationFolder="$(OutputPath)" />
     <Exec Command="$(clji) clojure\run_tests.clj"
           WorkingDirectory="$(OutputPath)"/>
   </Target>

From aad9d9130d69e7119b6d4c5bb8d9a1f96f8b1e76 Mon Sep 17 00:00:00 2001
From: Robert Johnson <bobjohnson11@gmail.com>
Date: Tue, 11 Sep 2012 13:39:44 -0400
Subject: [PATCH 2/3] Updated arr with ^objects type information so the aget
 function will be properly resolved

---
 Clojure/Clojure.Source/clojure/core/protocols.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Clojure/Clojure.Source/clojure/core/protocols.clj b/Clojure/Clojure.Source/clojure/core/protocols.clj
index 852842be2..5567d59d9 100644
--- a/Clojure/Clojure.Source/clojure/core/protocols.clj
+++ b/Clojure/Clojure.Source/clojure/core/protocols.clj
@@ -150,7 +150,7 @@
 (def arr-impl
   '(internal-reduce
        [a-seq f val]
-       (let [arr (.Array a-seq)]                   ;;; .array
+       (let [^objects arr (.Array a-seq)]                   ;;; .array
          (loop [i (.Index a-seq)                   ;;; .index
                 val val]
            (if (< i (alength arr))

From d1020cd8a626234a368eee8b7abe957a79e1fc92 Mon Sep 17 00:00:00 2001
From: Robert Johnson <bobjohnson11@gmail.com>
Date: Tue, 11 Sep 2012 14:32:28 -0400
Subject: [PATCH 3/3] Updated build.proj and Clojure.Compile.csproj to support
 Mono

1. Updated build.proj script to build CLojureCLR with Mono (XBuild)
2. Updated Clojure.Compile.csproj to support building ClojureCLR with
Mono
(XBuild) and Windows (MSBuild)
---
 .../Clojure.Compile/Clojure.Compile.csproj    |  6 ++-
 Clojure/build.proj                            | 50 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/Clojure/Clojure.Compile/Clojure.Compile.csproj b/Clojure/Clojure.Compile/Clojure.Compile.csproj
index db55a7c3c..e1c0f5eb4 100644
--- a/Clojure/Clojure.Compile/Clojure.Compile.csproj
+++ b/Clojure/Clojure.Compile/Clojure.Compile.csproj
@@ -131,6 +131,10 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"$(TargetPath)" clojure.core clojure.core.protocols 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</PostBuildEvent>
+    <Runtime>.Net</Runtime>
+  </PropertyGroup>
+  <PropertyGroup>
+    <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>
+    <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>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Clojure/build.proj b/Clojure/build.proj
index a3f10505d..9a82c0c90 100644
--- a/Clojure/build.proj
+++ b/Clojure/build.proj
@@ -5,6 +5,7 @@
     <!--<Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>-->
     <cljc>Clojure.Compile.exe</cljc>
     <clji>Clojure.Main.exe</clji>
+    <Runtime>.Net</Runtime>
   </PropertyGroup>
   
   <!--Is there a way to avoid this duplication? This is also encoded in the project files, although relative to a different path -->
@@ -22,34 +23,53 @@
   </PropertyGroup>
   
   <Target Name="Build">
-    <MSBuild Projects="ClojureCLR.sln"/>
+    <MSBuild Projects="ClojureCLR.sln"
+             Properties="Runtime=$(Runtime)"/>
   </Target>
   
   <Target Name="CompileTest" DependsOnTargets="Build">
-    <Exec Command="$(cljc) clojure.test-clojure.genclass.examples clojure.test-clojure.protocols.examples clojure.test-clojure.protocols.more-examples clojure.test-clojure.repl.example" 
-          WorkingDirectory="$(OutputPath)"/>
+    <Exec Command="$(cljc) clojure.test-clojure.genclass.examples clojure.test-clojure.protocols.examples clojure.test-clojure.protocols.more-examples clojure.test-clojure.repl.example" 

+          WorkingDirectory="$(OutputPath)"

+           Condition=" '$(Runtime)' == '.Net' "/>
+    <Exec Command="mono $(cljc) clojure.test-clojure.genclass.examples clojure.test-clojure.protocols.examples clojure.test-clojure.protocols.more-examples clojure.test-clojure.repl.example" 

+          WorkingDirectory="$(OutputPath)"

+           Condition=" '$(Runtime)' == 'Mono' "/>
   </Target>
   
   <Target Name="Test" DependsOnTargets="Build;CompileTest">
     <Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_tests.clj" DestinationFolder="$(OutputPath)" />
-    <Exec Command="$(clji) clojure\run_tests.clj"
-          WorkingDirectory="$(OutputPath)"/>
+    <Exec Command="$(clji) clojure\run_tests.clj"

+          WorkingDirectory="$(OutputPath)"

+           Condition=" '$(Runtime)' == '.Net' "/>

+    <Exec Command="mono $(clji) clojure\run_tests.clj"

+          WorkingDirectory="$(OutputPath)"

+           Condition=" '$(Runtime)' == 'Mono' "/>
   </Target>
   
+  <!-- RJ: Reworked Dist target to work around Mono bug related to embeding ItemGroup inside a Target tag -->
   <Target Name="Dist" DependsOnTargets="Build">
-    <ItemGroup>
-      <!--DLR-->
+    <!--DLR-->
       <Dlls Include="$(OutputPath)\Microsoft.*" />
       <!--Clojure dlls and exes-->
-      <Dlls Include="$(OutputPath)\Clojure.*" 
-                 Exclude="$(OutputPath)\Clojure.Tests.dll;$(OutputPath)\Clojure.Tests.pdb;
-                          $(OutputPath)\Clojure.Source.dll;$(OutputPath)\Clojure.Source.pdb;
-                          $(OutputPath)\clojure.test-clojure.genclass.examples.ExampleClass.dll;
-                          $(OutputPath)\clojure.test-clojure.genclass.examples.ExampleClass.pdb;
-                          $(OutputPath)\Clojure.Main.vshost.exe;$(OutputPath)\Clojure.Main.vshost.exe.manifest" />
+      <CreateItem

+      Include="$(OutputPath)\Clojure.*;$(OutputPath)\Microsoft.*" 

+      Exclude="$(OutputPath)\Clojure.Tests.dll;$(OutputPath)\Clojure.Tests.pdb;

+               $(OutputPath)\Clojure.Source.dll;$(OutputPath)\Clojure.Source.pdb;

+               $(OutputPath)\clojure.test-clojure.genclass.examples.ExampleClass.dll;

+               $(OutputPath)\clojure.test-clojure.genclass.examples.ExampleClass.pdb;

+               $(OutputPath)\Clojure.Main.vshost.exe;$(OutputPath)\Clojure.Main.vshost.exe.manifest">

+      <Output

+            TaskParameter="Include"

+            ItemName="Dlls"/>

+     </CreateItem>
       <!--clj and AOT clj files-->
-      <CljFiles Include="$(OutputPath)\clojure\**\*" Exclude="$(OutputPath)\clojure\test_clojure\**\*" />
-    </ItemGroup>
+    <CreateItem

+       Include="$(OutputPath)\clojure\**\*"

+       Exclude="$(OutputPath)\clojure\test_clojure\**\*">

+     <Output

+       TaskParameter="Include"

+       ItemName="CljFiles"/>

+     </CreateItem>
     <Copy SourceFiles="@(Dlls)" DestinationFolder="..\dist\$(Configuration)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(CljFiles)" DestinationFolder="..\dist\$(Configuration)\clojure\%(RecursiveDir)" SkipUnchangedFiles="true" />
   </Target>