A few tweaks

3 files changed, 29 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 3c252ceb..7a8aed1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ src/ProtoGen/obj/
 src/ProtoGen.Test/bin/
 src/ProtoGen.Test/obj/
 tmp/
+dist/
 *.user
 *.suo
 _ReSharper.*
diff --git a/ProtocolBuffers.build b/ProtocolBuffers.build
index a64f2648..2186f91a 100644
--- a/ProtocolBuffers.build
+++ b/ProtocolBuffers.build
@@ -19,7 +19,12 @@
   <property name="tools-protoc" 
             value="${project::get-base-directory()}/lib/protoc.exe"
             overwrite="false" />
-  
+
+  <!-- Output directory for copying generated binaries -->
+  <property name="output-dir"
+            value="${path::combine(project::get-base-directory(), 'dist')}"
+            overwrite="false" />            
+
   <!-- Base directory to find protos (core, C# options, tests) -->
   <property name="protos-dir"
             value="${path::combine(project::get-base-directory(), 'protos')}"
@@ -52,6 +57,7 @@
         <include name="${src}/ProtocolBuffers.Test/bin/**" />
         <include name="${src}/ProtocolBuffers.Test/obj/**" />
         <include name="${tmp-dir}" />
+        <include name="${output-dir}" />
       </fileset>
     </delete>
   </target>
@@ -103,14 +109,16 @@
     </copy>
   </target>
       
-  <target name="build" description="Builds all C# code">
+  <target name="build"
+          description="Builds all C# code">
     <msbuild project="${src}/ProtocolBuffers.sln">
       <property name="Configuration"
                 value="${build-configuration}" />
     </msbuild>
   </target>
   
-  <target name="test" description="Runs all unit tests">
+  <target name="test"
+          description="Runs all unit tests">
     <nunit2>
       <formatter type="Plain" />
       <test assemblyname="${src}/ProtocolBuffers.Test/bin/${build-configuration}/Google.ProtocolBuffers.Test.dll" />
@@ -118,9 +126,24 @@
     </nunit2>
   </target>
   
-  <target name="perf-test" description="Runs all performance tests">
+  <target name="perf-test"
+          description="Runs all performance tests">
     <fail message="Performance tests not implemented yet" />
   </target>
   
+  <target name="dist" 
+          description="Copies compiled binaries into the output directory">
+    <delete dir="${output-dir}" />
+    <mkdir dir="${output-dir}" />
+    <copy todir="${output-dir}"
+          flatten="true">
+      <fileset basedir="${src}">
+        <include name="ProtocolBuffers/bin/${build-configuration}/Google.ProtocolBuffers.dll" />
+        <include name="ProtoGen/bin/${build-configuration}/ProtoGen.exe" />
+      </fileset>
+    </copy>
+    
+  </target>
+  
   
 </project>
diff --git a/src/ProtocolBuffers.Test/TestUtil.cs b/src/ProtocolBuffers.Test/TestUtil.cs
index 70dd3c88..f27466bb 100644
--- a/src/ProtocolBuffers.Test/TestUtil.cs
+++ b/src/ProtocolBuffers.Test/TestUtil.cs
@@ -37,6 +37,7 @@ namespace Google.ProtocolBuffers {
         while (ancestor != null) {
           string candidate = Path.Combine(ancestor.FullName, "testdata");
           if (Directory.Exists(candidate)) {
+            testDataDirectory = candidate;
             return candidate;
           }
           ancestor = ancestor.Parent;