From c5a9522b592370163e0d4cb02613bdc7b93dd4c0 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 4 Sep 2007 17:01:00 +0000 Subject: [PATCH] Recovered from cvs revision 2007-09-04 08:01:00 --- ase/ase.sln | 20 ++- ase/cnt/Properties/AssemblyInfo.cs | 35 ----- ase/cnt/asecnt.csproj | 58 --------- ase/test/awk/mini.c | 4 +- ase/test/cnt/AwkForm.resx | 123 ------------------ ase/test/cnt/Properties/AssemblyInfo.cs | 33 ----- ase/test/cnt/Properties/Resources.Designer.cs | 63 --------- ase/test/cnt/Properties/Resources.resx | 117 ----------------- ase/test/cnt/Properties/Settings.Designer.cs | 26 ---- ase/test/cnt/Properties/Settings.settings | 7 - ase/test/cnt/asetestcnt.csproj | 90 ------------- ase/{cnt => test/com}/Awk.cs | 4 +- ase/test/{cnt => com}/AwkForm.Designer.cs | 4 +- ase/test/{cnt => com}/AwkForm.cs | 4 +- ase/test/{cnt => com}/Program.cs | 2 +- ase/{cnt => test/com}/StdAwk.cs | 4 +- ase/test/com/{asetestcom.vbp => asecom.vbp} | 2 +- ase/test/com/{asetestcom.vbw => asecom.vbw} | 0 18 files changed, 30 insertions(+), 566 deletions(-) delete mode 100644 ase/cnt/Properties/AssemblyInfo.cs delete mode 100644 ase/cnt/asecnt.csproj delete mode 100644 ase/test/cnt/AwkForm.resx delete mode 100644 ase/test/cnt/Properties/AssemblyInfo.cs delete mode 100644 ase/test/cnt/Properties/Resources.Designer.cs delete mode 100644 ase/test/cnt/Properties/Resources.resx delete mode 100644 ase/test/cnt/Properties/Settings.Designer.cs delete mode 100644 ase/test/cnt/Properties/Settings.settings delete mode 100644 ase/test/cnt/asetestcnt.csproj rename ase/{cnt => test/com}/Awk.cs (99%) rename ase/test/{cnt => com}/AwkForm.Designer.cs (99%) rename ase/test/{cnt => com}/AwkForm.cs (96%) rename ase/test/{cnt => com}/Program.cs (94%) rename ase/{cnt => test/com}/StdAwk.cs (93%) rename ase/test/com/{asetestcom.vbp => asecom.vbp} (94%) rename ase/test/com/{asetestcom.vbw => asecom.vbw} (100%) diff --git a/ase/ase.sln b/ase/ase.sln index c7d25494..c869c127 100644 --- a/ase/ase.sln +++ b/ase/ase.sln @@ -18,9 +18,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aseawk_jni", "awk\aseawk_jn EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asecom", "com\asecom.vcproj", "{963AF7B5-12E6-42B6-8CBE-89136C1A109B}" ProjectSection(ProjectDependencies) = postProject - {17621C83-40C9-4305-BAF9-132E250B5FE3} = {17621C83-40C9-4305-BAF9-132E250B5FE3} - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} {5F2E77D5-1485-48D1-9371-987BC55FEE83} = {5F2E77D5-1485-48D1-9371-987BC55FEE83} + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} + {17621C83-40C9-4305-BAF9-132E250B5FE3} = {17621C83-40C9-4305-BAF9-132E250B5FE3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aseawk", "test\awk\aseawk.vcproj", "{57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}" @@ -60,6 +60,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asenet", "test\net\asenet.c EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8A2F5860-6563-4617-BCE0-460F915007F8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asecom", "test\com\asecom.csproj", "{F14B75D8-3ED7-4621-B5B9-E96A80B5D809}" + ProjectSection(ProjectDependencies) = postProject + {963AF7B5-12E6-42B6-8CBE-89136C1A109B} = {963AF7B5-12E6-42B6-8CBE-89136C1A109B} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -190,6 +195,16 @@ Global {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B}.Release|Win32.ActiveCfg = Release|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Debug|Win32.ActiveCfg = Debug|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Any CPU.Build.0 = Release|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -199,5 +214,6 @@ Global {3BEA6CFE-C158-4BFB-B5FB-ED85251E3F98} = {8A2F5860-6563-4617-BCE0-460F915007F8} {7CC01C3D-FC1A-4587-868A-7FC4449B3F8B} = {8A2F5860-6563-4617-BCE0-460F915007F8} {57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F} = {8A2F5860-6563-4617-BCE0-460F915007F8} + {F14B75D8-3ED7-4621-B5B9-E96A80B5D809} = {8A2F5860-6563-4617-BCE0-460F915007F8} EndGlobalSection EndGlobal diff --git a/ase/cnt/Properties/AssemblyInfo.cs b/ase/cnt/Properties/AssemblyInfo.cs deleted file mode 100644 index cce92045..00000000 --- a/ase/cnt/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("asecnt")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("asecnt")] -[assembly: AssemblyCopyright("Copyright © 2007")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("be3e4e5d-2eac-4629-bdc6-d61b1c858015")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ase/cnt/asecnt.csproj b/ase/cnt/asecnt.csproj deleted file mode 100644 index 6fd89325..00000000 --- a/ase/cnt/asecnt.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {7F679165-41FB-4E1E-B3F5-23C5EE94166A} - Library - Properties - ASECNT - asecnt - - - true - full - false - ..\Debug\lib\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Release\lib\ - TRACE - prompt - 4 - - - - - - - - - - - - - - {F9C69806-16A1-4162-998A-876B33C470BF} - 1 - 0 - 0 - tlbimp - False - - - - - diff --git a/ase/test/awk/mini.c b/ase/test/awk/mini.c index 88325af0..0b96810b 100644 --- a/ase/test/awk/mini.c +++ b/ase/test/awk/mini.c @@ -1,5 +1,5 @@ /* - * $Id: mini.c,v 1.3 2007/04/30 08:32:41 bacon Exp $ + * $Id: mini.c,v 1.4 2007/09/03 05:20:15 bacon Exp $ */ #include @@ -387,7 +387,7 @@ int ase_main (int argc, ase_char_t* argv[]) ase_awk_setoption (awk, ASE_AWK_IMPLICIT | ASE_AWK_EXPLICIT | ASE_AWK_UNIQUEFN | ASE_AWK_IDIV | ASE_AWK_SHADING | ASE_AWK_SHIFT | - ASE_AWK_EXTIO | ASE_AWK_BLOCKLESS | ASE_AWK_STRBASEONE | + ASE_AWK_EXTIO | ASE_AWK_BLOCKLESS | ASE_AWK_BASEONE | ASE_AWK_STRIPSPACES | ASE_AWK_NEXTOFILE); srcios.in = awk_srcio_in; diff --git a/ase/test/cnt/AwkForm.resx b/ase/test/cnt/AwkForm.resx deleted file mode 100644 index b9c202bf..00000000 --- a/ase/test/cnt/AwkForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/ase/test/cnt/Properties/AssemblyInfo.cs b/ase/test/cnt/Properties/AssemblyInfo.cs deleted file mode 100644 index 7b0ced58..00000000 --- a/ase/test/cnt/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("asecnt")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("asecnt")] -[assembly: AssemblyCopyright("© 2007 Hyung-Hwan Chung, All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7cd62543-7cf6-4b69-90b9-be0becdbfa19")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ase/test/cnt/Properties/Resources.Designer.cs b/ase/test/cnt/Properties/Resources.Designer.cs deleted file mode 100644 index 23555039..00000000 --- a/ase/test/cnt/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ASETestCNT.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ASETestCNT.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/ase/test/cnt/Properties/Resources.resx b/ase/test/cnt/Properties/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/ase/test/cnt/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ase/test/cnt/Properties/Settings.Designer.cs b/ase/test/cnt/Properties/Settings.Designer.cs deleted file mode 100644 index a80bab69..00000000 --- a/ase/test/cnt/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ASETestCNT.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/ase/test/cnt/Properties/Settings.settings b/ase/test/cnt/Properties/Settings.settings deleted file mode 100644 index 39645652..00000000 --- a/ase/test/cnt/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ase/test/cnt/asetestcnt.csproj b/ase/test/cnt/asetestcnt.csproj deleted file mode 100644 index 550dfae7..00000000 --- a/ase/test/cnt/asetestcnt.csproj +++ /dev/null @@ -1,90 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {F14B75D8-3ED7-4621-B5B9-E96A80B5D809} - WinExe - Properties - ASETestCNT - asecnt - - - true - full - false - ..\..\Debug\bin\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Release\bin\ - TRACE - prompt - 4 - - - - False - ..\..\cnt\obj\Debug\Interop.ASECOM.dll - - - - - - - - - - - Form - - - AwkForm.cs - - - - - Designer - AwkForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {7F679165-41FB-4E1E-B3F5-23C5EE94166A} - asecnt - - - - - diff --git a/ase/cnt/Awk.cs b/ase/test/com/Awk.cs similarity index 99% rename from ase/cnt/Awk.cs rename to ase/test/com/Awk.cs index 9a5d17f2..5c6a6e8f 100644 --- a/ase/cnt/Awk.cs +++ b/ase/test/com/Awk.cs @@ -1,5 +1,5 @@ /* - * $Id: Awk.cs,v 1.1 2007/05/01 07:47:12 bacon Exp $ + * $Id: Awk.cs,v 1.1 2007/09/03 03:50:39 bacon Exp $ */ using System; @@ -9,7 +9,7 @@ using System.IO; using COM = System.Runtime.InteropServices.ComTypes; -namespace ASECNT +namespace ase.com { public class Awk : ASECOM.IAwkEvents { diff --git a/ase/test/cnt/AwkForm.Designer.cs b/ase/test/com/AwkForm.Designer.cs similarity index 99% rename from ase/test/cnt/AwkForm.Designer.cs rename to ase/test/com/AwkForm.Designer.cs index de9552a9..9f066408 100644 --- a/ase/test/cnt/AwkForm.Designer.cs +++ b/ase/test/com/AwkForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ASETestCNT +namespace ase.com { partial class AwkForm { @@ -331,7 +331,7 @@ namespace ASETestCNT this.Controls.Add(this.panel2); this.Controls.Add(this.statusStrip1); this.Name = "AwkForm"; - this.Text = "ASE.CNT.AWK"; + this.Text = "ASE.COM.AWK"; this.tableLayoutPanel1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/ase/test/cnt/AwkForm.cs b/ase/test/com/AwkForm.cs similarity index 96% rename from ase/test/cnt/AwkForm.cs rename to ase/test/com/AwkForm.cs index 4ff5545f..3b35fe0f 100644 --- a/ase/test/cnt/AwkForm.cs +++ b/ase/test/com/AwkForm.cs @@ -7,7 +7,7 @@ using System.Text; using System.Windows.Forms; using System.IO; -namespace ASETestCNT +namespace ase.com { public partial class AwkForm : Form { @@ -18,7 +18,7 @@ namespace ASETestCNT private void btnRun_Click(object sender, EventArgs e) { - ASECNT.Awk awk = new ASECNT.StdAwk (); + Awk awk = new StdAwk (); //System.Text.Encoding.Default awk.SourceInputStream = new MemoryStream (UnicodeEncoding.UTF8.GetBytes(tbxSourceInput.Text)); diff --git a/ase/test/cnt/Program.cs b/ase/test/com/Program.cs similarity index 94% rename from ase/test/cnt/Program.cs rename to ase/test/com/Program.cs index 6605bd61..30c37071 100644 --- a/ase/test/cnt/Program.cs +++ b/ase/test/com/Program.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -namespace ASETestCNT +namespace ase.com { static class Program { diff --git a/ase/cnt/StdAwk.cs b/ase/test/com/StdAwk.cs similarity index 93% rename from ase/cnt/StdAwk.cs rename to ase/test/com/StdAwk.cs index f0e61d1a..2e324130 100644 --- a/ase/cnt/StdAwk.cs +++ b/ase/test/com/StdAwk.cs @@ -1,12 +1,12 @@ /* - * $Id: StdAwk.cs,v 1.1 2007/05/01 07:47:12 bacon Exp $ + * $Id: StdAwk.cs,v 1.1 2007/09/03 03:50:39 bacon Exp $ */ using System; using System.Collections.Generic; using System.Text; -namespace ASECNT +namespace ase.com { public class StdAwk: Awk { diff --git a/ase/test/com/asetestcom.vbp b/ase/test/com/asecom.vbp similarity index 94% rename from ase/test/com/asetestcom.vbp rename to ase/test/com/asecom.vbp index 3025b318..afc9ea5a 100644 --- a/ase/test/com/asetestcom.vbp +++ b/ase/test/com/asecom.vbp @@ -1,6 +1,6 @@ Type=Exe Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation -Reference=*\G{F9C69806-16A1-4162-998A-876B33C470BF}#1.0#0#..\..\release\lib\asecom.dll#ASE 1.0 Type Library +Reference=*\G{F9C69806-16A1-4162-998A-876B33C470BF}#1.0#0#..\..\debug\lib\asecom.dll#ASE 1.0 Type Library Form=AwkForm.frm Class=AwkExtioConsole; AwkExtioConsole.cls IconForm="AwkForm" diff --git a/ase/test/com/asetestcom.vbw b/ase/test/com/asecom.vbw similarity index 100% rename from ase/test/com/asetestcom.vbw rename to ase/test/com/asecom.vbw