[msysGit] [PATCH] Installer: Create builtins as symbolic links on Vista

[Michael Lukashov <michael.lukashov@xxxxxxxxx>]

When create builtins, first try to use CreateSymbolicLinkW function.
If symbolic link creating fails, hard links are created.

Tested under WinXP (both FAT32 and NTFS), Vista and Win7.

This patch applies on top of ss/installer-improvements branch.

Signed-off-by: Michael Lukashov <michael.lukashov@xxxxxxxxx>
---
 share/WinGit/install.iss |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss
index 91eac9c..f64f754 100644
--- a/share/WinGit/install.iss
+++ b/share/WinGit/install.iss
@@ -83,8 +83,10 @@ Type: dirifempty; Name: {app}\home
 
 // Note: Since we are using the Unicode version of Inno Setup, "String" is a Unicode
 // string, and thus we need to call the "W" (Wide-String) Windows API variant.
+function CreateSymbolicLink(lpFileName,lpExistingFileName:String;lpSecurityAttributes:Integer):Boolean;
+external 'CreateSymbolicLinkW@xxxxxxxxxxxx stdcall setuponly delayload';
 function CreateHardLink(lpFileName,lpExistingFileName:String;lpSecurityAttributes:Integer):Boolean;
-external 'CreateHardLinkW@xxxxxxxxxxxx stdcall setuponly';
+external 'CreateHardLinkW@xxxxxxxxxxxx stdcall setuponly delayload';
 
 const
     // Git Path options.
@@ -474,7 +476,11 @@ var
     IsNTFS:Boolean;
     FindRec:TFindRec;
     RootKey:Integer;
+    Version:TWindowsVersion;
+    LinkCreated:Boolean;
 begin
+    GetWindowsVersionEx(Version);
+
     if CurStep<>ssPostInstall then begin
         Exit;
     end;
@@ -511,13 +517,25 @@ begin
             for i:=0 to Count do begin
                 FileName:=AppDir+'\'+BuiltIns[i];
 
-                // On non-NTFS partitions, create hard links.
-                if (FileExists(FileName) and (not DeleteFile(FileName))) or
-                   (not CreateHardLink(FileName,AppDir+'\bin\git.exe',0)) then begin
-                    Log('Line {#emit __LINE__}: Unable to create hard link "'+FileName+'", will try to copy files.');
-                    IsNTFS:=False;
+                // First check if file exists.
+                if (FileExists(FileName) and (not DeleteFile(FileName))) then begin
+                    Log('Line {#emit __LINE__}: Unable to delete file "'+FileName);
                     Break;
                 end;
+                // Try to create symbolic link
+                if Version.Major>=6 then
+                try
+                  LinkCreated:=CreateSymbolicLink(FileName,AppDir+'\bin\git.exe',0);
+                except
+                  LinkCreated:=False;
+                end;
+                // Try to create hard link
+                if (not LinkCreated) and
+                   (not CreateHardLink(FileName,AppDir+'\bin\git.exe',0)) then begin
+                  Log('Line {#emit __LINE__}: Unable to create hard link "'+FileName+'", will try to copy files.');
+                  IsNTFS:=False;
+                  Break;
+                end;
             end;
 
             Log('Line {#emit __LINE__}: Successfully created built-in aliases as hard links.');
-- 
1.6.6.1536.g1ac8c

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html