Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ICU and ICU-devel to the list of packages that cannot be installed. ATM,

Browse Source 
for loops aren't handled and the variables used by ICU and ICU-devel are not
parsed. Added TODO's and commented+untested code for now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37622 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-07-20 16:48:21 +00:00
parent 0b269e50a0
commit f286792113
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/bin/installoptionalpackage
View File

@ -42,7 +42,8 @@ declare alreadyInstalled=""
# Some Packages cannot be installed, # Some Packages cannot be installed,
# as they require either the source code or compiled binaries # as they require either the source code or compiled binaries
declare packageIgnoreList="Bluetooth Development DevelopmentMin \ declare packageIgnoreList="Bluetooth Development DevelopmentMin \
DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData " DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData \
ICU-devel ICU "
function CreateInstallerScript() function CreateInstallerScript()
@ -633,6 +634,23 @@ function ConvertJamToBash()
countGenBashLine=0 countGenBashLine=0
# Parse out some variable declarations # Parse out some variable declarations
# TODO : add these following variables to the CreateInstallerScript
# TODO : parse HAIKU_ICU_GCC_2_PACKAGE
#local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p'
#icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine'
# TODO : parse HAIKU_ICU_GCC_4_PACKAGE
#local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p'
#icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine'
# TODO : parse HAIKU_ICU_DEVEL_PACKAGE
#local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p'
#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'
local regExp='/^HAIKU_OPENSSL_PACKAGE/p' local regExp='/^HAIKU_OPENSSL_PACKAGE/p'
sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslPkgLine' ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
@ -650,6 +668,8 @@ function ConvertJamToBash()
while read line ; do while read line ; do
line=${line/'Echo'/'echo'} line=${line/'Echo'/'echo'}
# TODO: add support for converting for loops.
# will need to introduce curly brace counting
ConvertIfStatements "$line" ConvertIfStatements "$line"
ConvertVariables "$line" ConvertVariables "$line"
#ReplaceComparators "$line" #ReplaceComparators "$line"