From 3f0062dcf7d7163eda04567fbb92510a711385a2 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Fri, 6 Apr 2007 03:52:43 +0000
Subject: [PATCH] Fixed windows build conflict issues.

---
 .../client/library/windows/client.vcproj      |  6 +-
 .../authtokenclient64_msm.vdproj              | 80 +++++++++++++++++--
 .../authtokenclientdevel64_msi.vdproj         | 14 +---
 .../authtokenclientdevel64_msm.vdproj         | 10 +--
 4 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/CASA-auth-token/client/library/windows/client.vcproj b/CASA-auth-token/client/library/windows/client.vcproj
index 718e73a7..7fa7bbeb 100644
--- a/CASA-auth-token/client/library/windows/client.vcproj
+++ b/CASA-auth-token/client/library/windows/client.vcproj
@@ -117,6 +117,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -168,7 +169,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="0"
-				ImportLibrary="$(SolutionDir)lib\windows/$(TargetName).lib"
+				ImportLibrary="$(SolutionDir)lib64\windows\$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -291,6 +292,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -337,7 +339,7 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(SolutionDir)lib\windows\$(TargetName).lib"
+				ImportLibrary="$(SolutionDir)lib64\windows\$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj b/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
index f25912de..94f35370 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclient64_msm/authtokenclient64_msm.vdproj
@@ -13,6 +13,36 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
+        "OwnerKey" = "8:_75519C9025D94CC496F276E698CE3AF8"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
+        "OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2EBD1126703136415C570EC63F66C49A"
+        "OwnerKey" = "8:_8E623C85FD4143F3B09460457E8ED6CA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3001B2F06DD188752812041C3D273EEF"
+        "OwnerKey" = "8:_75519C9025D94CC496F276E698CE3AF8"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3001B2F06DD188752812041C3D273EEF"
+        "OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_4744A4EB6B904673B8897294AB8C6162"
@@ -144,6 +174,46 @@
         }
         "File"
         {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2EBD1126703136415C570EC63F66C49A"
+            {
+            "SourcePath" = "8:micasa.dll"
+            "TargetName" = "8:micasa.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3001B2F06DD188752812041C3D273EEF"
+            {
+            "SourcePath" = "8:WINHTTP.dll"
+            "TargetName" = "8:WINHTTP.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4E73B42DD7BB4E5C8B309F197D94C7F2"
             {
             "SourcePath" = "8:..\\..\\..\\library\\client.conf"
@@ -403,7 +473,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4744A4EB6B904673B8897294AB8C6162"
             {
-            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -431,7 +501,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_50C15B4896B94AAD8CF7A676F541BD89"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\x64\\Release\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -459,7 +529,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75519C9025D94CC496F276E698CE3AF8"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\Release\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_38D318F856B54BF29254CE5D1456EB19"
@@ -487,7 +557,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\x64\\Release\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -515,7 +585,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26"
             {
-            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\x64\\Release\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
diff --git a/CASA-auth-token/client/package/windows/authtokenclientdevel64_msi/authtokenclientdevel64_msi.vdproj b/CASA-auth-token/client/package/windows/authtokenclientdevel64_msi/authtokenclientdevel64_msi.vdproj
index 32ff3fe5..416c3beb 100644
--- a/CASA-auth-token/client/package/windows/authtokenclientdevel64_msi/authtokenclientdevel64_msi.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclientdevel64_msi/authtokenclientdevel64_msi.vdproj
@@ -19,12 +19,6 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BD7066970CC4484B8C99C26A63E5B2A5"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -33,7 +27,7 @@
         "DisplayName" = "8:Debug"
         "IsDebugOnly" = "11:TRUE"
         "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Debug\\authtokenclientdevel.msi"
+        "OutputFilename" = "8:Debug\\authtokenclientdevel64.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -70,7 +64,7 @@
         "DisplayName" = "8:Release"
         "IsDebugOnly" = "11:FALSE"
         "IsReleaseOnly" = "11:TRUE"
-        "OutputFilename" = "8:Release\\authtokenclientdevel.msi"
+        "OutputFilename" = "8:Release\\authtokenclientdevel64.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -262,7 +256,7 @@
         "Manufacturer" = "8:Novell, Inc."
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:authtokenclientdevel_msi"
+        "Title" = "8:authtokenclientdevel64_msi"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Novell, Inc."
         "Keywords" = "8:"
@@ -737,7 +731,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BD7066970CC4484B8C99C26A63E5B2A5"
             {
-            "SourcePath" = "8:..\\authtokenclientdevel64_msm\\Debug\\authtokenclientdevel-msm.msm"
+            "SourcePath" = "8:..\\authtokenclientdevel64_msm\\Debug\\authtokenclientdevel64-msm.msm"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E7DF0B5C6F4F44C1AA19AFB03393A43F"
diff --git a/CASA-auth-token/client/package/windows/authtokenclientdevel64_msm/authtokenclientdevel64_msm.vdproj b/CASA-auth-token/client/package/windows/authtokenclientdevel64_msm/authtokenclientdevel64_msm.vdproj
index bd10e78c..9864432e 100644
--- a/CASA-auth-token/client/package/windows/authtokenclientdevel64_msm/authtokenclientdevel64_msm.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclientdevel64_msm/authtokenclientdevel64_msm.vdproj
@@ -33,7 +33,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_C51BB367E3764A609C6892AA7214BA74"
+        "MsmKey" = "8:_ED75FB42562C44599CE8F9BF3EC1E6A9"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -154,9 +154,9 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C51BB367E3764A609C6892AA7214BA74"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED75FB42562C44599CE8F9BF3EC1E6A9"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\windows\\casa_authtoken.lib"
+            "SourcePath" = "8:..\\..\\..\\lib64\\windows\\casa_authtoken.lib"
             "TargetName" = "8:casa_authtoken.lib"
             "Tag" = "8:"
             "Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"
@@ -271,7 +271,7 @@
         {
         "ModuleSignature" = "8:MergeModule.B69C6131ABDA4B6DB65B5F4806BE4E59"
         "Version" = "8:1.0.0.0"
-        "Title" = "8:authtokenclientdevel-msm"
+        "Title" = "8:authtokenclientdevel64-msm"
         "Subject" = "8:"
         "Author" = "8:Novell, Inc."
         "Keywords" = "8:"
@@ -287,7 +287,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_88C9C0D87C7449108D65C94EB7B367FE"
             {
-            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"