Repository: incubator-reef Updated Branches: refs/heads/master 561e7a0ad -> b9bb7b139
[REEF-241]: cleanup clean target for c#/cpp projects This addressed the issue by deleting target directories and moving intermediate files to bin directory JIRA: [REEF-241](https://issues.apache.org/jira/browse/REEF-241) This closes #138 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/b9bb7b13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/b9bb7b13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/b9bb7b13 Branch: refs/heads/master Commit: b9bb7b1399bdf71cad45bdec4f19783080fa1bb2 Parents: 561e7a0 Author: Beysim Sezgin <[email protected]> Authored: Tue Apr 7 14:04:02 2015 -0700 Committer: Julia Wang <[email protected]> Committed: Tue Apr 7 16:39:07 2015 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Bridge.JAR.csproj | 1 - lang/cs/build.props | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b9bb7b13/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj index e6f921b..6631c23 100644 --- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj +++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj @@ -23,7 +23,6 @@ under the License. <RootNamespace>Org.Apache.REEF.Bridge.JAR</RootNamespace> <ProjectGuid>{62905C7C-1A7E-4923-B78D-1BF42D7FAD40}</ProjectGuid> <AssemblyName>Org.Apache.REEF.Bridge.JAR</AssemblyName> - <OutputType>JAR</OutputType> <RestorePackages>true</RestorePackages> </PropertyGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b9bb7b13/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 0c59e6c..33066a4 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -23,6 +23,9 @@ under the License. <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)\bin</BinDir> <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages</PackagesDir> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <BaseIntermediateOutputPath>$(BinDir)\Temp\$(RootNamespace)\$(Platform)\</BaseIntermediateOutputPath> + <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <!-- Common build configurations --> @@ -31,7 +34,6 @@ under the License. <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -43,7 +45,6 @@ under the License. <PlatformTarget>x64</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -133,4 +134,11 @@ under the License. DestinationFiles="@(MySourceFiles->'$(TargetDir)%(Filename)%(Extension)')" /> </Target> + <ItemGroup> + <DirectoriesToRemove Include="$(IntermediateOutputPath)" /> + </ItemGroup> + <Target Name="RemoveIntermediateDirectories" AfterTargets="clean"> + <RemoveDir Directories="@(DirectoriesToRemove)" Condition="!Exists('$(IntermediateOutputPath)\$(RootNamespace).log')"/> + <RemoveDir Directories="$(OutputPath)" /> + </Target> </Project> \ No newline at end of file
