Commit 5c69749b authored by csharptest's avatar csharptest

Completed the following changes & testing, see todo.txt for more information

1 - Add a way to specify the output directory
2 - Added an option "file_extension" to control the suffix for cs files generated, defaults to ".cs"
3 - Added the option for "umbrella_namespace" used when nest_classes=false and having name conflicts
4 - Optionally remove dependencies to csharp options
5 - Investigate command line parsing library
6 - Investigate calling protoc directly
7 - Unable to resolve dependencies correctly
8 - Added several (20) nunits to automate the command-line invocation of each option
parent d65173a9
...@@ -266,10 +266,10 @@ ...@@ -266,10 +266,10 @@
<property name="Configuration" value="Release" /> <property name="Configuration" value="Release" />
<property name="Platform" value="Any CPU" /> <property name="Platform" value="Any CPU" />
</msbuild> </msbuild>
<msbuild project="${src}/ProtocolBuffers.sln"> <!--msbuild project="${src}/ProtocolBuffers.sln">
<property name="Configuration" value="Silverlight2" /> <property name="Configuration" value="Silverlight2" />
<property name="Platform" value="Any CPU" /> <property name="Platform" value="Any CPU" />
</msbuild> </msbuild-->
<!-- Note the deliberate lack of space in the platform name --> <!-- Note the deliberate lack of space in the platform name -->
<msbuild project="${src}/ProtocolBuffers/ProtocolBuffersCF.csproj"> <msbuild project="${src}/ProtocolBuffers/ProtocolBuffersCF.csproj">
<property name="Configuration" value="Release" /> <property name="Configuration" value="Release" />
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<mkdir dir="${output-dir}/Protoc" /> <mkdir dir="${output-dir}/Protoc" />
<mkdir dir="${output-dir}/Debug" /> <mkdir dir="${output-dir}/Debug" />
<mkdir dir="${output-dir}/Release" /> <mkdir dir="${output-dir}/Release" />
<mkdir dir="${output-dir}/Silverlight2" /> <!--mkdir dir="${output-dir}/Silverlight2" /-->
<mkdir dir="${output-dir}/CompactFramework35" /> <mkdir dir="${output-dir}/CompactFramework35" />
<copy todir="${output-dir}/Protoc"> <copy todir="${output-dir}/Protoc">
<fileset basedir="${project::get-base-directory()}/lib"> <fileset basedir="${project::get-base-directory()}/lib">
...@@ -321,12 +321,12 @@ ...@@ -321,12 +321,12 @@
<exclude name="**/*vshost*" /> <exclude name="**/*vshost*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${output-dir}/Silverlight2" <!--copy todir="${output-dir}/Silverlight2"
flatten="true"> flatten="true">
<fileset basedir="${src}"> <fileset basedir="${src}">
<include name="ProtocolBuffers/bin/Silverlight2/Google.ProtocolBuffers.dll" /> <include name="ProtocolBuffers/bin/Silverlight2/Google.ProtocolBuffers.dll" />
</fileset> </fileset>
</copy> </copy-->
<copy todir="${output-dir}/CompactFramework35" <copy todir="${output-dir}/CompactFramework35"
flatten="true"> flatten="true">
<fileset basedir="${src}"> <fileset basedir="${src}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment