fix Option.* Path.

darkcrash · Jan 9, 2016 · 789b737 · 789b737
1 parent ef28625
commit 789b737
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 35 deletions.
diff --git a/Bjd.Common.CoreCLR/Kernel.cs b/Bjd.Common.CoreCLR/Kernel.cs
@@ -245,7 +245,7 @@ public void ListInitialize()
         //���O��ListOption������������Ă���K�v������
         public Conf CreateConf(String nameTag)
         {
-            Trace.WriteLine("Kernel.CreateConf Start");
+            Trace.WriteLine($"Kernel.CreateConf {nameTag}");
             try
             {
                 if (ListOption == null)
@@ -262,15 +262,15 @@ public Conf CreateConf(String nameTag)
             }
             finally
             {
-                Trace.WriteLine("Kernel.CreateConf End");
+                //Trace.WriteLine($"Kernel.CreateConf {nameTag} End");
             }
         }
 
         //Logger�̐���
         //���O��ListOption������������Ă���K�v������
         public Logger CreateLogger(String nameTag, bool useDetailsLog, ILogger logger)
         {
-            Trace.WriteLine("Kernel.CreateLogger Start");
+            Trace.WriteLine($"Kernel.CreateLogger {nameTag}");
             try
             {
                 if (ListOption == null)
@@ -295,10 +295,6 @@ public Logger CreateLogger(String nameTag, bool useDetailsLog, ILogger logger)
             {
                 throw;
             }
-            finally
-            {
-                Trace.WriteLine("Kernel.CreateLogger End");
-            }
         }
 
         //�I������

diff --git a/Bjd.Common.CoreCLR/server/ListServer.cs b/Bjd.Common.CoreCLR/server/ListServer.cs
@@ -11,7 +11,7 @@ public class ListServer : ListBase<OneServer>, IDisposable{
         private Kernel kernel;
 
         public ListServer(Kernel kernel, ListPlugin listPlugin){
-            System.Diagnostics.Trace.WriteLine($"ListServer..ctor {this.GetType().Name} Start");
+            System.Diagnostics.Trace.WriteLine($"ListServer..ctor {listPlugin.GetType().Name} Start");
             try
             {
                 this.kernel = kernel;
@@ -24,7 +24,7 @@ public ListServer(Kernel kernel, ListPlugin listPlugin){
             }
             finally
             {
-                System.Diagnostics.Trace.WriteLine($"ListServer..ctor {this.GetType().Name} End");
+                System.Diagnostics.Trace.WriteLine($"ListServer..ctor {listPlugin.GetType().Name} End");
             }
         }
 

diff --git a/Bjd.Common.CoreCLR/trace/ConsoleTraceListner.cs b/Bjd.Common.CoreCLR/trace/ConsoleTraceListner.cs
@@ -18,19 +18,19 @@ public ConsoleTraceListner()
             }
             catch (Exception)
             {
-                Console.WriteLine("Error Change WindowWidth.");
+                Console.WriteLine("Not allowed change Console.WindowWidth");
             }
 
             try
             {
-
                 Console.WriteLine($"ConsoleTraceListner CodePage={Console.Out.Encoding.CodePage}");
-
                 Define.ChangeOperationSystem += Define_ChangeOperationSystem;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Console.WriteLine("Error .ctor ConsoleTraceListner");
+                Console.WriteLine(ex.Message);
+                Console.WriteLine(ex.StackTrace);
             }
 
         }

diff --git a/Bjd.Common.CoreCLR/util/IniDb.cs b/Bjd.Common.CoreCLR/util/IniDb.cs
@@ -18,9 +18,13 @@ public class IniDb
 
         public IniDb(String progDir, String fileName)
         {
-            _fileIni = progDir + "\\" + fileName + ".ini";
-            _fileDef = progDir + "\\" + fileName + ".def";
-            _fileTxt = progDir + "\\" + fileName + ".txt";
+            //_fileIni = progDir + "\\" + fileName + ".ini";
+            //_fileDef = progDir + "\\" + fileName + ".def";
+            //_fileTxt = progDir + "\\" + fileName + ".txt";
+            _fileIni = System.IO.Path.Combine(progDir, fileName + ".ini");
+            _fileDef = System.IO.Path.Combine(progDir, fileName + ".def");
+            _fileTxt = System.IO.Path.Combine(progDir, fileName + ".txt");
+
         }
 
         public string Path

diff --git a/build.sh b/build.sh
@@ -1,19 +1 @@
 dnu restore
-dnx --appbase "Bjd.Common.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.Common.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.Common.CoreCLR"
-dnx --appbase "Bjd.DhcpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.DhcpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.DhcpServer.CoreCLR"
-dnx --appbase "Bjd.DnsServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.DnsServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.DnsServer.CoreCLR"
-dnx --appbase "Bjd.FtpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.FtpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.FtpServer.CoreCLR"
-dnx --appbase "Bjd.Pop3Server.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.Pop3Server.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.Pop3Server.CoreCLR"
-dnx --appbase "Bjd.ProxyFtpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.ProxyFtpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.ProxyFtpServer.CoreCLR"
-dnx --appbase "Bjd.ProxyHttpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.ProxyHttpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.ProxyHttpServer.CoreCLR"
-dnx --appbase "Bjd.ProxyPop3Server.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.ProxyPop3Server.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.ProxyPop3Server.CoreCLR"
-dnx --appbase "Bjd.ProxySmtpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.ProxySmtpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.ProxySmtpServer.CoreCLR"
-dnx --appbase "Bjd.ProxyTelnetServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.ProxyTelnetServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.ProxyTelnetServer.CoreCLR"
-dnx --appbase "Bjd.RemoteServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.RemoteServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.RemoteServer.CoreCLR"
-dnx --appbase "Bjd.SipServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.SipServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.SipServer.CoreCLR"
-dnx --appbase "Bjd.SmtpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.SmtpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.SmtpServer.CoreCLR"
-dnx --appbase "Bjd.TftpServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.TftpServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.TftpServer.CoreCLR"
-dnx --appbase "Bjd.TunnelServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.TunnelServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.TunnelServer.CoreCLR"
-dnx --appbase "Bjd.WebApiServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.WebApiServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.WebApiServer.CoreCLR"
-dnx --appbase "Bjd.WebServer.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.WebServer.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.WebServer.CoreCLR"
-dnx --appbase "Bjd.CoreCLR" ~/.dnx/runtimes/dnx-coreclr-linux-x64.1.0.0-rc1-update1/bin/lib/Microsoft.Dnx.Tooling/Microsoft.Dnx.Tooling.dll pack "Bjd.CoreCLR" --configuration Debug --out "artifacts/bin/Bjd.CoreCLR"
diff --git a/run.sh b/run.sh
@@ -1 +1,2 @@
-dnx -p Bjd.CoreCLR/project.json "Bjd.CoreCLR" --appbase Bjd.CoreCLR
+cd Bjd.CoreCLR
+dnx bjd