diff --git a/mcs/tools/gacutil/ChangeLog b/mcs/tools/gacutil/ChangeLog index 6b679babe7906..a4f8f06becc54 100644 --- a/mcs/tools/gacutil/ChangeLog +++ b/mcs/tools/gacutil/ChangeLog @@ -1,3 +1,9 @@ +2004-05-04 Jackson Harper + + * gacutil.cs: We need to overwrite existing libraries if they + already exist in the package directory on windows. Also made the + code somewhat readable with 80 cols. + 2004-05-03 Todd Berman * gacutil.cs: potential fix for miguel. diff --git a/mcs/tools/gacutil/gacutil.cs b/mcs/tools/gacutil/gacutil.cs index 407b0ac86c820..87e6a518eb75d 100644 --- a/mcs/tools/gacutil/gacutil.cs +++ b/mcs/tools/gacutil/gacutil.cs @@ -325,14 +325,17 @@ public int InstallAssembly (string[] args) File.Copy (args[0], fullPath + an.Name + ".dll", force); if (package_name != String.Empty) { + string ref_file = libdir + package_name + + Path.DirectorySeparatorChar + Path.GetFileName (args[0]); if (Path.DirectorySeparatorChar == '/') { try { Directory.CreateDirectory (libdir + package_name); } catch {} - symlink (linkPath + an.Name + ".dll", libdir + package_name + Path.DirectorySeparatorChar + Path.GetFileName (args[0])); + symlink (linkPath + an.Name + ".dll", ref_file); } else { - File.Copy (args[0], libdir + package_name + Path.DirectorySeparatorChar + Path.GetFileName (args[0])); + + File.Copy (args[0], ref_file, true); } Console.WriteLine ("Package exported to: " + libdir + package_name); }