From 7dec88dc6eb74b554ba3ad8812dd8ae8a1b4cf02 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Sat, 4 Sep 2010 17:43:47 +0000
Subject: [PATCH] Path fix for CPDB and fix to ISS to copy FBEmbed DLLs.

---
 Setup2/Cosmos2010.iss                                  | 10 ++++++----
 .../Debug/Cosmos.Debug.Common/CDebugger/DebugSymbol.cs |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Setup2/Cosmos2010.iss b/Setup2/Cosmos2010.iss
index 06eb416c6..9dcf6477c 100644
--- a/Setup2/Cosmos2010.iss
+++ b/Setup2/Cosmos2010.iss
@@ -134,9 +134,9 @@ Name: {code:VSNET2010_PATH}\ProjectTemplates\Cosmos; Flags: uninsalwaysuninstall
 Name: {app}; Flags: uninsalwaysuninstall
 
 [InstallDelete]
-Type: files; Name: "{code:VSNET2010_PATH}\PrivateAssemblies\Cosmos.*";
-Type: filesandordirs; Name: "{code:VSNET2010_PATH}\ProjectTemplates\Cosmos";
-Type: filesandordirs; Name: "{code:GetCSharpExpress2010ProjectTemplatePath}\*Cosmos*.*"; Check: IsCSharpExpress2010Installed('dummy') and (not csharp2010_Installed('dummy'))
+Type: files; Name: {code:VSNET2010_PATH}\PrivateAssemblies\Cosmos.*
+Type: filesandordirs; Name: {code:VSNET2010_PATH}\ProjectTemplates\Cosmos
+Type: filesandordirs; Name: {code:GetCSharpExpress2010ProjectTemplatePath}\*Cosmos*.*; Check: IsCSharpExpress2010Installed('dummy') and (not csharp2010_Installed('dummy'))
 
 
 
@@ -163,6 +163,8 @@ Source: .\Build\VSIP\Cosmos.Compiler.*; DestDir: {app}\Build\VSIP\; Flags: ignor
 Source: .\Build\VSIP\Cosmos.IL2CPU.*; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
 Source: .\Build\VSIP\corapi.*; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
 Source: .\Build\VSIP\raw.*; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
+Source: .\Build\VSIP\fbembed.dll; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
+Source: .\Build\VSIP\icu*.dll; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
 
 ; wizards
 Source: .\Build\VSIP\Cosmos.VS.Wizards.*; DestDir: {code:VSNET2010_PATH}\PrivateAssemblies; Flags: ignoreversion uninsremovereadonly
@@ -280,4 +282,4 @@ Root: HKCR; SubKey: Cosmos.ProjectFile\shell\open\command; ValueType: string; Va
 
 
 [Run]
-Filename: {code:VSNET2010_PATH}\devenv.exe; Parameters: /setup; Flags: waituntilterminated
\ No newline at end of file
+Filename: {code:VSNET2010_PATH}\devenv.exe; Parameters: /setup; Flags: waituntilterminated
diff --git a/source2/Debug/Cosmos.Debug.Common/CDebugger/DebugSymbol.cs b/source2/Debug/Cosmos.Debug.Common/CDebugger/DebugSymbol.cs
index 3f50eb0f9..17dc065bd 100644
--- a/source2/Debug/Cosmos.Debug.Common/CDebugger/DebugSymbol.cs
+++ b/source2/Debug/Cosmos.Debug.Common/CDebugger/DebugSymbol.cs
@@ -35,9 +35,11 @@ namespace Cosmos.Debug.Common.CDebugger
 	public class MLDebugSymbol {
 
         protected static void CreateCPDB(string aPathname) {
+            File.Delete(aPathname);
+
             var xCSB = new FbConnectionStringBuilder();
             xCSB.ServerType = FbServerType.Embedded;
-            xCSB.Database = @"m:\temp\Cosmos.cpdb";
+            xCSB.Database = aPathname;
 
             FbConnection.CreateDatabase(xCSB.ToString());