Skip to content

Commit

Permalink
Fixed platform problem Any CPU vs AnyCPU (mind the space) in build.pr…
Browse files Browse the repository at this point in the history
…oj. Removed workaround for SimpleConsole failing build. Fixed working directory for clojure tests.
  • Loading branch information
kurtschelfthout committed Oct 18, 2010
1 parent 91a697b commit 7909b46
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Clojure/build.proj
Expand Up @@ -2,28 +2,27 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug 3.5</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<!--<Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>-->
<cljc>Clojure.Compile.exe</cljc>
<clji>Clojure.Main.exe</clji>
</PropertyGroup>

<!--Is there a way to avoid this duplication? This is also encoded in the project files, although relative to a different path -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 3.5|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug 3.5' ">
<OutputPath>..\bin\3.5\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 3.5|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release 3.5' ">
<OutputPath>..\bin\3.5\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug 4.0' ">
<OutputPath>..\bin\4.0\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 4.0|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release 4.0' ">
<OutputPath>..\bin\4.0\Release\</OutputPath>
</PropertyGroup>

<Target Name="Build">
<!--the continue on error should be removed once SimpleConsole works/is removed-->
<MSBuild Projects="ClojureCLR.sln" Properties="Configuration=$(Configuration)" ContinueOnError="true"/>
<MSBuild Projects="ClojureCLR.sln"/>
</Target>

<Target Name="CompileTest" DependsOnTargets="Build">
Expand All @@ -33,7 +32,8 @@

<Target Name="Test" DependsOnTargets="Build;CompileTest">
<Copy SkipUnchangedFiles="true" SourceFiles="runtests.clj" DestinationFolder="$(OutputPath)" />
<Exec Command="$(OutputPath)\$(clji) runtests.clj"/>
<Exec Command="$(clji) runtests.clj"
WorkingDirectory="$(OutputPath)"/>
</Target>

<Target Name="Dist" DependsOnTargets="Build">
Expand Down

0 comments on commit 7909b46

Please sign in to comment.