Permalink
Browse files

Re-jig the folder structure to allow for seperate assemblies, to aid …

…with distribution
  • Loading branch information...
1 parent ad1b380 commit 3477f323838a4c4b1ad03090e01d597b61b5b760 @ciaranj ciaranj committed Apr 16, 2012
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{34766D05-85E8-44A7-A0CD-8AA9391AA302}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>EWAH.RunTests</RootNamespace>
+ <AssemblyName>EWAH.RunTests</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="example.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\EWAH.Tests\EWAH.Tests.csproj">
+ <Project>{1611081B-537F-4F2D-9670-5CE42AD30983}</Project>
+ <Name>EWAH.Tests</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\EWAH\EWAH.csproj">
+ <Project>{13FE7CCD-A03A-4B97-A89C-6CD301624997}</Project>
+ <Name>EWAH</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -0,0 +1,39 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("EWAH.RunTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("OECD")]
+[assembly: AssemblyProduct("EWAH.RunTests")]
+[assembly: AssemblyCopyright("Copyright © OECD 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("0666e9e3-73bd-4a3f-9633-9f7299d6b509")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
View
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
File renamed without changes.
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{1611081B-537F-4F2D-9670-5CE42AD30983}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Ewah</RootNamespace>
+ <AssemblyName>EWAH.Tests</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup>
+ <StartupObject />
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework">
+ <HintPath>..\NUnit-2.5.10.11092\bin\net-2.0\nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="EWAHCompressedBitmapTest.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\EWAH\EWAH.csproj">
+ <Project>{13FE7CCD-A03A-4B97-A89C-6CD301624997}</Project>
+ <Name>EWAH</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -0,0 +1,39 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("EWAH.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("OECD")]
+[assembly: AssemblyProduct("EWAH.Tests")]
+[assembly: AssemblyCopyright("Copyright © OECD 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("0666e9e3-73bd-4a3f-9633-9f7299d6b509")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
View
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
View
@@ -1,20 +1,54 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EWAH", "EWAH.csproj", "{13FE7CCD-A03A-4B97-A89C-6CD301624997}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EWAH", "EWAH\EWAH.csproj", "{13FE7CCD-A03A-4B97-A89C-6CD301624997}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F813A4C4-A3DB-461F-907E-6C69FDA4D8E2}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EWAH.Tests", "EWAH.Tests\EWAH.Tests.csproj", "{1611081B-537F-4F2D-9670-5CE42AD30983}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EWAH.RunTests", "EWAH.RunTests\EWAH.RunTests.csproj", "{34766D05-85E8-44A7-A0CD-8AA9391AA302}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{13FE7CCD-A03A-4B97-A89C-6CD301624997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13FE7CCD-A03A-4B97-A89C-6CD301624997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Debug|x86.ActiveCfg = Debug|Any CPU
{13FE7CCD-A03A-4B97-A89C-6CD301624997}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13FE7CCD-A03A-4B97-A89C-6CD301624997}.Release|Any CPU.Build.0 = Release|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {13FE7CCD-A03A-4B97-A89C-6CD301624997}.Release|x86.ActiveCfg = Release|Any CPU
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Debug|x86.ActiveCfg = Debug|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Debug|x86.Build.0 = Debug|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Release|Any CPU.ActiveCfg = Release|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Release|Mixed Platforms.Build.0 = Release|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Release|x86.ActiveCfg = Release|x86
+ {1611081B-537F-4F2D-9670-5CE42AD30983}.Release|x86.Build.0 = Release|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Debug|x86.ActiveCfg = Debug|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Debug|x86.Build.0 = Debug|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Release|Any CPU.ActiveCfg = Release|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Release|Mixed Platforms.Build.0 = Release|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Release|x86.ActiveCfg = Release|x86
+ {34766D05-85E8-44A7-A0CD-8AA9391AA302}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{13FE7CCD-A03A-4B97-A89C-6CD301624997}</ProjectGuid>
- <OutputType>Exe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EWAH</RootNamespace>
<AssemblyName>EWAH</AssemblyName>
@@ -29,14 +29,13 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup>
- <StartupObject>example</StartupObject>
+ <StartupObject>
+ </StartupObject>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\NUnit-2.5.10.11092\bin\net-2.0\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -46,14 +45,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="example.cs" />
- <Compile Include="main\BufferedRunningLengthWord.cs" />
- <Compile Include="main\EwahCompressedBitArray.cs" />
- <Compile Include="main\EwahEnumerator.cs" />
- <Compile Include="main\PlaceHolders.cs" />
- <Compile Include="main\RunningLengthWord.cs" />
+ <Compile Include="BufferedRunningLengthWord.cs" />
+ <Compile Include="EwahCompressedBitArray.cs" />
+ <Compile Include="EwahEnumerator.cs" />
+ <Compile Include="PlaceHolders.cs" />
+ <Compile Include="RunningLengthWord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="test\EWAHCompressedBitmapTest.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,3 +1,5 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("EWAH.Tests")]
+
namespace Ewah
{
/*
View
Binary file not shown.

0 comments on commit 3477f32

Please sign in to comment.