From 5171349f73dca45409e6ba76750cce56b9ee3b56 Mon Sep 17 00:00:00 2001
From: soochoi <soochoi@unknown>
Date: Mon, 8 May 2006 19:55:29 +0000
Subject: [PATCH] Windows: upgrade gtk to 2.8

---
 c_adlib/Novell.CASA.A-D.csproj       | 26 ++++------
 c_adlib/Novell.CASA.A-D.csproj.user  | 48 ++++++++++++++++++
 c_gui/CASAManager.csproj             | 76 +++++++++++++---------------
 c_gui/CASAManager.csproj.user        |  2 +-
 c_micasacache/windows/Makefile.am    |  2 +-
 c_micasadk/windows/Makefile.am       |  4 +-
 vs_solutions/CASAInstall/Makefile.am |  2 +
 7 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100755 c_adlib/Novell.CASA.A-D.csproj.user

diff --git a/c_adlib/Novell.CASA.A-D.csproj b/c_adlib/Novell.CASA.A-D.csproj
index 54048c26..2f608fe7 100644
--- a/c_adlib/Novell.CASA.A-D.csproj
+++ b/c_adlib/Novell.CASA.A-D.csproj
@@ -97,38 +97,32 @@
                 <Reference
                     Name = "pango-sharp"
                     AssemblyName = "pango-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\pango-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\pango-sharp.dll"
                 />
                 <Reference
                     Name = "atk-sharp"
                     AssemblyName = "atk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\atk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\atk-sharp.dll"
                 />
                 <Reference
                     Name = "gdk-sharp"
                     AssemblyName = "gdk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gdk-sharp.dll"
                 />
                 <Reference
                     Name = "glade-sharp"
                     AssemblyName = "glade-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glade-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gtk-sharp"
-                    AssemblyName = "gtk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glade-sharp.dll"
                 />
                 <Reference
                     Name = "glib-sharp"
                     AssemblyName = "glib-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glib-sharp.dll"
+                />
+                <Reference
+                    Name = "gtk-sharp"
+                    AssemblyName = "gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gtk-sharp.dll"
                 />
             </References>
         </Build>
diff --git a/c_adlib/Novell.CASA.A-D.csproj.user b/c_adlib/Novell.CASA.A-D.csproj.user
new file mode 100755
index 00000000..64a485aa
--- /dev/null
+++ b/c_adlib/Novell.CASA.A-D.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>
+    <CSHARP LastOpenVersion = "7.10.3077" >
+        <Build>
+            <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp\" >
+                <Config
+                    Name = "Debug"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+                <Config
+                    Name = "Release"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+            </Settings>
+        </Build>
+        <OtherProjectSettings
+            CopyProjectDestinationFolder = ""
+            CopyProjectUncPath = ""
+            CopyProjectOption = "0"
+            ProjectView = "ProjectFiles"
+            ProjectTrust = "0"
+        />
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/c_gui/CASAManager.csproj b/c_gui/CASAManager.csproj
index 2a7b1dbd..3719d172 100644
--- a/c_gui/CASAManager.csproj
+++ b/c_gui/CASAManager.csproj
@@ -89,52 +89,11 @@
                     AssemblyName = "System.Drawing"
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
                 />
-                <Reference
-                    Name = "pango-sharp"
-                    AssemblyName = "pango-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\pango-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "atk-sharp"
-                    AssemblyName = "atk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\atk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gdk-sharp"
-                    AssemblyName = "gdk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "glade-sharp"
-                    AssemblyName = "glade-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glade-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "glib-sharp"
-                    AssemblyName = "glib-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gtk-sharp"
-                    AssemblyName = "gtk-sharp"
-                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
                 <Reference
                     Name = "Novell.CASA.A-D"
                     Project = "{25D49F34-F655-4CCF-93F1-449243AF7A32}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "Novell.CASA.CASAPolicy"
-                    Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
                 <Reference
                     Name = "Novell.CASA.Common"
                     Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
@@ -145,6 +104,41 @@
                     Project = "{E21DD887-22F4-4935-9851-409715F663B0}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "pango-sharp"
+                    AssemblyName = "pango-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\pango-sharp.dll"
+                />
+                <Reference
+                    Name = "atk-sharp"
+                    AssemblyName = "atk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\atk-sharp.dll"
+                />
+                <Reference
+                    Name = "gdk-sharp"
+                    AssemblyName = "gdk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gdk-sharp.dll"
+                />
+                <Reference
+                    Name = "glade-sharp"
+                    AssemblyName = "glade-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glade-sharp.dll"
+                />
+                <Reference
+                    Name = "glib-sharp"
+                    AssemblyName = "glib-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glib-sharp.dll"
+                />
+                <Reference
+                    Name = "gtk-sharp"
+                    AssemblyName = "gtk-sharp"
+                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gtk-sharp.dll"
+                />
+                <Reference
+                    Name = "Novell.CASA.CASAPolicy"
+                    Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
             </References>
         </Build>
         <Files>
diff --git a/c_gui/CASAManager.csproj.user b/c_gui/CASAManager.csproj.user
index c38f275e..168ef3fd 100644
--- a/c_gui/CASAManager.csproj.user
+++ b/c_gui/CASAManager.csproj.user
@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "D:\casa\extern\w32\gtk-sharp-2.0\" >
+            <Settings ReferencePath = "D:\casa\extern\w32\gtk-sharp-2.0\;C:\GtkRun\2.8\lib\gtk-sharp\" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"
diff --git a/c_micasacache/windows/Makefile.am b/c_micasacache/windows/Makefile.am
index 08570a3f..ec5b8bb3 100755
--- a/c_micasacache/windows/Makefile.am
+++ b/c_micasacache/windows/Makefile.am
@@ -97,7 +97,7 @@ uninstall-local:
 
 clean-local:
 	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
-	if [ -d build.log ]; then  rm -f build.log; fi
+	rm -f build.log
 
 distclean-local:
 
diff --git a/c_micasadk/windows/Makefile.am b/c_micasadk/windows/Makefile.am
index bab97087..5759d24c 100755
--- a/c_micasadk/windows/Makefile.am
+++ b/c_micasadk/windows/Makefile.am
@@ -96,8 +96,8 @@ uninstall-local:
 
 
 clean-local:
-	if [ -d ../$(TARGET_CFG) ]; then  rm -rf ../$(TARGET_CFG); fi
-	if [ -d ../build.log ]; then  rm -f ../build.log; fi
+	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
+	rm -f build.log
 
 distclean-local:
 
diff --git a/vs_solutions/CASAInstall/Makefile.am b/vs_solutions/CASAInstall/Makefile.am
index 1e6c49cd..2f4b0354 100755
--- a/vs_solutions/CASAInstall/Makefile.am
+++ b/vs_solutions/CASAInstall/Makefile.am
@@ -98,6 +98,8 @@ uninstall-local:
 
 clean-local:
 	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
+	if [ -d Debug ]; then  rm -rf Debug; fi
+	rm -rf build.log; fi
 
 distclean-local: