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

Patch by Matt Madia: Generalized the UnzipArchive rule to support *.tgz files

Browse Source 
as well, and renamed it to ExtractArchive.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35616 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-02-25 14:54:50 +00:00
parent 791b130291
commit 3cd300bc61
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+26 -15
View File
@@ -190,26 +190,26 @@ actions UnarchiveObjects
} }
rule UnzipArchive directory : entries : zipFile : grist rule ExtractArchive directory : entries : archiveFile : grist
{ {
# UnzipArchive <directory> : <entries> : <zipFile> [ : <grist> ] # ExtractArchive <directory> : <entries> : <archiveFile> [ : <grist> ]
# #
# Unzips the zip file target <zipFile> to directory <directory>. The rule # Extract the archive file target <archiveFile> to directory <directory>.
# can be called multiple times for different <entries> for the same # The rule can be called multiple times for different <entries> for the same
# <directory> and <zipFile> combo. # <directory> and <archiveFile> combo.
# #
# <directory> - The directory into which to unzip the zip file. The # <directory> - The directory into which to extract the archive file. The
# directory is created is by this rule and it is the target # directory is created is by this rule and it is the target
# that the unzip action is associated with. # that the extract action is associated with.
# <entries> - The entries of the zip file one is interested in. The rule # <entries> - The entries of the zip file one is interested in. The rule
# always unzips the complete zip file, from the given entries # always unzips the complete zip file, from the given entries
# the rule creates targets (using <grist>) representing the # the rule creates targets (using <grist>) representing the
# unzipped entries. Those targets are returned by the rule. # unzipped entries. Those targets are returned by the rule.
# <zipFile> - The zip file target to unzip. # <archiveFile> - The archive file target to extract.
# <grist> - The grist used to create targets from <entries>. Defaults to # <grist> - The grist used to create targets from <entries>. Defaults to
# "unzipped". # "extracted".
grist ?= unzipped ; grist ?= extracted ;
# Turn the entries into targets to build. # Turn the entries into targets to build.
local targets ; local targets ;
@@ -231,28 +231,39 @@ rule UnzipArchive directory : entries : zipFile : grist
MkDir $(parentDir) ; MkDir $(parentDir) ;
NoUpdate $(directory) ; NoUpdate $(directory) ;
Depends $(directory) : $(zipFile) ; Depends $(directory) : $(archiveFile) ;
UnzipArchive1 $(directory) : $(zipFile) ; switch $(archiveFile:S)
{
case .zip : ExtractZipArchive1 $(directory) : $(archiveFile) ;
case .tgz : ExtractTarArchive1 $(directory) : $(archiveFile) ;
case * : Exit "ExtractArchive: Unhandled archive extension:
$(archiveFile:S)" ;
}
INITIALIZED on $(directory) = 1 ; INITIALIZED on $(directory) = 1 ;
} }
# Use a dummy rule so that it looks to jam like the targets are actually # Use a dummy rule so that it looks to jam like the targets are actually
# built from the directory target. # built from the directory target.
UnzipArchiveDummy $(targets) : $(directory) ; ExtractArchiveDummy $(targets) : $(directory) ;
return $(targets) ; return $(targets) ;
} }
actions UnzipArchive1 actions ExtractZipArchive1
{ {
mkdir -p $(1[1]) mkdir -p $(1[1])
unzip -q -u -o -d $(1[1]) $(2) unzip -q -u -o -d $(1[1]) $(2)
} }
actions UnzipArchiveDummy actions ExtractTarArchive1
{ {
mkdir -p $(1[1])
tar -C $(1[1]) -xf $(2)
} }
actions ExtractArchiveDummy
{
}
rule ObjectReference rule ObjectReference
{ {
build/jam/OptionalBuildFeatures
+2 -2
View File
@@ -29,11 +29,11 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
$(HAIKU_OPENSSL_PACKAGE) ] ; $(HAIKU_OPENSSL_PACKAGE) ] ;
# unzip headers and libraries # unzip headers and libraries
HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ UnzipArchive $(HAIKU_OPENSSL_DIR) HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_OPENSSL_DIR)
: common/include/ : $(zipFile) : common/include/ : $(zipFile)
] ; ] ;
HAIKU_OPENSSL_LIBS = [ UnzipArchive $(HAIKU_OPENSSL_DIR) HAIKU_OPENSSL_LIBS = [ ExtractArchive $(HAIKU_OPENSSL_DIR)
: :
common/lib/libcrypto.so common/lib/libcrypto.so
common/lib/libssl.so common/lib/libssl.so