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

Added support for OptionalLibPackages to installoptionalpackage.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39739 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-12-05 14:20:58 +00:00
parent 49c928a9c9
commit a906d0a031
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/installoptionalpackage
+5 -3
View File
@@ -385,7 +385,7 @@ function DownloadAllBuildFiles()
# DownloadAllBuildFiles # DownloadAllBuildFiles
# Retreive the necessary jam files from svn. # Retreive the necessary jam files from svn.
local buildFiles="OptionalPackages OptionalPackageDependencies \ local buildFiles="OptionalPackages OptionalPackageDependencies \
OptionalBuildFeatures" OptionalBuildFeatures OptionalLibPackages"
for file in ${buildFiles} ; do for file in ${buildFiles} ; do
GetBuildFile ${file} GetBuildFile ${file}
done done
@@ -481,6 +481,7 @@ function GeneratePackageNames()
local regExp='/^if\ \[\ IsOptionalHaikuImagePackageAdded/p' local regExp='/^if\ \[\ IsOptionalHaikuImagePackageAdded/p'
sed -n -e "$regExp" ${baseDir}/OptionalPackages > ${file}.temp sed -n -e "$regExp" ${baseDir}/OptionalPackages > ${file}.temp
sed -n -e "$regExp" ${baseDir}/OptionalLibPackages >> ${file}.temp
while read line ; do while read line ; do
# in each non-filtered line, the 4th word is the optional package # in each non-filtered line, the 4th word is the optional package
local pkg=`echo ${line} | awk '{print $4}'` local pkg=`echo ${line} | awk '{print $4}'`
@@ -571,8 +572,9 @@ function AddPackages()
for package in ${packagesToInstall} ; do for package in ${packagesToInstall} ; do
# output the "if [ IsOptionalHaikuImagePackageAdded..." code block # output the "if [ IsOptionalHaikuImagePackageAdded..." code block
local regExp="if\ \[\ IsOptionalHaikuImagePackageAdded\ ${package}" local regExp="if\ \[\ IsOptionalHaikuImagePackageAdded\ ${package}"
local inputFile="${baseDir}/OptionalPackages" for inputFile in OptionalPackages OptionalLibPackages ; do
sed -n "/^$regExp/,/^\}/p" ${inputFile} >> ${tmpDir}/optpkg.jam sed -n "/^$regExp/,/^\}/p" "${baseDir}/${inputFile}" >> ${tmpDir}/optpkg.jam
done
done done
ConvertJamToBash "${tmpDir}/optpkg.jam" ConvertJamToBash "${tmpDir}/optpkg.jam"