Skip to content

Update build.proj & protocols.clj #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2012
Merged

Update build.proj & protocols.clj #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22bfb41
Updated SourceFiles parameter to allow ClojureCLR tests to run
robertlj Sep 11, 2012
aad9d91
Updated arr with ^objects type information so the aget function will …
robertlj Sep 11, 2012
d1020cd
Updated build.proj and Clojure.Compile.csproj to support Mono
robertlj Sep 11, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Clojure/Clojure.Compile/Clojure.Compile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion Clojure/Clojure.Source/clojure/core/protocols.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
52 changes: 36 additions & 16 deletions Clojure/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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.Source\clojure\run_tests.clj" DestinationFolder="$(OutputPath)" />
<Exec Command="$(clji) clojure\run_tests.clj"
WorkingDirectory="$(OutputPath)"/>
<Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_tests.clj" DestinationFolder="$(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>
Expand Down