List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 31 2007 10:43pm
Subject:Rev 401: Cleaned up some C# build issues. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 401
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Mon 2007-12-31 16:43:12 -0600
message:
  Cleaned up some C# build issues.
modified:
  csharp/csharp.userprefs        csharp.userprefs-20071231171226-bgekh6don5s6evnk-3
  csharp/ndbapi/ndbapi.mdp       ndbapi.mdp-20071231171154-cc3a94g06bm81lq9-1
  csharp/test/test.mdp           test.mdp-20071231171204-0aihyf88clt213sl-1
  csharp/test/test2.cs           test2.cs-20071231170428-eqdg2d7b4syqjhgt-1
=== modified file 'csharp/csharp.userprefs'
--- a/csharp/csharp.userprefs	2007-12-31 17:12:36 +0000
+++ b/csharp/csharp.userprefs	2007-12-31 22:43:12 +0000
@@ -2,14 +2,18 @@
 <UserCombinePreferences
filename="/home/mtaylor/src/ndb-connectors/devel/csharp/csharp.mds">
   <Files>
     <File filename="Welcome" />
+    <File filename="./mgmapi/AssemblyInfo.cs" />
+    <File filename="./ndbapi/AssemblyInfo.cs" />
+    <File filename="./ndbapi/generated/NdbOperation.cs" />
+    <File filename="./ndbapi/generated/NdbTransaction.cs" />
   </Files>
   <Views>
     <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ProjectPad">
       <TreeView>
         <Node expanded="True">
-          <Node name="csharp" expanded="True">
-            <Node name="mgmapi" expanded="True">
-              <Node name="NodeState.cs" expanded="False" selected="True" />
+          <Node name="ndbapi" expanded="True">
+            <Node name="generated" expanded="True">
+              <Node name="NdbOperation.cs" expanded="False" selected="True" />
             </Node>
           </Node>
         </Node>
@@ -24,7 +28,7 @@
   <Properties>
     <Properties>
       <Property key="ActiveConfiguration" value="Debug" />
-      <Property key="ActiveWindow" value="Welcome" />
+      <Property key="ActiveWindow"
value="/home/mtaylor/src/ndb-connectors/devel/csharp/ndbapi/generated/NdbOperation.cs"
/>
     </Properties>
   </Properties>
 </UserCombinePreferences>
\ No newline at end of file

=== modified file 'csharp/ndbapi/ndbapi.mdp'
--- a/csharp/ndbapi/ndbapi.mdp	2007-12-31 17:12:36 +0000
+++ b/csharp/ndbapi/ndbapi.mdp	2007-12-31 22:43:12 +0000
@@ -1,54 +1,64 @@
-<Project name="ndbapi" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
+<Project name="ndbapi" fileversion="2.0" newfilesearch="OnLoad" language="C#"
clr-version="Net_1_1" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="ndbapi" />
+      <Output directory="bin/Debug" assembly="ndbapi" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet"
clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False"
ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="ndbapi" />
+      <Output directory="bin/Release" assembly="ndbapi" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet"
clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False"
ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="./NdbExceptions.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/AbortOption.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/ExecType.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/Ndb.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/ndbapi.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/ndbapiPINVOKE.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbBlob.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbClusterConnection.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/NdbColumn.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbDictionary.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbError.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/ndberror_classification_enum.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/ndberror_status_enum.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/NdbEvent.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbEventOperation.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbException.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbFactory.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbIndex.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbIndexOperation.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbIndexScanOperation.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/NdbObject.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbOperation.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbRecAttr.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbScanFilter.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbScanOperation.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/NdbTable.cs" subtype="Code" buildaction="Compile" />
-    <File name="./generated/NdbTransaction.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/SWIGTYPE_p_asynch_callback_t.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/SWIGTYPE_p_BYTES.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/SWIGTYPE_p_MYSQL_TIME.cs" subtype="Code"
buildaction="Compile" />
-    <File name="./generated/SWIGTYPE_p_p_char.cs" subtype="Code" buildaction="Compile"
/>
-    <File name="./generated/SWIGTYPE_p_voidint.cs" subtype="Code"
buildaction="Compile" />
+    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+    <File name="NdbExceptions.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/AbortOption.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/ExecType.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/Ndb.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/ndbapi.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/ndbapiPINVOKE.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbBlob.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbClusterConnection.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/NdbColumn.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbDictionary.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbError.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/ndberror_classification_enum.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/ndberror_status_enum.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/NdbEvent.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbEventOperation.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/NdbException.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbFactory.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbIndex.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbIndexOperation.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/NdbIndexScanOperation.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/NdbObject.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbOperation.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbRecAttr.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbScanFilter.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbScanOperation.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/NdbTable.cs" subtype="Code" buildaction="Compile" />
+    <File name="generated/NdbTransaction.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/SWIGTYPE_p_asynch_callback_t.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/SWIGTYPE_p_BYTES.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/SWIGTYPE_p_MYSQL_TIME.cs" subtype="Code"
buildaction="Compile" />
+    <File name="generated/SWIGTYPE_p_p_char.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="generated/SWIGTYPE_p_voidint.cs" subtype="Code" buildaction="Compile"
/>
+    <File name="BaseCallback.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
+  <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="../Makefile"
IsAutotoolsProject="True" RelativeConfigureInPath="..">
+    <BuildFilesVar />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar />
+    <AsmRefVar />
+    <ProjectRefVar />
+  </MonoDevelop.Autotools.MakefileInfo>
 </Project>
\ No newline at end of file

=== modified file 'csharp/test/test.mdp'
--- a/csharp/test/test.mdp	2007-12-31 17:12:36 +0000
+++ b/csharp/test/test.mdp	2007-12-31 22:43:12 +0000
@@ -1,22 +1,28 @@
-<Project name="test" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
+<Project name="test" fileversion="2.0" newfilesearch="OnLoad" language="C#"
clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="test" />
+      <Output directory="bin/Debug" assemblyKeyFile="." assembly="test" />
       <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False"
ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="test" />
+      <Output directory="bin/Release" assemblyKeyFile="." assembly="test" />
       <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False"
ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+    <File name="test.cs" subtype="Code" buildaction="Compile" />
+    <File name="test2.cs" subtype="Code" buildaction="Compile" />
+    <File name="testasync.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../MySql.Data.dll" />
+    <ProjectReference type="Project" localcopy="True" refto="mgmapi" />
+    <ProjectReference type="Project" localcopy="True" refto="ndbapi" />
   </References>
 </Project>
\ No newline at end of file

=== modified file 'csharp/test/test2.cs'
--- a/csharp/test/test2.cs	2007-12-31 17:04:42 +0000
+++ b/csharp/test/test2.cs	2007-12-31 22:43:12 +0000
@@ -20,7 +20,7 @@
 using System;
 using MySql.Cluster.NdbApi; 
 
-class test { 
+class test2 { 
   static public int Main(string[] args) {
    
     

Thread
Rev 401: Cleaned up some C# build issues. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor3 Jan