i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Corneliu - Claudiu Prodescu "cprodescu". Ensures that ExtractArchive

Browse Source 
extracts the files, even when the specified target directory exists.
Fixes #7425.  Thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41211 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2011-04-10 17:58:35 +00:00
parent a2002544cd
commit 490b4a9481
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+9 -7
View File
@@ -221,7 +221,7 @@ rule ExtractArchive directory : entries : archiveFile : grist
} }
LOCATE on $(targets) = $(directory) ; LOCATE on $(targets) = $(directory) ;
Depends $(targets) : $(directory) ; Depends $(targets) : $(directory) $(archiveFile) ;
NoUpdate $(targets) ; NoUpdate $(targets) ;
# one-time initialization for the main target (the directory) # one-time initialization for the main target (the directory)
@@ -235,8 +235,10 @@ rule ExtractArchive directory : entries : archiveFile : grist
Depends $(directory) : $(archiveFile) ; Depends $(directory) : $(archiveFile) ;
switch $(archiveFile:S) switch $(archiveFile:S)
{ {
case .zip : ExtractZipArchive1 $(directory) : $(archiveFile) ; case .zip : ExtractZipArchive1 $(targets) : $(directory)
case .tgz : ExtractTarArchive1 $(directory) : $(archiveFile) ; $(archiveFile) ;
case .tgz : ExtractTarArchive1 $(targets) : $(directory)
$(archiveFile) ;
case * : Exit "ExtractArchive: Unhandled archive extension: case * : Exit "ExtractArchive: Unhandled archive extension:
$(archiveFile:S)" ; $(archiveFile:S)" ;
} }
@@ -252,14 +254,14 @@ rule ExtractArchive directory : entries : archiveFile : grist
actions ExtractZipArchive1 actions ExtractZipArchive1
{ {
mkdir -p $(1[1]) mkdir -p $(2[1])
unzip -q -u -o -d $(1[1]) $(2) unzip -q -u -o -d $(2[1]) $(2[2])
} }
actions ExtractTarArchive1 actions ExtractTarArchive1
{ {
mkdir -p $(1[1]) mkdir -p $(2[1])
tar -C $(1[1]) -xf $(2) tar -C $(2[1]) -xf $(2[2])
} }
actions ExtractArchiveDummy actions ExtractArchiveDummy