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

From: Matt Madia

Browse Source 
* InstallOptionalHaikuImagePackage: Made the first argument an actual file
  name, i.e. the extension ".zip" is no longer appended by it.
* Renamed rules UnzipArchiveTo{Container,HaikuImage} to
  ExtractArchiveTo{Container,HaikuImage} and generalized them to support
  tgz/tar.gz archives (implemented in build_haiku_{image,cd}).
* Removed DownloadOptionalPackage. DownloadFile is used instead.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35634 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-02-27 17:48:12 +00:00
parent 5a5fcf2f69
commit 05bbc668af
9 changed files with 161 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_haiku_cd
+26 -15
View File
@@ -35,29 +35,40 @@ mkdir=mkdir
rm=rm
unzipFile()
extractFile()
{
# unzipFile <archive> <directory>
zipFile=$1
targetUnzipDir=$2
# extractFile <archive> <directory>
archiveFile=$1
targetExtractDir=$2
echo "Unzipping $zipFile ..."
echo "Extracting $archiveFile ..."
unzipDir=$tmpDir/unzip
$rmAttrs -rf "$unzipDir"
mkdir -p "$unzipDir"
extractDir=$tmpDir/extract
$rmAttrs -rf "$extractDir"
mkdir -p "$extractDir"
case "$archiveFile" in
*.zip)
$unzip -q -d "$extractDir" "$archiveFile"
;;
*.tgz|*.tar.gz)
tar -C "$extractDir" -xf "$archiveFile"
;;
*)
echo "Unhandled archive extension in build_haiku_image extractFile()"
exit 1
;;
esac
$unzip -q -d "$unzipDir" "$zipFile"
if [ -f $unzipDir/.OptionalPackageDescription ]; then
cat $unzipDir/.OptionalPackageDescription >> $copyrightsFile
if [ -f $extractDir/.OptionalPackageDescription ]; then
cat $extractDir/.OptionalPackageDescription >> $copyrightsFile
echo >> $copyrightsFile
rm $unzipDir/.OptionalPackageDescription
rm $extractDir/.OptionalPackageDescription
fi
$cp -r "$unzipDir/." "${tPrefix}$targetUnzipDir"
$cp -r "$extractDir/." "${tPrefix}$targetExtractDir"
$rmAttrs -rf "$unzipDir"
$rmAttrs -rf "$extractDir"
}
build/scripts/build_haiku_image
+27 -16
View File
@@ -74,29 +74,40 @@ else
fi
unzipFile()
extractFile()
{
# unzipFile <archive> <directory>
zipFile=$1
targetUnzipDir=$2
# extractFile <archive> <directory>
archiveFile=$1
targetExtractedDir=$2
echo "Unzipping $zipFile ..."
echo "Extracting $archiveFile ..."
unzipDir=$tmpDir/unzip
$rmAttrs -rf "$unzipDir"
mkdir -p "$unzipDir"
$unzip -q -d "$unzipDir" "$zipFile"
if [ -f $unzipDir/.OptionalPackageDescription ]; then
cat $unzipDir/.OptionalPackageDescription >> $copyrightsFile
extractDir=$tmpDir/extract
$rmAttrs -rf "$extractDir"
mkdir -p "$extractDir"
case "$archiveFile" in
*.zip)
$unzip -q -d "$extractDir" "$archiveFile"
;;
*.tgz|*.tar.gz)
tar -C "$extractDir" -xf "$archiveFile"
;;
*)
echo "Unhandled archive extension in build_haiku_image extractFile()"
exit 1
;;
esac
if [ -f $extractDir/.OptionalPackageDescription ]; then
cat $extractDir/.OptionalPackageDescription >> $copyrightsFile
echo >> $copyrightsFile
rm $unzipDir/.OptionalPackageDescription
rm $extractDir/.OptionalPackageDescription
fi
$cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir"
$cp -r "${sPrefix}$extractDir/." "${tPrefix}$targetExtractedDir"
$rmAttrs -rf "$unzipDir"
$rmAttrs -rf "$extractDir"
}