diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-21 07:39:38 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-21 07:39:38 -0700 |
| commit | 80e6fdeb013c96dbde1a74e5f2973688fa1018d6 (patch) | |
| tree | 9d3bbfc736f1e88819631b8917cd119d99985d42 | |
| parent | 7f4e5f5788fdf880dfc72f703ddfb6486192bcda (diff) | |
| download | wix-80e6fdeb013c96dbde1a74e5f2973688fa1018d6.tar.gz wix-80e6fdeb013c96dbde1a74e5f2973688fa1018d6.tar.bz2 wix-80e6fdeb013c96dbde1a74e5f2973688fa1018d6.zip | |
Support creation of redundant file transfers
| -rw-r--r-- | src/WixToolset.Data/Bind/FileTransfer.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/WixToolset.Data/Bind/FileTransfer.cs b/src/WixToolset.Data/Bind/FileTransfer.cs index 088146d1..046883d8 100644 --- a/src/WixToolset.Data/Bind/FileTransfer.cs +++ b/src/WixToolset.Data/Bind/FileTransfer.cs | |||
| @@ -64,17 +64,18 @@ namespace WixToolset.Data.Bind | |||
| 64 | 64 | ||
| 65 | string fileLayoutFullPath = GetValidatedFullPath(sourceLineNumbers, destination); | 65 | string fileLayoutFullPath = GetValidatedFullPath(sourceLineNumbers, destination); |
| 66 | 66 | ||
| 67 | // if the current source path (where we know that the file already exists) and the resolved | 67 | //// if the current source path (where we know that the file already exists) and the resolved |
| 68 | // path as dictated by the Directory table are not the same, then propagate the file. The | 68 | //// path as dictated by the Directory table are not the same, then propagate the file. The |
| 69 | // image that we create may have already been done by some other process other than the linker, so | 69 | //// image that we create may have already been done by some other process other than the linker, so |
| 70 | // there is no reason to copy the files to the resolved source if they are already there. | 70 | //// there is no reason to copy the files to the resolved source if they are already there. |
| 71 | if (String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase)) | 71 | //if (String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase)) |
| 72 | { | 72 | //{ |
| 73 | transfer = null; | 73 | // transfer = null; |
| 74 | return false; | 74 | // return false; |
| 75 | } | 75 | //} |
| 76 | 76 | ||
| 77 | transfer = new FileTransfer(source, destination, move, type, sourceLineNumbers); | 77 | transfer = new FileTransfer(source, destination, move, type, sourceLineNumbers); |
| 78 | transfer.Redundant = String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase); | ||
| 78 | return true; | 79 | return true; |
| 79 | } | 80 | } |
| 80 | 81 | ||