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

Adjust for OptionalBuildFeatures/BuildFeatures.

Browse Source
This commit is contained in:
Matt Madia
2012-12-23 13:52:21 -05:00
parent 2e2e8f7d2e
commit 822e846207
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/installoptionalpackage
+9 -8
View File
@@ -383,8 +383,8 @@ function DownloadAllBuildFiles()
{ {
# DownloadAllBuildFiles # DownloadAllBuildFiles
# Retreive the necessary jam files from svn. # Retreive the necessary jam files from svn.
local buildFiles="OptionalPackages OptionalPackageDependencies \ local buildFiles="BuildFeatures OptionalPackageDependencies \
OptionalBuildFeatures OptionalLibPackages" OptionalPackages OptionalLibPackages"
for file in ${buildFiles} ; do for file in ${buildFiles} ; do
GetBuildFile ${file} GetBuildFile ${file}
done done
@@ -676,29 +676,30 @@ function ConvertJamToBash()
# TODO : add these following variables to the CreateInstallerScript # TODO : add these following variables to the CreateInstallerScript
# TODO : parse HAIKU_ICU_GCC_2_PACKAGE # TODO : parse HAIKU_ICU_GCC_2_PACKAGE
#local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p' #local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p'
#icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` #icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine' #ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine'
# TODO : parse HAIKU_ICU_GCC_4_PACKAGE # TODO : parse HAIKU_ICU_GCC_4_PACKAGE
#local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p' #local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p'
#icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` #icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine' #ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine'
# TODO : parse HAIKU_ICU_DEVEL_PACKAGE # TODO : parse HAIKU_ICU_DEVEL_PACKAGE
#local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p' #local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p'
#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` #icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine' #ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'
local regExp="/^\s*HAIKU_OPENSSL_PACKAGE = .*-gcc${HAIKU_GCC_VERSION[1]}-/p" local regExp="/^\s*HAIKU_OPENSSL_PACKAGE = .*-gcc${HAIKU_GCC_VERSION[1]}-/p"
sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` sslPkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslPkgLine' ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
local regExp='/^HAIKU_OPENSSL_URL/p' local regExp='/^HAIKU_OPENSSL_URL/p'
sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` sslUrlLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslUrlLine' ConvertVariableDeclarationLines "$regExp" 'sslUrlLine'
# TODO
local regExp='/^HAIKU_WEBKIT_FILE/p' local regExp='/^HAIKU_WEBKIT_FILE/p'
webkitFileLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` webkitFileLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'webkitFileLine' ConvertVariableDeclarationLines "$regExp" 'webkitFileLine'
local regExp='/^local\ baseURL/p' local regExp='/^local\ baseURL/p'