Changeset 4683
- Timestamp:
- 05/14/08 17:09:36 (6 months ago)
- Files:
-
- trunk/nuxleus/Source/CodeSamples/Zorba_Test (added)
- trunk/nuxleus/Source/CodeSamples/Zorba_Test/Program.cs (added)
- trunk/nuxleus/Source/CodeSamples/Zorba_Test/Properties (added)
- trunk/nuxleus/Source/CodeSamples/Zorba_Test/Properties/AssemblyInfo.cs (added)
- trunk/nuxleus/Source/CodeSamples/Zorba_Test/Zorba_Test.csproj (added)
- trunk/nuxleus/Source/Nuxleus.Process/Process/ZorbaProcess.cs (modified) (2 diffs)
- trunk/nuxleus/Source/nuXleus.sln (modified) (2 diffs)
- trunk/nuxleus/Source/nuXleus.suo (modified) (previous)
- trunk/nuxleus/Source/nux.build (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/nuxleus/Source/Nuxleus.Process/Process/ZorbaProcess.cs
r4682 r4683 12 12 { 13 13 TextWriter m_logWriter; 14 ZorbaProcess m_proc;15 14 StreamReader m_output; 16 15 … … 23 22 24 23 [PermissionSet(SecurityAction.Demand, Name = "FullTrust")] 25 public ZorbaProcess( string parameters,TextWriter logWriter)24 public ZorbaProcess(TextWriter logWriter) 26 25 { 27 26 m_logWriter = logWriter; 28 m_proc = new ZorbaProcess(); 29 m_proc.StartInfo.FileName = "zorba"; 27 base.StartInfo.FileName = "zorba"; 30 28 31 29 } 32 30 33 31 public TextWriter LogWriter { get { return m_logWriter; } set { m_logWriter = value; } } 32 public StreamReader Output { get { return m_output; } set { m_output = value; } } 34 33 34 public void RunQuery(string args) 35 { 36 base.StartInfo.Arguments = args; 37 base.StartInfo.RedirectStandardOutput = true; 38 base.StartInfo.UseShellExecute = false; 39 base.Start(); 40 m_output = base.StandardOutput; 41 base.WaitForExit(); 42 } 35 43 36 public void RunQuery(string fullPath)37 {38 this.StartInfo.Arguments = "to be added";39 this.Start();40 m_output = this.StandardOutput;41 this.WaitForExit();42 }43 44 } 44 45 } trunk/nuxleus/Source/nuXleus.sln
r4682 r4683 113 113 EndProject 114 114 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xameleon", "Xameleon\Xameleon.csproj", "{A800D9F1-D877-4076-99BA-CBD73BCFB203}" 115 EndProject 116 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zorba_Test", "Zorba_Test\Zorba_Test.csproj", "{155A25CF-FB13-4A01-B204-BF6F56655306}" 115 117 EndProject 116 118 Global … … 684 686 {A800D9F1-D877-4076-99BA-CBD73BCFB203}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 685 687 {A800D9F1-D877-4076-99BA-CBD73BCFB203}.Release|Mixed Platforms.Build.0 = Release|Any CPU 688 {155A25CF-FB13-4A01-B204-BF6F56655306}.Debug|.NET.ActiveCfg = Debug|Any CPU 689 {155A25CF-FB13-4A01-B204-BF6F56655306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 690 {155A25CF-FB13-4A01-B204-BF6F56655306}.Debug|Any CPU.Build.0 = Debug|Any CPU 691 {155A25CF-FB13-4A01-B204-BF6F56655306}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 692 {155A25CF-FB13-4A01-B204-BF6F56655306}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 693 {155A25CF-FB13-4A01-B204-BF6F56655306}.Release|.NET.ActiveCfg = Release|Any CPU 694 {155A25CF-FB13-4A01-B204-BF6F56655306}.Release|Any CPU.ActiveCfg = Release|Any CPU 695 {155A25CF-FB13-4A01-B204-BF6F56655306}.Release|Any CPU.Build.0 = Release|Any CPU 696 {155A25CF-FB13-4A01-B204-BF6F56655306}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 697 {155A25CF-FB13-4A01-B204-BF6F56655306}.Release|Mixed Platforms.Build.0 = Release|Any CPU 686 698 EndGlobalSection 687 699 GlobalSection(SolutionProperties) = preSolution trunk/nuxleus/Source/nux.build
r4674 r4683 50 50 <include name="${dependencies.dir}/IKVM.OpenJDK.ClassLibrary.dll"/> 51 51 <include name="${dependencies.dir}/IKVM.Runtime.dll"/> 52 <!--<include name="${dependencies.dir}/Lucene.Net.dll" />-->52 <!--<include name="${dependencies.dir}/Lucene.Net.dll" />--> 53 53 <include name="${dependencies.dir}/Memcached.ClientLibrary.dll"/> 54 54 <include name="${dependencies.dir}/Mono.Posix.dll"/> … … 425 425 <references> 426 426 <include name="${build.dir}/Nuxleus.Agent.dll"/> 427 <include name="${dependencies.dir}/log4net.dll"/>428 <include name="System.dll"/>427 <include name="${dependencies.dir}/log4net.dll"/> 428 <include name="System.dll"/> 429 429 <include name="System.Xml.dll"/> 430 430 </references> … … 557 557 <include name="System.Data.dll"/> 558 558 <include name="System.Xml.dll"/> 559 <include name="System.Web.dll"/> 559 <include name="System.Web.dll"/> 560 560 <include name="System.Web.Services.dll"/> 561 561 </references> … … 611 611 <include name="System.ServiceProcess.dll"/> 612 612 <include name="${dependencies.dir}/log4net.dll"/> 613 <include name="${build.dir}/Nuxleus.Agent.dll"/>613 <include name="${build.dir}/Nuxleus.Agent.dll"/> 614 614 <include name="${build.dir}/Nuxleus.Extension.dll"/> 615 615 <include name="${build.dir}/Nuxleus.Extension.Aws.dll"/> … … 697 697 </csc> 698 698 </target> 699 <target name="LocationComplete_Test" depends="init">699 <target name="LocationComplete_Test" depends="init"> 700 700 <csc target="exe" output="${build.dir}/LocationComplete_Test.exe"> 701 701 <arg if="${platform::is-unix()}" value="-langversion:linq"/> … … 856 856 <references> 857 857 <include name="${build.dir}/Nuxleus.Extension.Linq.dll"/> 858 <include name="${build.dir}/Nuxleus.Web.dll"/> 859 <include name="System.dll"/> 860 <include name="System.ServiceProcess.dll"/> 861 <include name="System.Xml.dll"/> 862 <include name="System.Web.dll"/> 863 <include name="System.Web.Services.dll"/> 864 </references> 865 </csc> 866 </target> 867 <target name="Zorba_Test" depends="init Nuxleus.Process"> 868 <csc target="exe" output="${build.dir}/Zorba_Test.exe" keyfile="./Dependencies/Extf.Net.snk"> 869 <arg if="${platform::is-unix()}" value="-langversion:linq"/> 870 <sources> 871 <include name="${source.dir}/CodeSamples/Zorba_Test/Program.cs"/> 872 </sources> 873 <references> 874 <include name="${build.dir}/Nuxleus.Process.dll"/> 858 875 <include name="${build.dir}/Nuxleus.Web.dll"/> 859 876 <include name="System.dll"/>
