diff options
author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-14 16:01:11 +0000 |
---|---|---|
committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-14 16:01:11 +0000 |
commit | ca959f9a9cae9a69ee4d18639d7263e71485dd2d (patch) | |
tree | 2cfe9ca39f63f6ebc59c2d18c3cd706c30b2e941 | |
parent | bf4778e3b48dc4dda6b43e0bb04184bf7a5de190 (diff) | |
download | fpc-ca959f9a9cae9a69ee4d18639d7263e71485dd2d.tar.gz |
Merge trunk commits 49131 and 49202
------------------------------------------------------------------------
r49131 | pierre | 2021-04-06 16:43:21 -0600 (Tue, 06 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/fpmkunit/src/fpmkunit.pp
Delete existing files before overwriting them for Darwin OS to avoid codesign issues
------------------------------------------------------------------------
------------------------------------------------------------------------
r49202 | pierre | 2021-04-14 02:06:54 -0600 (Wed, 14 Apr 2021) | 1 line
Also delete file before copying if destination is a directory on Darwin OS
------------------------------------------------------------------------
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49204 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/fpmkunit/src/fpmkunit.pp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp index 165f7c964c..bfbeb2222a 100644 --- a/packages/fpmkunit/src/fpmkunit.pp +++ b/packages/fpmkunit/src/fpmkunit.pp @@ -5831,6 +5831,18 @@ Var FileStat: stat; {$endif UNIX} begin +{$ifdef DARWIN} + { First delete file on Darwin OS to avoid codesign issues } + D:=IncludeTrailingPathDelimiter(Dest); + If DirectoryExists(D) then + begin + D:=D+ExtractFileName(Src); + if FileExists(D) then + SysDeleteFile(D); + end + else if FileExists(Dest) then + SysDeleteFile(Dest); +{$endif DARWIN} Log(vlInfo,SInfoCopyingFile,[Src,Dest]); FIn:=TFileStream.Create(Src,fmopenRead or fmShareDenyNone); Try |